scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 07:01:58 +08:00
Code Issues Projects Releases Packages Wiki Activity
6143 commits 31 branches 181 tags 166 MiB
Commit graph

307 commits

Author SHA1 Message Date
Urban Rotnik
117944117b Add service for activity creation 2019-03-11 08:36:15 +01:00
Miha Mencin
6deaff6382 fixing hound errors 2019-03-04 18:36:32 +01:00
Miha Mencin
844303ae7c SCI-3119 schedule the creaton of template 2019-03-01 17:47:04 +01:00
aignatov-bio
9a007b5d75
Merge pull request #1542 from aignatov-bio/ai-sci-3108-missing-user-name-in-activity 
Fix missing user name in activty, when moving experiment [SCI-3108]
 2019-03-01 14:16:59 +01:00
Alex Kriuchykhin
985820a97c
Merge pull request #1527 from okriuchykhin/ok_SCI_3101 
Move templates project creation for new team to delayed job [SCI-3101]
 2019-03-01 13:55:49 +01:00
Oleksii Kriuchykhin
1fedb4c91e Improve speed of index query in projects overview service [SCI-3107] 2019-02-28 17:46:34 +01:00
Anton Ignatov
9e472c0ccf Fix missing user name in activty, when moving experiment 2019-02-28 16:06:23 +01:00
Oleksii Kriuchykhin
0266f6bd3c Change search on subject query constaruction logic [SCI-3014] 2019-02-27 13:21:05 +01:00
Anton Ignatov
978c4bcb69 Fixed, trying to save object instead name 2019-02-27 10:43:46 +01:00
Oleksii Kriuchykhin
74a60d443d Merge branch 'features/global-activities' into ok_SCI_3014_v2 2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin
a0d2f7c676 Move templates project creation for new team to delayed job [SCI-3101] 2019-02-26 13:32:00 +01:00
Oleksii Kriuchykhin
61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Urban Rotnik
5a123d26ac Activity model update 2019-02-26 07:15:05 +01:00
Urban Rotnik
3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Urban Rotnik
7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
aignatov-bio
fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-19 13:51:18 +01:00
Urban Rotnik
f63eaaefe7 Add user_system_notification records when syncing notifications, update email sending 2019-02-19 11:22:58 +01:00
Oleksii Kriuchykhin
c186498a5e Merge branch 'features/templates' into ok_SCI_3037 2019-02-15 10:47:38 +01:00
Alex Kriuchykhin
185e3b4832
Merge pull request #1495 from okriuchykhin/ok_SCI_3039 
Create templates project when syncing templates if team doesn't have it [SCI-3039]
 2019-02-14 17:40:01 +01:00
Mojca Lorber
343a46584f Rename scope 2019-02-14 14:54:04 +01:00
Mojca Lorber
0e14c126e5 Add scope instead of method for active my_module_group 2019-02-14 10:53:48 +01:00
Urban Rotnik
5b55860dea Add scheduler 2019-02-13 15:48:15 +01:00
Urban Rotnik
9f3187abdf Add service for sync system notifications 2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin
da30d187a6 Create templates project when syncing templates if team doesn't have it [SCI-3039] 2019-02-13 15:17:33 +01:00
Oleksii Kriuchykhin
f3ad4f7fc9 Fix failing test [SCI-3037] 2019-02-12 13:39:38 +01:00
Mojca Lorber
d706a18e2d Add flag for archived tasks to experiment exporter 2019-02-12 13:29:48 +01:00
Oleksii Kriuchykhin
7854b9d281 Merge branch 'features/templates' into ok_SCI_3037 2019-02-12 11:18:31 +01:00
Oleksii Kriuchykhin
445098fe45 Fix protocols in team export service [SCI-3037] 2019-02-12 10:56:15 +01:00
Alex Kriuchykhin
b71c9d96a2
Merge pull request #1476 from okriuchykhin/ok_SCI_2944 
Add test for templates service [SCI-2944]
 2019-02-12 09:39:03 +01:00
Jure Grabnar
0fa403d6b0 Refactor tests fro experiment import 
Closes [SCI-2946]
 2019-02-06 14:27:43 +01:00
Matej Zrimšek
f68adf1e5e Fix workflow image loading for moved experiments [SCI-3003] 2019-02-06 07:51:43 +01:00
Oleksii Kriuchykhin
19f1585352 Add test for templates service [SCI-2944] 2019-02-01 18:06:36 +01:00
Urban Rotnik
6f7fcb0831 Refactor method clone_experiment_as_template into service object 
[SCI-2925]
 2019-01-31 07:13:40 +01:00
Oleksii Kriuchykhin
cc57a8d4ef Fix template project name generation [SCI-2939] 2019-01-30 10:56:22 +01:00
Oleksii Kriuchykhin
cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Luka Murn
1f7bca485a
Merge pull request #1471 from biosistemika/master 
Merge master into features/templates
 2019-01-29 10:14:09 +01:00
Oleksii Kriuchykhin
f7b73c617a Fix code styling [SCI-2939] 2019-01-28 15:37:24 +01:00
Urban Rotnik
4cf12d12d1 Refactor 'move_experiment' method into service object 
Jira Ticket: SCI-2926
 2019-01-28 11:45:36 +01:00
Oleksii Kriuchykhin
bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +01:00
Urban Rotnik
f1d59e65f3 Add module and rename service object 2019-01-18 16:56:33 +01:00
Urban Rotnik
47cc6a9d10 Refactor workflow_image_generation and move to service class 2019-01-18 16:56:33 +01:00
Oleksii Kriuchykhin
fdf7db425b Merge branch 'master' into features/templates 2019-01-18 14:41:21 +01:00
Jure Grabnar
761932282b Fix Hound formatting 
Closes SCI-2937
 2019-01-16 16:11:38 +01:00
Jure Grabnar
d1f966ee05 Add importing of the experiment templates 2019-01-16 15:54:03 +01:00
Jure Grabnar
5b496a85d3 Experiment exporting works 2019-01-16 08:37:05 +01:00
Jure Grabnar
0184c97c61 Refactor TeamExporter into ModelExporter 2019-01-16 08:00:01 +01:00
Jure Grabnar
ff17a7e367 Fix S3_BUCKET not being defined 2019-01-14 16:49:08 +01:00
Alex Kriuchykhin
c2b38af91e
Merge pull request #1439 from okriuchykhin/ok_SCI_2888 
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
 2019-01-10 11:05:07 +01:00
Oleksii Kriuchykhin
6a64b23f90 Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888] 2019-01-04 10:44:38 +01:00
Oleksii Kriuchykhin
d5c07fd22a Improve rendering speed of inventory table [SCI-2910] 2018-12-13 16:17:22 +01:00
Luka Murn
f56847e44a Refactor team importer to use closed File.open blocks 2018-12-05 18:34:32 +01:00
Alex Kriuchykhin
d524a1d508
Merge pull request #1364 from okriuchykhin/ok_SCI_2778 
Add time format selection to settings [SCI-2778]
 2018-11-19 10:17:09 +01:00
Oleksii Kriuchykhin
7642d8d472 Fix sorting on projects table [SCI-2860] 2018-11-15 10:36:37 +01:00
Luka Murn
e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
 2018-11-14 16:59:04 +01:00
Oleksii Kriuchykhin
537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
mz3944
056efe170b
Merge pull request #1358 from mz3944/mz-SCI-2646 
Removal of the temporary files for export all [SCI-2646]
 2018-11-13 20:31:04 +01:00
Luka Murn
84df2c81f9 Merge branch 'features/export-all' 
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
 2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin
145c66a834 Fix user counters on projects overview page [SCI-2847] 2018-11-12 11:52:38 +01:00
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin
1feb13c74a Improve counters on projects overview table [SCI-2785] 2018-11-07 22:27:57 +01:00
Matej Zrimšek
8fe0249f45 Fix test for repository ZIP export & return path for ZIP exports [SCI-2646] 2018-11-07 05:04:29 +01:00
Alex Kriuchykhin
2b4ef619c2
Merge pull request #1345 from okriuchykhin/ok_SCI_2785 
Show all experiments and tasks for archived projects [SCI-2785]
 2018-10-29 11:56:38 +01:00
Oleksii Kriuchykhin
04ff5870af Rename user_id to sub in JWT [SCI-2814] 2018-10-28 14:34:51 +01:00
Oleksii Kriuchykhin
e9a8826a1e Show all experiments and tasks for archived projects [SCI-2785] 2018-10-24 18:49:59 +02:00
Matej Zrimšek
c8d170f9ec Add default page size when it's not in request params when fetching projects 2018-10-23 19:51:50 +02:00
Oleksii Kriuchykhin
02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Jure Grabnar
26df1e5a98 Add export project modal 
Closes [SCI-2645]
 2018-10-16 11:00:38 +02:00
Matej Zrimšek
1bf16537f6 Add PDF content to the export all ZIP [SCI-2641] 2018-10-14 23:56:10 +02:00
Oleksii Kriuchykhin
f221d71bbc Fix datatables state restore [SCI-2733] 2018-10-12 15:15:43 +02:00
Oleksii Kriuchykhin
8cf59d8d22 Add request rate throttling for API [SCI-2770] 2018-10-11 09:48:06 +02:00
Oleksii Kriuchykhin
af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Alex Kriuchykhin
16b29b50a5
Merge pull request #1321 from okriuchykhin/ok_SCI_2731 
Add Projects view - list/table view [SCI-2731]
 2018-10-08 17:53:35 +02:00
Jure Grabnar
d7c875135e
Merge pull request #1304 from jbargu/jg_zipfile_structure 
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
 2018-10-05 15:36:56 +02:00
Oleksii Kriuchykhin
492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Jure Grabnar
553ac4c360 Refactor code according to PR review 
PR review: https://github.com/biosistemika/scinote-web/pull/1304

Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].
 2018-09-30 16:37:18 +02:00
Oleksii Kriuchykhin
2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +02:00
Jure Grabnar
a3d7d37081 Format according to Hound bot #2 2018-09-23 11:30:20 +02:00
Jure Grabnar
64a6ed7ffe Format according to houndbot 2018-09-23 11:14:59 +02:00
Oleksii Kriuchykhin
7f7ece2be0 Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738] 2018-09-21 17:46:18 +02:00
Oleksii Kriuchykhin
84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
Jure Grabnar
d783c34d33 Clean some minor artefacts 2018-09-16 23:52:36 +02:00
Jure Grabnar
f8b1db7f72 Fix repository export and relative hyperlinks 2018-09-16 23:01:44 +02:00
Jure Grabnar
449aa12070 Refactor TeamZipExport code (move it into special file) 2018-09-16 20:28:26 +02:00
Oleksii Kriuchykhin
49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Oleksii Kriuchykhin
c8abb3d9b8 Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686] 2018-08-24 15:27:59 +02:00
Oleksii Kriuchykhin
0322316d74 Make API V1 togglable [SCI-2686] 2018-08-24 12:11:28 +02:00
Jure Grabnar
295c6a9432 Add export all functionality (basic skeleton) 2018-08-21 21:07:45 +02:00
Oleksii Kriuchykhin
ecde634a2c Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
Alex Kriuchykhin
422baaf64a
Merge pull request #1258 from okriuchykhin/ok_SCI_2619 
Add team deletion service [SCI-2619]
 2018-08-17 10:56:11 +02:00
Oleksii Kriuchykhin
ca6fc84ae2 Remove duplicated task outputs deletion [SCI-2619] 2018-08-10 16:43:40 +02:00
Alex Kriuchykhin
6004f8411b
Merge pull request #1260 from okriuchykhin/ok_SCI_2611 
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
 2018-08-08 16:59:42 +02:00
Oleksii Kriuchykhin
298b866df4 Fix failing tests [SCI-2611][SCI-2612] 2018-08-07 14:58:02 +02:00
okriuchykhin
dd9090efef
Merge pull request #1253 from okriuchykhin/ok_SCI_2608 
Adds API authentication with Azure AD [SCI-2608]
 2018-08-02 11:28:18 +02:00
Oleksii Kriuchykhin
bc1cd39229 Add team deletion service [SCI-2619] 2018-07-27 13:34:13 +02:00
Oleksii Kriuchykhin
0e372af729 Adds API authentication with Azure AD [SCI-2608] 2018-07-24 14:21:33 +02:00
Oleksii Kriuchykhin
3e7fc6720c Fix team import service 2018-07-20 16:10:45 +02:00
Luka Murn
f67b8d05c7
Merge pull request #1225 from okriuchykhin/ok_SCI_2534 
Fix rendering permissions of inventory annotations [SCI-2534]
 2018-07-13 15:18:59 +02:00
Zmago Devetak
00ed339520
Merge pull request #1233 from ZmagoD/zd_SCI_2589 
fixes bug with xslx files with numeric values [fixes SCI-2589]
 2018-07-06 11:08:27 +02:00
zmagod
c0d276ebee fixes bug with xslx files with numeric values [fixes SCI-2589] 2018-07-05 14:08:03 +02:00
Oleksii Kriuchykhin
42ce72170c Fix inventory cell copy with file attached [SCI-2585] 2018-07-02 12:58:49 +02:00
Oleksii Kriuchykhin
6660b240c8 Fix rendering permissions of inventory annotations [SCI-2534] 2018-06-28 15:30:32 +02:00
Zmago Devetak
54a17e0574
Merge pull request #1209 from ZmagoD/zd_SCI_2165 
Update team migration script to support "list of values" and "file" repository columns/cells [fixes SCI-2165]
 2018-06-27 15:31:27 +02:00
Zmago Devetak
29c379dbae
add rep_item to update_annotation function 2018-06-27 15:17:02 +02:00
zmagod
db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
zmagod
d68ae63c40 adds repository_items to smart annotation import 2018-06-19 11:58:22 +02:00
zmagod
fbcc788597 fixes per @duczOr request 2018-06-18 14:00:49 +02:00
zmagod
3d7591100a adds repository row assets to team import/export [fixes SCI-2165] 2018-06-14 15:20:57 +02:00
zmagod
4a82d1e7ac fixes repository items import 2018-06-14 14:40:43 +02:00
zmagod
f2c0b3aa92 removes samples, adds list_items 2018-06-13 12:45:48 +02:00
zmagod
9abf50e7c5 Limits the max. amount of rows when importing into inventories [fixes SCI-2468] 2018-05-31 10:45:31 +02:00
zmagod
c683cfdbd7 triggers the delayed job in the controller action, fixes smart annotations 2018-05-25 11:41:43 +02:00
zmagod
e019767e90 refactor save_pdf_to_inventory_item service 2018-05-17 13:17:19 +02:00
zmagod
b125863baf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 11:25:33 +02:00
zmagod
ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
Zmago Devetak
8a92f1a499
Merge pull request #1127 from ZmagoD/zd_SCI_2307_v3 
Adds custom method that generates smart annotations name for repository
 2018-05-16 13:23:25 +02:00
zmagod
4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
Luka Murn
63b7b937bb Fix a bug with table order not updating properly with col deletion 2018-05-15 20:44:15 +02:00
zmagod
3e10ff7fc5 add custom method that generates smart annotations name from repository name [fixes SCI-2307] 2018-05-04 10:44:23 +02:00
Zmago Devetak
9ce071693d
Merge pull request #1116 from ZmagoD/zd_SCI_2310 
parse smart annotations in repository export [fixes SCI-2310]
 2018-05-03 14:34:29 +02:00
Zmago Devetak
4fe4fea4fc
Merge pull request #1122 from ZmagoD/zd_SCI_2339 
repository when sorting/searching bug fix [SCI-2339]
 2018-05-03 12:05:39 +02:00
Luka Murn
cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
zmagod
23f8f35a2c a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339] 2018-04-26 11:05:02 +02:00
Luka Murn
cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix 
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
 2018-04-25 12:37:27 +02:00
zmagod
7d26ce561c parse smart annotations in repository export [fixes SCI-2310] 2018-04-24 14:53:49 +02:00
zmagod
efd1e470f6 rename smart annotations icons [fixes SCI-2307] 2018-04-23 12:38:54 +02:00
Luka Murn
c0da83c5de Add some additional nil guards 2018-04-20 12:31:22 +02:00
Luka Murn
d023db16af Update the destroy_column action so it properly updates all states 2018-04-20 12:31:22 +02:00
Luka Murn
21e7e7057e Refactor all the methods into two new services 2018-04-20 12:31:22 +02:00
Luka Murn
5e2622ecfc Change default repository state to Ruby representation 
Also remove some dead code from repositories datatables
 2018-04-20 12:31:22 +02:00
Zmago Devetak
6b4d786acc
Merge pull request #1105 from ZmagoD/zd_SCI_2307 
change repository icon
 2018-04-19 17:58:48 +02:00
zmagod
bb3e1b4dcf change repository icon 2018-04-19 15:39:24 +02:00
zmagod
f3af8f4524 switch current_team to repository.team 2018-04-19 13:04:16 +02:00
zmagod
9baaad25b6 add current_user to cloned created_by, last_modified_by field 2018-04-16 12:38:25 +02:00
zmagod
4f21833373 changes per @duco 's request 2018-04-13 11:47:33 +02:00
zmagod
6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod
b51ad84ee5 add asset field preview/sort/search in repository table [fixes SCI-2076] 2018-04-06 12:03:39 +02:00
Zmago Devetak
d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206 
add ID column to repository [fixes SCI-2206]
 2018-04-04 15:39:59 +02:00
zmagod
e630d3113f add ID column to repository [fixes SCI-2206] 2018-04-04 11:55:11 +02:00
zmagod
8a156ad91e change method name 2018-04-03 13:05:25 +02:00
zmagod
7dfec94ffc remove samples from smart annotations 2018-04-03 09:43:12 +02:00
zmagod
01a548e8b3 fix hound 2018-03-29 16:11:21 +02:00
zmagod
659a088058 refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222] 2018-03-29 15:55:26 +02:00
okriuchykhin
13fed0411b
Merge pull request #1063 from biosistemika/release-1.12.11 
merge release 1.12.11 branch to master
 2018-03-27 16:19:57 +02:00
zmagod
064bd88584 fix assigned query 2018-03-19 17:49:09 +01:00
zmagod
fad4001273 fix edit row action 2018-03-16 12:27:19 +01:00
zmagod
1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
okriuchykhin
503617b42c
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025 2018-03-13 14:44:20 +01:00
okriuchykhin
f14931f6a8
Update with latest changes on branch 2018-03-13 14:37:12 +01:00
okriuchykhin
262c21d145
Merge pull request #1036 from okriuchykhin/ok_SCI_2078 
Implement importable selector for repository columns [SCI-2078]
 2018-03-13 13:14:53 +01:00
Oleksii Kriuchykhin
be1ead22e0 Implement importable selector for repository columns [SCI-2078] 2018-03-13 11:36:05 +01:00