scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 17:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
10800 commits 69 branches 179 tags 165 MiB
Commit graph

1712 commits

Author SHA1 Message Date
Oleksii Kriuchykhin d67f7691a1 Add configuration variable for webhooks, disable by default [SCI-6031] 2021-08-26 14:08:15 +02:00
artoscinote 295d27f0d7
Added option to override default OTP drift time [SCI-6027] (#3507) 2021-08-25 14:02:25 +02:00
Martin Artnik 143e491016 Fixed registering bioeddie molecule on step [SCI-5985] 2021-08-11 14:10:05 +02:00
Martin Artnik 5d5f406e9a Downcase all user emails, downcase when finding user [SCI-5963] 2021-08-11 13:18:58 +02:00
Martin Artnik 57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
artoscinote f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration 
Features/bioeddie integration
 2021-08-03 13:32:53 +02:00
artoscinote c41247a5fd
Merge pull request #3439 from artoscinote/ma_SCI_5879 
Implement Save & Register molecule [SCI-5879]
 2021-08-03 12:15:46 +02:00
Martin Artnik 13ddff89a8 Fixed Asset relation handling in activities [ma_SCI_5789] 2021-08-03 09:59:06 +02:00
Martin Artnik a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
Martin Artnik ae174b276a Code review fixes and error handling improvements [SCI-5942] 2021-08-02 15:42:53 +02:00
Martin Artnik 123e415a4f Print status backend + FE integration [SCI-5942] 2021-08-02 15:42:53 +02:00
aignatov-bio a782ce50d1
Add bio eddie files to export all [SCI-5877] (#3426) 2021-08-02 13:27:02 +02:00
Martin Artnik e63a665140 Merge branch 'develop' into features/barcodes 2021-08-02 11:15:48 +02:00
Martin Artnik 0f417f9730 Merge branch 'develop' into features/barcodes 2021-07-29 13:32:17 +02:00
Martin Artnik 5c4f923854 Corrected type for 'assignment' activities [SCI-5662] 2021-07-29 10:13:28 +02:00
Martin Artnik 67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
Martin Artnik b41ee028ca Added overridable send permission method to notifications [SCI-5938] 2021-07-28 13:14:07 +02:00
Martin Artnik b32b207f3d Added FLUICS API client [SCI-5939] 2021-07-23 13:52:28 +02:00
Oleksii Kriuchykhin c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
Martin Artnik 4bb080c25b Merge migrations, code fixes [SCI-5800] 2021-07-22 10:51:03 +02:00
Alex Kriuchykhin dfa2a7775d
Merge pull request #3422 from okriuchykhin/ok_SCI_5847 
Fix repository cell joining and preloading [SCI-5847]
 2021-07-21 13:18:21 +02:00
aignatov-bio 4de35c983a
Open HELM files in bio eddie [SCI-5890] (#3442) 2021-07-20 13:06:47 +02:00
Martin Artnik c43e1cfbe5 Fixed db error during build 2021-07-20 10:20:47 +02:00
artoscinote 3a281ce9dc
Merge pull request #3433 from artoscinote/ma_SCI_5607 
Also send notification to the user that was unassigned from task [SCI-5607]
 2021-07-20 09:41:46 +02:00
artoscinote 5f9c04844f
Added prefixed IDs to repository rows (items) [SCI-5909] (#3441) 
* Added prefixed IDs to repository rows (items) [SCI-5909]

* Fix prefixed id queries to work with joins, use subquery in repository search [SCI-5909]

* Fixed accessing repository_row parent code [SCI-5909]

* Better handling of repository_row code display [SCI-5909]

* Fix index warning for id prefixed models issue setting up project [SCI-5909]
 2021-07-19 14:23:36 +02:00
Martin Artnik a8f8ab8ba9 Implement label templates with default ZPL template [SCI-5902] 2021-07-19 09:44:14 +02:00
Martin Artnik 96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +02:00
Martin Artnik 1985b7a7e0 Also send task unassign notification to the person that was unassigned [SCI-5607] 2021-07-13 12:11:49 +02:00
zmagoD 277da3abcf fix merge issues 2021-07-10 15:20:55 +02:00
Oleksii Kriuchykhin 549fc8e5a0 Fix repository cell joining and preloading [SCI-5847] 2021-07-07 17:43:51 +02:00
Martin Artnik fdf9c5f6ae Reset file_processing when new file is upladed [SCI-5870] 2021-07-07 14:57:35 +02:00
Oleksii Kriuchykhin d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
artoscinote 723b594632
Merge pull request #3398 from artoscinote/ma_SCI_5828 
Expose experiment IDs in interface and reports [SCI-5828]
 2021-06-30 12:58:25 +02:00
Martin Artnik e1b0b65465 Improved code style, fixed bug [SCI-5828] 2021-06-29 15:57:23 +02:00
zmagoD 9c812e84bd setup logic to group assign all team members and handle the unassignments logic 2021-06-27 13:22:19 +02:00
Martin Artnik b2e2186d9f Remove unnecessary tasks hash from full export [SCI-5840] 2021-06-22 14:57:07 +02:00
Martin Artnik c4e6b0bbaf Fixed export all report html generation [SCI-5840] 2021-06-22 14:50:47 +02:00
Martin Artnik eaa713f5b8 Fix indices [SCI-5829] 2021-06-22 12:51:25 +02:00
zmagoD 9b87fce840 add read check to view methods 2021-06-20 11:11:03 +02:00
zmagoD ad10befcc4 add new manage access permission to PET levels 2021-06-19 17:17:57 +02:00
Martin Artnik 29ff910eba Added searching experiments by EX[ID] [SCI-5829] 2021-06-18 14:12:59 +02:00
Martin Artnik 0866a2e251 Added experiment ID to card and table views [SCI-5828] 2021-06-18 14:12:59 +02:00
Oleksii Kriuchykhin bb458abec6 Remove old reports code [SCI-5650] 2021-06-18 10:40:00 +02:00
Martin Artnik 47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +02:00
Martin Artnik 4ee50f87d5 Implement webhook service and scheduling jobs [SCI-5801, SCI-5802] 2021-06-17 09:19:04 +02:00
Oleksii Kriuchykhin 85a5cca98a Fix repository snapshots for export all [SCI-5776] 2021-06-16 16:17:12 +02:00
zmagoD 25802d7043 adopt move/clone my module logic to work with new user assignments (SCI-5805) 2021-06-12 18:51:55 +02:00
zmagoD 7128987418 fix code style 2021-06-12 10:58:26 +02:00
zmagoD 7e4f47f667 update experiment and my_module search 2021-06-12 10:27:53 +02:00
zmagoD 8997ba10d1 mark user assigmetns when they are created manually or automatically 2021-06-12 09:36:41 +02:00
aignatov-bio afe2a19c88
Add webhooks management [SCI-5767] (#3376) 
* Add webhooks managment [SCI-5767]

* Markup fixes [SCI-5676]
 2021-06-09 12:53:11 +02:00
Miha Mencin 48202c88d1
Merge pull request #3350 from aignatov-bio/ai-sci-5601-add-pdf-preview-for-docx-report 
Add pdf preview for docx reports [SCI-5601]
 2021-06-09 11:27:45 +02:00
aignatov-bio 16f83a3e60 Remove docx preview processing flag [SCI-5601] 2021-06-09 10:58:27 +02:00
Miha Mencin 46e2adf2e3
Merge pull request #3334 from okriuchykhin/ok_SCI_5730 
Improve filtering for inventories [SCI-5730]
 2021-06-09 09:50:56 +02:00
Oleksii Kriuchykhin 16bad9eb9c Fix export all functionality [SCI-5776] 2021-06-08 14:21:34 +02:00
zmagoD ddaa4b4c57 replase user_projects with user_assignment where the permissions are calculated 2021-06-06 10:29:01 +02:00
zmagoD 784e43e328 create user_assignments for all child objects when the user is attached to the project 2021-06-06 09:54:47 +02:00
aignatov-bio 3c7592657c Add activity filters [SCI-5765] 2021-05-31 13:39:10 +02:00
zmagoD debff7bc85 fix code style 2021-05-29 19:25:46 +02:00
Alex Kriuchykhin 6d56ea2ee0
Merge pull request #3358 from okriuchykhin/ok_SCI_5773 
Remove experiment from report if it is moved to another project [SCI-5773]
 2021-05-28 14:02:30 +02:00
Alex Kriuchykhin cdbcbd0409
Merge pull request #3357 from okriuchykhin/ok_SCI_5751 
Fix deletion of old reports [SCI-5751]
 2021-05-28 13:59:36 +02:00
Oleksii Kriuchykhin cc8cc595d7 Remove experiment from report if it is moved to another project [SCI-5773] 2021-05-28 11:31:45 +02:00
Oleksii Kriuchykhin 70f0535dbd Fix deletion of old reports [SCI-5751] 2021-05-27 16:31:58 +02:00
aignatov-bio 24f4f6cbb2 Fix report experiments sorting [SCI-5762] 2021-05-27 12:44:45 +02:00
aignatov-bio 2be59bf8b2 Add pdf preview for docx reports [SCI-5601] 2021-05-25 15:14:50 +02:00
Miha Mencin e675e4004e
Merge pull request #3348 from aignatov-bio/ai-sci-5753-fix-export-all 
Fast fix for export all [SCI-5753]
 2021-05-24 15:19:11 +02:00
aignatov-bio 2651e8ff35 Fast fix for export all [SCI-5753] 2021-05-24 13:16:43 +02:00
zmagoD 300c1521fd add new API endpoints and fix/update ExperimentMember and MyModuleMember modules 2021-05-22 18:36:30 +02:00
zmagoD be94cb09c2 fix code style 2021-05-22 14:41:56 +02:00
zmagoD 67cf09e030 log activities on experiment and my_module assignment change 2021-05-22 13:59:27 +02:00
Oleksii Kriuchykhin 64ce35c8da Refactor DOCX report generator [SCI-5735] 2021-05-21 16:40:38 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin 7d9a79456a Remove task from report if it is moved to another experiment [SCI-5741] 2021-05-20 21:21:27 +02:00
Oleksii Kriuchykhin 0ff1277dbf Improve filtering for inventories [SCI-5730] 2021-05-19 22:48:52 +02:00
aignatov-bio 0b97ffe5c6 xRemove default value from pdf/docx_file_status [SCI-5728] 2021-05-18 15:24:13 +02:00
Miha Mencin 491dc22294
Merge pull request #3321 from okriuchykhin/ok_SCI_5724 
Fix default empty options for report wizard first page [SCI-5724]
 2021-05-17 10:28:57 +02:00
Miha Mencin d952edd389
Merge pull request #3316 from okriuchykhin/ok_SCI_5702 
Add generation error states to reports [SCI-5702]
 2021-05-17 10:16:06 +02:00
zmagoD c23c01c01c remove user projects enpoints, fix the role name display 2021-05-16 12:03:16 +02:00
zmagoD de4c28069a fix experiment level styling issues and update the dropdown placeholerds 2021-05-16 11:04:04 +02:00
Oleksii Kriuchykhin 167ebd3d58 Fix default selection of results in reports wizard [SCI-5726] 2021-05-13 15:44:06 +02:00
Oleksii Kriuchykhin 697809ff6a Fix default empty options for report wizard first page [SCI-5724] 2021-05-13 14:24:47 +02:00
aignatov-bio 3ba96be787 Remove report name uniqness [SCI-5718] 2021-05-12 14:56:22 +02:00
Oleksii Kriuchykhin a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
zmagoD 5ee38966a0 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-05-11 08:36:39 +02:00
zmagoD d145dd6d36 add my module assigments modals 2021-05-09 16:59:10 +02:00
zmagoD ac91d9c2c4 add assign user permission to experiment level 2021-05-08 18:06:07 +02:00
zmagoD c0eb38b564 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/new_permissions 2021-05-08 10:33:43 +02:00
zmagoD 331a68e9b6 fix new experiment creation 2021-05-08 10:05:22 +02:00
Oleksii Kriuchykhin b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
zmagoD 47cb1b31dc fix code style 2021-05-02 11:36:10 +02:00
zmagoD c1d98f421d update scenarios and UI logic to handle project page reload after modal close 2021-05-02 11:22:59 +02:00
zmagoD 11e5662c47 add fe logic for disable/enable fields 2021-04-30 13:26:06 +02:00
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +02:00
Oleksii Kriuchykhin bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +02:00
zmagoD c136d953d0 create form object for role assigment, create helper object for project member, added new user_projects modal 2021-04-24 18:43:28 +02:00
aignatov-bio d18a54c874
Update create and update action for reports controller [SCI-5641] (#3260) 
Update create and update action [SCI-5641]
 2021-04-20 13:35:40 +02:00
zmagoD 04ef7a4478 add show and edit permissions modal 2021-04-18 17:19:16 +02:00
zmagoD 3333241c9a add CTA for project members modal SCI-5645 2021-04-18 12:23:29 +02:00
Alex Kriuchykhin 80827ce761
Merge pull request #3257 from biosistemika/SCI-5623-add-external-id-to-user 
SCI-5623 add external id to user
 2021-04-14 16:15:43 +02:00
miha e610683d5c [SCI-5623] added external_id setting to user 2021-04-14 09:44:09 +02:00
aignatov-bio 101d46956c Add logic for preparing wizard data for report [SCI-5593] 2021-04-12 12:42:22 +02:00
miha 4f7f257b78 Remove cascading save from step 2021-04-12 12:20:05 +02:00
miha 2e45093856 fix a stupid2 2021-04-12 10:31:35 +02:00
miha b917a0c3e0 fix a stupid 2021-04-12 10:30:37 +02:00
miha 56ebc3dc07 [SCI-5635] add a migration to fix broken steps, fix the api so it sets last_modified_by_id, minor step model refactor 
migration fix

remove the conditoin for set_last_modified_by callback

set the last_modified_by_id in before_save callback (in case it is not set yet)

remove trailing spaces

Set last modified in protocl import service
 2021-04-12 09:59:00 +02:00
Oleksii Kriuchykhin 67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
Oleksii Kriuchykhin a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
aignatov-bio 82be23db81 Add project and template selector [SCI-5570] 2021-03-31 15:32:03 +02:00
Oleksii Kriuchykhin 2b2b6f7774 Fix for API float parsing in the inventory number type column [SCI-5604] 2021-03-29 15:59:24 +02:00
miha 11284d3b87 [SCI-5577] filter notifications 2021-03-29 09:52:57 +02:00
Oleksii Kriuchykhin f7c865974d Switch to graphviz gem [SCI-5596] 2021-03-25 17:42:57 +01:00
aignatov-bio a7d0f5050d Remove project on project restore [SCI-5582] 2021-03-22 15:20:47 +01:00
Oleksii Kriuchykhin d006b813b9 Add pdf and docx attachments to reports [SCI-5558] 2021-03-15 13:30:03 +01:00
Urban Rotnik 8202181095
Merge pull request #3186 from urbanrotnik/ur-sci-4140-fix-notifications 
Bring back old notifications [SCI-4140]
 2021-03-09 14:54:08 +01:00
Urban Rotnik ab1477997a Update variables name 2021-03-09 14:50:14 +01:00
Urban Rotnik 96ef0c10da
Merge pull request #3148 from urbanrotnik/ur-sci-5450-remamber-user-view-mode 
Store Table/Cards view setting per user [SCI-5450]
 2021-03-08 11:48:33 +01:00
aignatov-bio df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
Urban Rotnik 235f19cf25 Store Table/Cards view setting per user 
SCI-5450
 2021-03-04 14:56:59 +01:00
Oleksii Kriuchykhin 2b5709e75f Improve behavior of the scheduler, add caching to system notifications sync service [SCI-5526] 2021-03-02 17:28:07 +01:00
Oleksii Kriuchykhin d8cffe53c7 Add migration for new user assignments to projects [SCI-5478] 2021-03-01 14:28:21 +01:00
aignatov-bio 0c5a1a3e21 Fix tests [SCI-5528] 2021-02-26 16:29:56 +01:00
Urban Rotnik 1bb2393655 Use translations 
SCI-4140
 2021-02-25 11:59:26 +01:00
Urban Rotnik 347f208480 Bring back old notifications 
SCI-4140
 2021-02-25 11:59:14 +01:00
Oleksii Kriuchykhin 49194d1a45 Prepare initial user roles in the database [SCI-5435] 2021-02-22 11:58:40 +01:00
Oleksii Kriuchykhin 3b90225c5a Add new permission checking logic [SCI-5436] 2021-02-22 11:55:48 +01:00
aignatov-bio 58a5126a13 Fix normalize_module_position method [SCI-5508] 2021-02-19 14:41:57 +01:00
Oleksii Kriuchykhin 7d89088b14 Multiple small bugfixes [SCI-5494] 2021-02-18 13:55:03 +01:00
Urban Rotnik 79cacb41c4 Fixed uniqueness name validation for ProjectFolder 2021-02-12 13:35:44 +01:00
aignatov-bio f3c1d123d4 Fix duplicate code 2021-02-05 11:28:38 +01:00
Miha Mencin 107b7a0427
Merge pull request #3114 from urbanrotnik/ur-sci-5417-folders-name-uniquness-scope 
Add Archived to ProjectFolder name uniqueness scope [SCI-5417]
 2021-02-05 09:59:40 +01:00
Miha Mencin 0e9b714c9f
Applying Alex's suggestion 
Co-authored-by: Alex Kriuchykhin <okriuchykhin@biosistemika.com>
 2021-02-05 08:19:42 +01:00
Oleksii Kriuchykhin 1e3e701788 Add models for new permissions objects [SCI-5434] 2021-02-04 14:08:20 +01:00
Oleksii Kriuchykhin c62c464902 Implement editing options and modals for experiment card [SCI-5367] 2021-02-04 12:06:51 +01:00
Alex Kriuchykhin 1466ae114f
Merge pull request #3027 from okriuchykhin/ok_SCI_5246 
Remove Demo project and Samples inventory [SCI-5246][SCI-5248]
 2021-02-04 11:28:09 +01:00
Oleksii Kriuchykhin bba8e0326d Fix module normalization in canvas update [SCI-5463] 2021-02-03 14:58:04 +01:00
Oleksii Kriuchykhin 324c268594 Remove Demo project and Samples repository [SCI-5246][SCI-5248] 2021-02-01 15:02:06 +01:00
aignatov-bio 8be9d3b14c
Merge pull request #3126 from biosistemika/features/new-experiments-page 
Features/new experiments page
 2021-01-29 13:28:11 +01:00
Oleksii Kriuchykhin 75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
Alex Kriuchykhin f1124f9ea0
Add experiments overview service [SCI-5430] (#3116) 2021-01-28 12:57:04 +01:00
Urban Rotnik 68ac663370 Add Archived to ProjectFolder name uniqueness scope 
SCI-5417
 2021-01-22 08:56:43 +01:00
Urban Rotnik 0a1abf83c6
Merge pull request #3099 from urbanrotnik/ur-sci-5351 
Fix folders exports, add error message [SCI-5351]
 2021-01-19 11:01:08 +01:00
Urban Rotnik 92d8199381 Add parent_folder validation 
SCI-5422
 2021-01-19 10:40:29 +01:00
Urban Rotnik ddbc22b274 Fix folders exports, add error message 
SCI-5351
 2021-01-19 09:47:42 +01:00
Urban Rotnik 485aa0d541 Remove project_folder in callback 2021-01-12 13:04:36 +01:00
Urban Rotnik 996f604df1 Touch parent folder of folder 2021-01-12 10:46:19 +01:00
Urban Rotnik f478ad91c3
Merge pull request #3058 from urbanrotnik/ur-sci-5312 
Folder name uniqueness validation on folder level and renaming [SCI-5312]
 2021-01-08 10:40:52 +01:00
Urban Rotnik fbce70be0c Add unique validation and ensure_uniqueness callback while moving folder 
[SCI-5312]
 2021-01-08 08:21:09 +01:00
Urban Rotnik 427b5d7107
Merge pull request #3059 from biosistemika/features/folders 
Features/folders into develop
 2021-01-08 06:26:44 +01:00
Urban Rotnik 20acd9b693 Fix controller and tests 2021-01-07 17:41:39 +01:00
Oleksii Kriuchykhin f43340a849 Fix projects visibility in the sidebar [SCI-5338] 2021-01-05 13:50:42 +01:00
Alex Kriuchykhin a8991356b5
Merge pull request #3033 from okriuchykhin/ok_SCI_5341 
Fix restore action for experiments and tasks [SCI-5341]
 2021-01-05 10:09:39 +01:00
Oleksii Kriuchykhin 58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +01:00
Alex Kriuchykhin 163a2d1e60
Merge pull request #3042 from okriuchykhin/ok_SCI_5340 
Make active projects view default [SCI-5340]
 2021-01-04 11:56:22 +01:00
Oleksii Kriuchykhin ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin 0cb221609a Fix global activities page [SCI-5324] 2020-12-27 22:05:15 +01:00
aignatov-bio b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) 
* Add PDF Preview [SCI-5299]
 2020-12-22 15:25:30 +01:00
Urban Rotnik 4ff1770d50 Remove uniqueness validation on Experiment name 
SCI-5288
 2020-12-18 16:48:50 +01:00
Oleksii Kriuchykhin 67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Urban Rotnik d3e38c89f8 Update BE sorting for archived fodlers&projects 
SCI-5306
 2020-12-18 11:27:17 +01:00
Urban Rotnik 7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik 87ca79717c Add separate sorting for active/archived view 
[SCI-5306]
 2020-12-18 08:41:51 +01:00
Miha Mencin 6dc4fae45b
Merge pull request #3003 from okriuchykhin/ok_SCI_5268 
Archiving: add 'archived' flag on folder [SCI-5268]
 2020-12-17 13:13:26 +01:00
aignatov-bio 2ca7b81cea
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011) 
* Change experiment archived card [SCI-5270]
 2020-12-17 13:07:30 +01:00
Oleksii Kriuchykhin f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
Oleksii Kriuchykhin 0c65f3f7c2 Implement sorting on the project screen (when filterin/searching) [SCI-5281] 2020-12-17 12:43:09 +01:00
Miha Mencin ba3db65437
Merge pull request #3008 from okriuchykhin/ok_SCI_5273 
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
 2020-12-17 09:44:40 +01:00
Miha Mencin ea9f3dcada
Merge pull request #2996 from okriuchykhin/ok_SCI_5253 
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
 2020-12-17 09:17:44 +01:00
Oleksii Kriuchykhin 2a666a3718 Implement additional preview type PDF of the whole document [SCI-5297] 2020-12-16 12:51:10 +01:00
Oleksii Kriuchykhin 94b6c96e48 Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273] 2020-12-12 22:46:30 +01:00
aignatov-bio 6a44e23697
Add projects sidebar [SCI-5178] (#2995) 
* Add projects sidebar navigation [SCI-5178]
 2020-12-08 16:07:26 +01:00
Oleksii Kriuchykhin 62374bee0a Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253] 2020-12-07 11:04:33 +01:00
Urban Rotnik 7773afbcdb Add activities for Project Folders [SCI-5181] 2020-12-04 12:03:49 +01:00
Urban Rotnik 87b5552b27 Add equals team validations for project and folder 2020-12-02 14:53:46 +01:00
aignatov-bio a27c78e445
Merge pull request #2988 from aignatov-bio/ai-sci-5260-add-direction-condition-for-status-consequences 
Add direction condition for status consequences [SCI-5260]
 2020-12-01 16:14:31 +01:00
aignatov-bio d1af011c0c [SCI-5260] Fix markup 2020-12-01 15:10:28 +01:00
aignatov-bio 04624692d3 [SCI-5260] Add afterward and backward actions to consequence 2020-12-01 15:07:01 +01:00
Alex Kriuchykhin 7b17d9d54d
Merge pull request #2971 from okriuchykhin/ok_SCI_5238 
Improve limit check for repository list and checklist items [SCI-5238]
 2020-11-30 19:59:46 +01:00
aignatov-bio ad960d801d [SCI-5260] Fix markup 2020-11-30 15:20:02 +01:00
aignatov-bio 99ad705d82 [SCI-5260] Fix markup 2020-11-30 15:18:46 +01:00
aignatov-bio 0620da99de [SCI-5260] Add direction condition for status consequences 2020-11-30 12:28:29 +01:00
aignatov-bio 48184df312
Merge pull request #2985 from aignatov-bio/ai-sci-5250-add-preview-to-export-all 
Add preview files to export all [SCI-5250]
 2020-11-30 12:21:43 +01:00
Oleksii Kriuchykhin 8ee1580ae4 Fix tests for repository list and checklist items [SCI-5238] 2020-11-27 14:59:17 +01:00
Oleksii Kriuchykhin 78e050ccc0 Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171] 2020-11-27 14:27:24 +01:00
aignatov-bio 8cdf09f244 Add preview files to export all 2020-11-27 11:07:37 +01:00
aignatov-bio d162fb6d35
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete 
Add delete asset confirmation modal [SCI-5241]
 2020-11-26 15:35:40 +01:00
aignatov-bio d13ff053b5
Merge pull request #2960 from aignatov-bio/ai-sci-5228-fix-sorting-of-assets-in-reports 
Fix assets sorting in report [SCI-5228]
 2020-11-26 11:46:50 +01:00
aignatov-bio 1979883004 Add delete asset confirmation modal 2020-11-25 12:50:34 +01:00
Oleksii Kriuchykhin 0de237cece Implement project search with grouping by folder [SCI-5207] 2020-11-25 11:59:02 +01:00
aignatov-bio dc62e2780a
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout 
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
 2020-11-24 11:25:36 +01:00
Oleksii Kriuchykhin 1a38b34b94 Improve limit check for repository list and checklist items [SCI-5238] 2020-11-23 12:54:29 +01:00
aignatov-bio 77b7b1b231 Add errors handling and i18n 2020-11-21 12:31:49 +01:00
aignatov-bio da4b8aaf2f Add comments list 2020-11-20 12:29:40 +01:00
Oleksii Kriuchykhin 86e5078622 Add project folders to global search [SCI-5180] 2020-11-20 11:10:03 +01:00
aignatov-bio 483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
aignatov-bio fcdad51222 Fix assets sorting in report 2020-11-17 15:33:25 +01:00
Oleksii Kriuchykhin 6dfeae2283 Make folders selectable for 'Export all' functionality [SCI-5183] 2020-11-13 14:39:10 +01:00
Miha Mencin 6e2972dc9b
Merge pull request #2943 from okriuchykhin/ok_SCI_5190 
Add check for zero page size in repository states [SCI-5190]
 2020-11-11 10:23:06 +01:00
Oleksii Kriuchykhin 038cd8d5d7 Fix repository state columns handling [SCI-5190] 2020-11-10 17:24:04 +01:00
Urban Rotnik 8ac59fd699 Fix acessiable_by_team scope 2020-11-06 10:43:18 +01:00
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
aignatov-bio 12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +01:00
Oleksii Kriuchykhin e87407bbd3 Create database structure for project folders [SCI-5126] 2020-10-29 15:44:21 +01:00
Urban Rotnik e923128c0e
Merge pull request #2927 from biosistemika/features/signature-requests 
Features/signature requests into develop
 2020-10-29 14:48:25 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Miha Mencin 235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2 
Release/1.20.2
 2020-10-28 13:58:25 +01:00
aignatov-bio f4bf2ab75f Remove empty children from extents 2020-10-22 14:29:35 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Mojca Lorber 2639810e1a Fix no step bug 2020-10-22 13:21:05 +02:00
Miha Mencin c31a7373fb
Merge pull request #2902 from mlorb/ml-sci-5089 
Add 'Open in APP' button to the task
 2020-10-19 12:28:35 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio bdcc7939ad Update export all generator 2020-10-16 18:25:01 +02:00
aignatov-bio 3fe3c2087f Fix hound issues 2020-10-16 11:27:23 +02:00
aignatov-bio 566ef7aef7 Add list view to atachments 2020-10-16 11:00:57 +02:00
aignatov-bio 016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
Urban Rotnik d88040fd1b Move snapshot default selection to core from addon 2020-10-15 15:21:44 +02:00
aignatov-bio 0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
aignatov-bio f1a5811d5f
Merge pull request #2809 from biosistemika/ai-sci-4960-render-wopi-preview-only-in-view-port 
Render wopi preview only in view port
 2020-10-14 21:29:56 +02:00
aignatov-bio e240b629c4 Fix rubocop issues 2020-10-14 12:12:32 +02:00
aignatov-bio 36bab10de7 Update export all to tree structure 2020-10-14 12:08:04 +02:00
aignatov-bio a7da7b0de3 Refactor export all my module generator 2020-10-12 15:55:06 +02:00
Oleksii Kriuchykhin caa2098550 Improve handling of empty cells in inventory imports [SCI-5094] 2020-10-12 14:42:47 +02:00
Oleksii Kriuchykhin 7cd12bfb07 Fix protocol repository save/load timestamps [SCI-5067] 2020-10-06 15:30:04 +02:00
Urban Rotnik e9ac999645
Merge pull request #2880 from urbanrotnik/ur-sci-5067-protocols-sync 
Fix updating updated_at on protocol while load/sync with repository [SCI-5067]
 2020-09-29 16:54:42 +02:00
Urban Rotnik 7c312a844f Fix updating updated_at on protocol while load/sync with repository 2020-09-29 15:37:40 +02:00
Oleksii Kriuchykhin 1603ec6d1a Switch to a new version of Yomu gem 2020-09-29 13:11:50 +02:00
aignatov-bio 9d64121577 Refactor WOPI discovery 2020-09-29 12:58:05 +02:00
aignatov-bio 1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +02:00
Urban Rotnik 3de2aee921
Merge pull request #2864 from urbanrotnik/ur-sci-4993 
Assign user to cloned experiment [SCI-4993]
 2020-09-23 13:37:07 +02:00
aignatov-bio 0865802255
Merge pull request #2853 from aignatov-bio/ai-sci-5024-disable-autostrip-on-status-change 
Disable autostrip attrbiutes on status change [SCI-5024]
 2020-09-23 13:18:07 +02:00
Urban Rotnik 5be7a1b32d Assign user to cloned experiment 2020-09-23 11:31:18 +02:00
mlorb feda5622d8
Merge pull request #2860 from mlorb/ml-sci-5007 
Add info of the locked task to the View status flow modal [SCI-5007]
 2020-09-23 10:19:48 +02:00
Mojca Lorber affae15ccf Simplification 2020-09-22 17:19:15 +02:00
aignatov-bio bbfd4b1c02 Run autostrip when related field changed 2020-09-22 12:48:52 +02:00
aignatov-bio f8a28f378e Add shared inventories to smart annotation 2020-09-21 14:36:34 +02:00
Oleksii Kriuchykhin e456661a98 Fix task archiving and moving [SCI-5030] 2020-09-17 17:15:41 +02:00
aignatov-bio ec9446d0cb Disable autostrip attrbiutes on status change 2020-09-17 15:26:48 +02:00
aignatov-bio e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
aignatov-bio 6ed8757eb1 Merge branch 'features/task-flows' into develop 2020-09-17 14:52:05 +02:00
Urban Rotnik 462fb12a41 Update SQL query 2020-09-17 13:30:27 +02:00
Urban Rotnik 777afd0e9b Add improved search for smart annotations 2020-09-17 13:19:52 +02:00
Oleksii Kriuchykhin ff1476d46a Fix status consequences execution order [SCI-5004] 2020-09-16 13:45:58 +02:00
Oleksii Kriuchykhin 73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
Oleksii Kriuchykhin a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
aignatov-bio 5a063f070d Clone module before condition validation 2020-09-10 16:53:07 +02:00
aignatov-bio 18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
aignatov-bio 946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses 
Add front-end checks for statuses [SCI-4975]
 2020-09-09 13:21:04 +02:00
aignatov-bio 5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions 
Add description for conditions [SCI-4983]
 2020-09-09 11:33:48 +02:00
aignatov-bio bdb3caf5cf Add i18n 2020-09-09 08:50:24 +02:00
aignatov-bio 687093e110
Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks 
Add completed/uncompleted methods to my_module [SCI-4972]
 2020-09-09 08:20:36 +02:00
aignatov-bio 4083ed1755 Fix tests 2020-09-08 14:52:23 +02:00