scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
16671 commits 70 branches 179 tags 165 MiB
Commit graph

3566 commits

Author SHA1 Message Date
Alex Kriuchykhin 3de2f6d0f1
Add generic SAML SSO strategy implementation [SCI-9579] (#6775) 2023-12-20 17:52:33 +01:00
Anton 79969492dd Replace tasks table [SCI-9801] 2023-12-20 17:47:09 +01:00
Alex Kriuchykhin dbedac3a9b
Add omniauth_openid_connect gem, implement basic sign-in flow [SCI-9578] (#6666) 2023-12-20 14:02:09 +01:00
wandji 54b1c182d8
Add V2 API endpoints for step elements [SCI-9650] (#6825) 
* Add V2 API endpoints for step elements [SCI-9650]

* Rewrite step controller actions in order to read V2 step serializer [SCI-9650]
 2023-12-19 15:36:41 +01:00
Andrej 436be9cbdd Fix filter label on webhook page [SCI-9752] 2023-12-19 10:41:23 +01:00
ajugo a343701299
Implement api v2 for results [SCI-9651] (#6699) 2023-12-14 11:31:12 +01:00
Oleksii Kriuchykhin 372ef32f03 Merge branch 'develop' into features/inventory-items-relationships 2023-12-14 11:28:04 +01:00
Anton c3b4360ff5 Merge branch 'develop' into features/new-datatable 2023-12-13 16:11:35 +01:00
Martin Artnik 9b97e397ed Merge branch 'develop' into features/asset-sync 2023-12-13 16:05:18 +01:00
Oleksii Kriuchykhin 970dc7185b Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-13 16:01:09 +01:00
Alex Kriuchykhin 741e053ef4
Add checking for ability to share a repository with allowed write [SCI-9853] (#6807) 2023-12-13 15:31:21 +01:00
Martin Artnik e99e5c46c6 Fix activities for access permissions [SCI-9863] 2023-12-12 14:32:26 +01:00
Martin Artnik 0344860827 Add reminder job interval option 2023-12-12 14:08:42 +01:00
Martin Artnik c599c939b8 Fix project assignment activity & notification recipients [SCI-9863] 2023-12-12 12:18:12 +01:00
Anton 985dddef17 Finish experiment table [SCI-9800] 2023-12-11 15:57:45 +01:00
Anton a894d6bd26 Finish main experiments actions [SCI-9800] 2023-12-11 10:47:53 +01:00
wandji dceb92021a
Connect add relationship modal to backend [SCI-9711] (#6749) 2023-12-11 10:43:47 +01:00
Anton 75f7437001 Fix markup 2023-12-11 09:26:13 +01:00
wandji 6f27b4c450
Call project project user assignment job with perform now [SCi-9750] (#6766) 
* Add polling to update project user assignments list [SCi-9750]

* Call project project user assignment job with perform now [SCI-9750]

* Call UserAssignments::PropagateAssignmentJob directly from destroy action SCI-[9750]
 2023-12-08 10:27:50 +01:00
Anton 7ffad5b659 Experiments table migration [SCI-9800] 2023-12-07 12:53:21 +01:00
Anton 65e9e5abb4 Merge branch 'develop' into features/new-datatable 2023-12-07 09:51:45 +01:00
Anton 687bac024a Migrate access modal to VUE [SCI-9799] 2023-12-06 14:12:22 +01:00
Martin Artnik 7c73f284b4 Merge branch 'features/notification-revamp' into develop 2023-12-06 11:36:32 +01:00
Martin Artnik 66feec3074 Merge branch 'develop' into features/asset-sync 2023-12-06 11:23:31 +01:00
Oleksii Kriuchykhin d1e7ab5efb Merge branch 'develop' into features/inventory-items-relationships 2023-12-06 11:11:30 +01:00
Oleksii Kriuchykhin bd89a0c9bf Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-06 11:09:34 +01:00
Martin Artnik 469f581e20
Merge pull request #6769 from G-Chubinidze/gc_SCI_9788 
Redundant notifications [SCI-9788]
 2023-12-06 09:30:17 +01:00
G-Chubinidze e1ff625351
Merge branch 'features/asset-sync' into gc_SCI_9710 2023-12-06 11:48:18 +04:00
Giga Chubinidze a25113275a added access permission blocks 2023-12-06 11:02:25 +04:00
Martin Artnik 31e55488a7
Merge pull request #6750 from G-Chubinidze/gc_SCI_9788 
Redundant notifications [SCI-9788]
 2023-12-05 14:57:01 +01:00
Giga Chubinidze 70ed2cb868 logic cleanup 2023-12-05 12:06:58 +04:00
Anton d125eae4bb Fix smart annotation on steps [SCI-9799] 2023-12-04 11:17:06 +01:00
Giga Chubinidze 121cbe7471 Redundant notifications [SCI-9788] 2023-12-04 11:29:17 +04:00
Gregor Lasnibat c1e3c2b6c6 (fix) Update of item table not done, stock modal entry [SCI-9789] 2023-12-01 16:44:13 +01:00
Anton 9971de5c4c Finalize projects table 2023-12-01 09:56:14 +01:00
Anton c09ce12ddc Add design page and refactored dropdown [SCI-9680] 2023-11-29 00:01:23 +01:00
Anton f6783b219b Fix smart annotations [SCI-9605][SCI-9772] 2023-11-27 11:38:54 +01:00
Anton 7fdbc73098 Replace project table [SCI-9680] 2023-11-24 11:15:07 +01:00
Oleksii Kriuchykhin 9983d70eec Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-23 11:11:46 +01:00
Oleksii Kriuchykhin 01219f09eb Merge branch 'develop' into features/inventory-items-relationships 2023-11-23 11:08:42 +01:00
Anton 38024d563a Add initial table [SCI-9680] 2023-11-23 10:55:51 +01:00
Anton 8a0dd0258e Merge branch 'develop' into features/new-datatable 2023-11-23 10:47:58 +01:00
Anton 0ec734b467 Merge branch 'develop' into features/notification-revamp 2023-11-23 10:05:42 +01:00
Giga Chubinidze d0877de13c Add activity for updating a file via AssetSync [SCI-9710] 2023-11-23 04:12:38 +04:00
Martin Artnik e13314349c Merge branch 'release/1.28.0' into develop 2023-11-22 15:13:57 +01:00
Soufiane bc2904823d
Add link to assigned item to task for snapshots version [SCI-9689] (#6656) 2023-11-22 14:53:08 +01:00
wandji 91f650e227
Reload inventory table after changes to item card [SCI-9617] (#6626) 
* Reload inventory table row after changes to item card [SCI-9617]

* Reload full table after updating item card column [SCI-9617]

* Update 2 line if condition formatting style [SCI-9617]
 2023-11-20 15:26:01 +01:00
wandji 7a916b7d11
Add activities to inventories [SCI-5578] (#6588) 
* Add activities for stock consumption and inventories export and inventory item file edit [SCI-5578]

* Improve check for creating inventory item asset activity [5578]

* Improve query for inventory items in consumption export [SCI-5578]
 2023-11-20 13:37:57 +01:00
Oleksii Kriuchykhin f7d8fc96ac Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-17 10:44:32 +01:00
Ivan Kljun dd2611bb82 Making asset sync feature switchable [SCI-9709] 2023-11-17 07:41:12 +01:00
Oleksii Kriuchykhin cc8b993430 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-16 11:12:50 +01:00
Oleksii Kriuchykhin e8abbbbcdf Merge branch 'develop' into features/inventory-items-relationships 2023-11-16 11:04:27 +01:00
Giga Chubinidze 85709d7b43 Fix setting of ASSET_SYNC_URL on the fronted [SCI-9665] 2023-11-16 12:28:31 +04:00
ajugo a765ab009d
Fix report template loading [SCI-9663] (#6651) 2023-11-16 09:05:21 +01:00
wandji 0987ebf637
Update viewer and technician interaction on shareable link modal [SCI-9047] (#6568) 2023-11-15 15:55:48 +01:00
Oleksii Kriuchykhin 3bc7edc7f7 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-15 10:58:42 +01:00
Anton 6abc643aec Merge branch 'develop' into features/datetime-picker 2023-11-14 18:08:03 +01:00
Oleksii Kriuchykhin fdb4e93e16 Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships 2023-11-14 15:28:57 +01:00
wandji 73cb2528c8
Add repository_row_connection controller and actions [SCI-9672] (#6633) 
* Add repository_row_connection controller and actions [SCI-9672]
 2023-11-14 14:02:26 +01:00
Anton b7f876aa37 Date time picker improvments [SCI-9678][SCI-9688] 2023-11-14 11:26:27 +01:00
ivanscinote 2580e1e1eb
Fix display_url for Grover gem and add html format for r epository_rows show [SCI-9566] (#6632) 
* Apply layout for Grover PDF library [SCI-9566]

* Fix display_url for Grover gem and add html format for repository_rows show [SCI-9566]
 2023-11-14 09:48:29 +01:00
Martin Artnik fd159f0adc
Merge pull request #6599 from G-Chubinidze/gc_SCI_9625 
Enable access to "SciNote File Editor" app installers via the SciNote web app [SCI-9625]
 2023-11-14 09:44:35 +01:00
Martin Artnik 57d5d03718 Merge branch 'develop' into features/asset-sync 2023-11-14 09:41:42 +01:00
Anton cf0a1931cd Merge branch 'develop' into features/datetime-picker 2023-11-13 14:14:09 +01:00
ajugo 5878ed0c7c
Fix unit test [SCI-9570] (#6552) 2023-11-13 09:34:38 +01:00
wandji 3cad0e6e05
Refresh date values after update in item card [SCI-9617] (#6556) 
* Refresh date values after update in item card [SCI-9617]

* Update datetime fields to update row celss only when date changes [SCI-9617]

* Preserve dataTable page when reloading from in item card edit [SCI-9617]
 2023-11-10 13:25:46 +01:00
ajugo 77f37d13b2
Fix session timEout counter refresh for unseen notification call [SCI-9647] (#6616) 2023-11-10 10:06:00 +01:00
Oleksii Kriuchykhin 29f43d42af Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships 2023-11-10 09:26:05 +01:00
Oleksii Kriuchykhin 0b72740062 Merge branch 'develop' into features/inventory-items-relationships 2023-11-10 09:19:45 +01:00
Anton 9abdc8698a Refactor label templates backend [SCI-9676] 2023-11-09 17:12:18 +01:00
Anton 3211fa7cce Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2023-11-09 11:36:44 +01:00
Anton ee857feece Merge branch 'develop' into features/datetime-picker 2023-11-08 14:19:15 +01:00
Gregor Lasnibat fa5f44678b Fix multiple files disappearing when deleting one [SCI-9644] 2023-11-08 14:03:31 +01:00
Giga Chubinidze 39ce9c1781 Enable access to "SciNote File Editor" app installers via the SciNote web app [SCI-9625] 2023-11-08 12:22:34 +04:00
Soufiane 2bd84a12e9
Ensure that the export CSV inventory items are in UTF-8 [SCI-9307] (#6590) 2023-11-07 15:02:19 +01:00
Anton d4f555da40 Replace datepicker in filters [SCI-9626] 2023-11-06 10:12:06 +01:00
ivanscinote e6e7805c29
Apply layout for Grover PDF library [SCI-9566] (#6547) 2023-11-03 13:19:46 +01:00
Martin Artnik 93861a1b22
Merge pull request #6382 from G-Chubinidze/gc_SCI_9433 
Missing file preview [SCI-9433]
 2023-11-03 11:16:30 +01:00
Martin Artnik f015c8c56e Create a copy of the synced file in case of conflict [SCI-9640] 2023-11-03 09:46:05 +01:00
Martin Artnik 3a3d62a1be Merge branch 'develop' into features/asset-sync 2023-11-02 11:28:17 +01:00
Anton 70bbc0af47 Add new datetime picker [SCI-9127] 2023-10-30 15:19:39 +01:00
ajugo e73543dd90
Fix team permission scope for service API [SCI-9611] (#6554) 2023-10-30 12:54:55 +01:00
Giga Chubinidze 9cb1e45302 Filter by archived result does not find anything 2023-10-30 04:53:55 +04:00
Oleksii Kriuchykhin ee76488f32 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-27 14:25:32 +02:00
Martin Artnik 6308779668 Merge branch 'develop' into features/notification-revamp 2023-10-27 12:04:07 +02:00
Alex Kriuchykhin ccd2d0b4df
Add compatibility with ActiveDirectory Federation Services (#6543) 2023-10-27 11:06:48 +02:00
wandji c22d1e226b
Add new stock management modal and edit itemm card stock fields [SCI-9415] (#6474) 
* Add edit fetaure to item card stock field [SCI-9415]

* Replace manage stock modal [SCI-9415]

* Fix issue displaying item card [SCI-9415]

* Minor improvements [SCI-9415]

* Enable stock modal in assigned inventories [SCI-9415]

* Use toggleable reminder value [SCI-9415]
 2023-10-27 10:31:38 +02:00
ajugo 7c54509c58
Add editing of asset files for repository items sidebar [SCI-9413] (#6448) 2023-10-26 12:59:11 +02:00
G-Chubinidze 7fc1126aa9
Update my_modules_controller.rb 2023-10-26 11:29:13 +04:00
aignatov-bio ff667a3a2b
Merge pull request #6529 from scinote-eln/features/navigator-resize 
Features/navigator resize
 2023-10-25 14:05:14 +02:00
Giga Chubinidze 9dcb89e371 [CAPA] - When creating tasks designated user activity is missing - No notification is sent[SCI-9432] 2023-10-25 12:11:05 +04:00
Martin Artnik 22a130e502 Fix download endpoint to allow redirects to other hosts [SCI-9465] 2023-10-25 09:30:42 +02:00
Martin Artnik d181465e12 Fix initialization and add download endpoint [SCI-9465] 2023-10-25 09:30:42 +02:00
Ivan Kljun 2031286261 Implement file-checkout localhost call [SCI-9466] 2023-10-25 09:30:42 +02:00
Martin Artnik 7376b363a8 Asset sync model and endpoints [SCI-9465] (#6399) 2023-10-25 09:30:42 +02:00
ajugo a98d86e9b8
Add activities for cell editing on the new item card [SCI-9423] (#6465) 2023-10-24 16:22:10 +02:00
ajugo f278f490d9
Fix api tests [SCI-9569] (#6519) 
* Fix api tests [SCI-9569]

* Fix inventory status api index [SCI-9569]
 2023-10-24 13:36:03 +02:00
Oleksii Kriuchykhin ae7995fee2 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-19 12:59:45 +02:00
Anton db3f217bba Implement acitvity notifications 
[SCI-9512]
 2023-10-17 14:59:50 +02:00
Alex Kriuchykhin 82077001b5
Fix project users management through the API for team owners [SCI-9483] (#6442) 2023-10-17 12:52:25 +02:00
Soufiane 4cd59b6a0d
Order assigned tasks by assignment date in item cards [SCI-9534] (#6463) 2023-10-17 12:52:02 +02:00
ajugo 9f1c668a10
Fix result assets download for shareable links [SCI-9542] (#6460) 2023-10-17 11:35:16 +02:00
wandji c8359cdf3a
Add controller action to update inventory item cell data [SCI-9478] (#6379) 2023-10-16 17:43:53 +02:00
Anton 225193387a Update notifications settings saving 2023-10-16 09:41:38 +02:00
Martin Artnik 1912337376
Merge branch 'features/notification-revamp' into features/notifications-improvements 2023-10-13 14:55:16 +02:00
ajugo 4e25b3921a
Remove duplicated show in repository_rows_controller (#6433) 2023-10-13 10:37:47 +02:00
Martin Artnik 9c302f186b
Merge branch 'features/navigator-resize' into SCI-9318-making-navigator-resizable 2023-10-13 10:33:37 +02:00
Soufiane 857bda6f69
Fix broken unit tests [SCI-8972] (#6342) 
- Models tests
- Controllers tests
- Jobs tests
- Permissions tests
- Utilities tests
 2023-10-12 16:16:43 +02:00
ajugo 04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00
Oleksii Kriuchykhin 9e67b20b38 Merge branch 'features/october-release' into develop 2023-10-12 15:40:21 +02:00
Ivan Kljun d34d424b0f Make navigator resizable [SCI-9318] 2023-10-12 14:45:51 +02:00
Anton 0ad8b9f978 Migrate to noticed gem [SCI-9384] 2023-10-11 14:03:59 +02:00
Oleksii Kriuchykhin e08304d0cd Merge branch 'develop' into features/inventory-item-card-edit 2023-10-11 10:51:51 +02:00
wandji d236ba0a5b
Add reminders to item card [SCI-9154] (#6285) 
* Add reminders to item card [SCI-9154]

* Refactor item card reminder component [SCI-9154]
 2023-10-11 09:35:10 +02:00
Martin Artnik 09df0c3b1f Fix missing project in result level activities [SCI-9500] 2023-10-10 16:23:58 +02:00
Martin Artnik b3c664664d Add project to result activities [SCI-9500] 2023-10-10 14:48:00 +02:00
Andrej 79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Giga Chubinidze face69e960 changed controller action & javascript 2023-10-09 15:15:54 +04:00
Andrej 0889c40d46 Fix icons and OVE view for attachments [SCI-9445] 2023-10-04 16:18:03 +02:00
Martin Artnik b3c2dd75cf
Merge pull request #6349 from ivanscinote/SCI-9430-move-result-does-not-work 
Fix moving result elements bug [SCI-9430]
 2023-10-04 13:54:30 +02:00
Ivan Kljun 2919516bca Fix moving result elements bug [SCI-9430] 2023-10-04 13:37:00 +02:00
Oleksii Kriuchykhin 421ba27a6f Merge branch 'release/1.28.0' into develop 2023-10-04 13:19:31 +02:00
Martin Artnik 37c71d8567
Merge pull request #6321 from ivanscinote/SCI-9403-user-is-able-to-move-content-to-archived-results 
Fix move_targets methods to only return active results; prevent moving elements to archived results [SCI-9403]
 2023-10-03 12:45:42 +02:00
Alex Kriuchykhin 40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386 
Refactor export stock consumption modal [SCI-9386]
 2023-10-03 10:33:00 +02:00
Gregor Lasnibat 80de7483eb Prepare a modal displaying relationships for a specific item [SCI-9357] 2023-10-03 09:33:39 +02:00
Andrej 835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Martin Artnik f620a99577 Fix checking asset blob permissions [SCI-9353] 2023-10-02 16:18:29 +02:00
Andrej e1ca9175b7 Fix marvinjs loading and speedup creating of the wopi files [SCI-9409] 2023-10-02 08:32:50 +02:00
Ivan Kljun b0511ecec5 Fix move_targets methods to only return active results; prevent moving elements to archived results [SCI-9403] 2023-09-29 14:43:12 +02:00
Alex Kriuchykhin ba5ef94764
Merge pull request #6253 from rekonder/aj_SCI_9155_tmp 
Add assigned tasks block to the item card [SCI-9155]
 2023-09-27 15:03:20 +02:00
Martin Artnik 2edba4e188 Fix for downloading assets not in current user team [SCI-9353] 2023-09-27 14:13:34 +02:00
Martin Artnik d44d29a0fd
Merge pull request #6301 from G-Chubinidze/gc_SCI_9299 
OVE - Activities related to Task result [SCI-9299]
 2023-09-27 12:49:58 +02:00
Giga Chubinidze b53ac04577 styling fix 2023-09-27 14:47:35 +04:00
Ivan Kljun 0b069430db Fix bug for adding Office files to a result [SCI-9349] 2023-09-27 10:55:03 +02:00
Giga Chubinidze da70fed43a OVE - Activities related to Task result [SCI-9299] 2023-09-27 03:45:29 +04:00
Oleksii Kriuchykhin d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +02:00
Anton bb4349f346 Initial label templates refactor [SCI-9303] 2023-09-25 14:24:22 +02:00
Andrej e0355bd75a Fix generation of labels [SCI-9155] 2023-09-25 11:47:30 +02:00
Andrej ce1fe53ceb Fix comment permission check [SCI-9367] 2023-09-25 11:14:22 +02:00
Martin Artnik 3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
sboursen-scinote adc0a460bd Improve logic for custom logos on error pages [SCI-9147] 
- Switch to dynamic ERB templates.
- Move text to I18n
 2023-09-22 10:26:32 +02:00
Anton 566705cb67 Small fixes [SCI-9340] 2023-09-22 10:07:29 +02:00
Anton 77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02:00
Martin Artnik 5983ecb2bd
Merge pull request #6255 from artoscinote/ma_SCI_9348 
Clean up legacy comment logic [SCI-9348]
 2023-09-20 13:10:28 +02:00
Martin Artnik 44394fa1b6 Clean up legacy comment logic [SCI-9348] 2023-09-20 13:07:30 +02:00
Anton dd17b46667 Fix inline editing 2023-09-19 13:56:07 +02:00
aignatov-bio 5626bdef4b
Merge pull request #6247 from aignatov-bio/ai-sci-9260-fix-wopi 
Fix wopi and pdf preview [SCI-9260]
 2023-09-19 13:17:42 +02:00
Anton 370508304b Fix wopi and pdf preview [SCI-9260] 2023-09-19 12:44:28 +02:00
Giga Chubinidze b414cc4295 fixed hound and changed logic for ove to marvin 2023-09-19 12:50:45 +04:00
Giga Chubinidze 01e57e0395 Add activities for moving content between steps and results [SCI-9300] 2023-09-19 03:17:30 +04:00
Oleksii Kriuchykhin 3b170a0c0d Connect backend to the new item card [SCI-9313] 2023-09-18 16:42:01 +02:00
Oleksii Kriuchykhin 4e16d702bd Fix next page loading for global and task activities [SCI-9175] 2023-09-15 12:34:27 +02:00
Gregor Lasnibat 415e7338f7 Fix wrong OVE view file size after editing [SCI_9294] 2023-09-15 11:50:13 +02:00
Martin Artnik 160d9775d8 Merge branch 'develop' into features/september-release 2023-09-15 10:40:55 +02:00
Oleksii Kriuchykhin 45e9a459d7 Fix user and team activities filters [SCI-9287] 2023-09-14 14:22:01 +02:00
Anton af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Alex Kriuchykhin 40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration 
Features/ove integration
 2023-09-13 17:05:48 +02:00
Alex Kriuchykhin fae428e305
Fix OVE file preview from imported .eln [SCI-9263] (#6200) 2023-09-13 15:00:52 +02:00
Anton d6ab6e15f8 Fix office creation on results [SCI-9260] 2023-09-13 14:30:00 +02:00
Martin Artnik cb28c4d566
Merge pull request #6185 from ivanscinote/SCI-9250-fix-shared-task-with-new-results 
Fixed shared task to work with new results [SCI-9250]
 2023-09-13 13:43:30 +02:00
Martin Artnik c5eb1759b6
Merge pull request #6198 from artoscinote/ma_SCI_9285 
Fix result pagination, fix new step/result buttons [SCI-9285]
 2023-09-13 10:00:01 +02:00
Martin Artnik 6114dd7afc Fix result pagination, fix new step/result buttons [SCI-9285] 2023-09-12 17:33:47 +02:00
Ivan Kljun cd892878db Merge remote-tracking branch 'upstream/features/september-release' into SCI-9010-rework-result-activities-to-be-aligned-with-step-activities 2023-09-11 15:38:46 +02:00
Ivan Kljun dfaa91c682 Fixed shared task to work with new results [SCI-9250] 2023-09-11 15:19:22 +02:00
Martin Artnik 8c3ff1813a
Merge pull request #6177 from artoscinote/ma_SCI_9267 
Fix attachment sorting in results [SCI-9267]
 2023-09-11 10:01:26 +02:00
Martin Artnik ede9e40be8 Fix attachment sorting in results [SCI-9267] 2023-09-08 16:07:43 +02:00
Anton 7b44a47d51 Add active/archive switch to results page [SCI-9264] 2023-09-08 13:42:02 +02:00
Ivan Kljun 1242ec588f Add and fix result activities [SCI-9010] 2023-09-08 11:36:59 +02:00
Alex Kriuchykhin d8965e8ef9
Refactor old export async methods to ActiveJobs [SCI-9092] (#6170) 2023-09-08 11:35:16 +02:00
wandji a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] (#6092) 
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]

* Add consumption export modal and improve report generation [SCI-9023]

* Add repository_row association to repository_ledger_records [SCI-9023]
 2023-09-07 13:12:27 +02:00
Gregor Lasnibat 6934ae38aa Fix wrong OVE file size [SCI-9243] 2023-09-07 11:36:17 +02:00
Anton 1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
G-Chubinidze 3976e05042
Merge branch 'features/september-release' into gc_SCI_9178 2023-09-06 16:38:25 +04:00
Alex Kriuchykhin eea24a69e9
Add FailureNotifiableJob jobs concerns for creating failure notifications for users [SCI-9119] (#6147) 2023-09-06 12:51:34 +02:00
Giga Chubinidze 5a6202aea2 Unable to create a MarvinJS attachment [SCI-9178] 2023-09-05 18:29:15 +04:00
aignatov-bio 7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00
aignatov-bio 647fb76910
Merge branch 'features/september-release' into ai-sci-9108-add-infinite-scroll 2023-09-05 14:40:03 +02:00
aignatov-bio c33243b962
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields 
Add title to text component [SCI-9141]
 2023-09-05 14:32:42 +02:00
Oleksii Kriuchykhin 2c816cf463 Merge branch 'release/1.28.0' into develop 2023-09-05 12:54:37 +02:00
Alex Kriuchykhin 5928f708e1
Remove user controlled method execution from connected_accounts controller, add Okta unlinking functionality [SCI-9220] (#6135) 2023-09-05 12:53:51 +02:00
Alex Kriuchykhin 90cd330126
Fix removing user from public projects [SCI-9174] (#6130) 2023-09-05 11:36:26 +02:00
artoscinote 8d352b758a
Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation 
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
 2023-09-05 11:09:08 +02:00
Ivan Kljun 56744e2dcd Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182] 2023-09-05 11:02:39 +02:00
Giga Chubinidze b7da98c1dd Archiving results doesn't work [SCI-9179] 2023-09-05 11:55:15 +04:00
Oleksii Kriuchykhin 7b40b43922 Merge branch 'release/1.28.0' into develop 2023-09-04 16:01:46 +02:00
Alex Kriuchykhin df290ad3b3
Improve parameter filtering in activities filters and smart annotations [SCI-9218] (#6129) 2023-09-04 15:56:17 +02:00
Anton 86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Martin Artnik 3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Anton d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
Oleksii Kriuchykhin b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
Anton 2d76e628be Add infinite scroll to results [SCI-9108] 2023-08-30 15:51:23 +02:00
Martin Artnik 8245ad9738 Fix up result element duplicate endpoints [SCI-9107] 2023-08-30 14:54:38 +02:00
Anton c496d2c763 Fix transaction rollback [SCI-9088] 2023-08-30 11:48:16 +02:00
wandji 645b6dbe16
Add sort options to dashboard current task dropdown [SCI-9121] (#6103) 2023-08-30 09:51:41 +02:00
artoscinote c955c235d2
Fix user assignment endpoints [SCI-9150] (#6094) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-29 10:32:39 +02:00
wandji c80e99bdbc
Add protocol activity group for protocol step sequence assets [SCI-9087] (#6078) 2023-08-29 09:42:51 +02:00
artoscinote 90f23cc61c
Fix API endpoints for user assignments [SCI-9150] (#6089) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-28 15:13:30 +02:00
artoscinote 953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors 
Update 'Not started' status color at reports [SCI-9007]
 2023-08-28 09:56:25 +02:00
Ivan Kljun 90199d3590 Add method light_color? to my_module_status [SCI-9007] 2023-08-25 15:47:34 +02:00
sboursen-scinote 195df7936f Use custom images for marvin and OVE [SCI-9038] 2023-08-25 13:59:18 +02:00
Anton e66968357a Fix hound 2023-08-25 09:46:53 +02:00
ajugo 103b62798b
Return error if label template preview image is nil [SCI-9070] (#6077) 2023-08-24 16:45:34 +02:00
Anton f31d2b8912 Add move ability to attachments [SCI-9088] 2023-08-24 15:57:03 +02:00
Alex Kriuchykhin c1e2128b04
Fix link to original file in docx protocol parser notification [SCI-9123] (#6070) 2023-08-24 15:13:41 +02:00
Martin Artnik 0faad52f6c Merge branch 'hotfix/1.28.0.1' into develop 2023-08-24 12:14:30 +02:00
Alex Kriuchykhin 3c0389adc8
Make docx parser feature togglable [SCI-9094] (#6055) 2023-08-23 16:46:29 +02:00
artoscinote 0bea4a06ef
Add result duplicate action [SCI-8959] (#6019) 2023-08-23 15:05:31 +02:00
artoscinote abd6e794e9
Merge pull request #6049 from artoscinote/ma_SCI_9013 
Implement result filters [SCI-9013]
 2023-08-23 15:03:24 +02:00
Anton f964a7461d Move status block to secondary navigation [SCI-9027] 2023-08-23 14:03:41 +02:00
Alex Kriuchykhin b08a94ced6
Remove What's new section from user preferences section [SCI-9098] (#6046) 2023-08-23 13:12:06 +02:00
artoscinote e1416e3efd
Merge branch 'features/september-release' into ma_SCI_9013 2023-08-23 12:01:14 +02:00
Martin Artnik b3965e5aca Implement result filters [SCI-9013] 2023-08-23 11:59:21 +02:00
Anton 3057ddd4cb Fix file name for result orderable 2023-08-23 11:36:53 +02:00
wandji 196b6628ae
Add task protocol activities for gene sequence asset actions [SCI-8965] (#6013) 2023-08-22 14:24:43 +02:00
Anton e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Andrej 29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
Anton 2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
artoscinote 20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications 
Remove system notifications [SCI-8807]
 2023-08-18 10:28:05 +02:00
Martin Artnik 23a8872e11 Add some basic result component layout [SCI-8959] 2023-08-17 16:32:42 +02:00
ajugo 813347dcf0
Merge pull request #6000 from rekonder/aj_SCI_8948 
Create new sequence attachment on task protocol step [SCI-8948]
 2023-08-17 15:57:23 +02:00
Soufiane 4f1ea84489
Add the promotion screen for Sequence editor (OVE) [SCI-8968] (#6007) 2023-08-17 15:39:32 +02:00
Oleksii Kriuchykhin 14e49956f7 Show only default label templates when feature is disabled [SCI-9028] 2023-08-17 13:44:22 +02:00
Andrej 6e8dda64b2 Create new sequence attachment on task protocol step [SCI-8948] 2023-08-17 09:38:44 +02:00
Anton ea299919e3 Fix results api [SCI-9012] 2023-08-16 11:45:37 +02:00
Martin Artnik 8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
Oleksii Kriuchykhin 5332cbc788 Pass user by id instead of serialized object for deleyed jobs [SCI-9053] 2023-08-11 15:31:29 +02:00
Anton 6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
wandji f8a3640c4c
Move snapshot of deleted inventories to the bottom of inventory list in report wizard [SCI-8487] (#5972) 2023-08-11 13:37:26 +02:00
Anton f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
Martin Artnik 16dbd48ad3 Merge branch 'develop' into features/september-release 2023-08-10 13:21:27 +02:00
ajugo 5157f86b56
Merge pull request #5952 from ivanscinote/SCI-9025-show-label-preview 
Allow zpl_preview Access Regardless of Label Template ENV Status [SCI-9025]
 2023-08-10 09:54:08 +02:00
Andrej 104a9d5c17 Implemented trial period for open vector editor [SCI-8962] 2023-08-10 08:58:49 +02:00
Ivan Kljun 0b4afdd9ad Enable showing Label preview even if Label template is disabled [SCI-9025] 2023-08-09 17:01:30 +02:00
Martin Artnik a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
wandji20 02115cf967 Wrap timestamp filter params in the filter attribute [SCI-8738-updated] 2023-08-09 08:25:01 +01:00
Anton 758b28261d Merge branch 'develop' into features/september-release 2023-08-07 16:30:28 +02:00
Martin Artnik 11fb166a0c Migration fix, additional endpoints, cleanup [SCI-8947] 2023-08-07 16:09:15 +02:00
Martin Artnik 633abf69c0 Basic results toolbar implementation [SCI-8952] 2023-08-07 16:09:15 +02:00
Martin Artnik fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
wandji 8546d451d3 Add result_orderable_elements_controller and update activities [SCI-8882] (#5880) 2023-08-07 16:08:06 +02:00
Anton 5aa01716ef Fix bundling for deleted files 2023-08-07 15:42:13 +02:00
Anton 7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Alex Kriuchykhin dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing 
Merge features/protocol-parsing to develop
 2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin 6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
aignatov-bio be4bd7f038
Merge pull request #5922 from scinote-eln/features/remove-front-end-gems 
Features/remove front end gems
 2023-08-07 11:31:12 +02:00
Anton 89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
ajugo 6f76e86171
Implement results tab for shareable task link [SCI-8753] (#5910) 
* Implement results tab for shareable task link [SCI-8753]
 2023-08-07 10:45:52 +02:00
Anton 937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
Anton 89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +02:00
ajugo 9a55889264
Merge pull request #5919 from okriuchykhin/ok_SCI_8974 
Fix file URL generation on shared task page [SCI-8974]
 2023-08-07 08:56:05 +02:00