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

3343 commits

Author SHA1 Message Date
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
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
Oleksii Kriuchykhin c61a075818 Fix file URL generation on shared task page [SCI-8974] 2023-08-04 15:09:59 +02:00
Alex Kriuchykhin b365553a14
Merge pull request #5917 from scinote-eln/features/august-release 
Merge features/august release to develop
 2023-08-04 14:01:44 +02:00
Soufiane f856ddf78c
Assigned items in task datatable will not load if stock management is enabled [SCI-8944] (#5904) 
* Fix assigned items datatable in shareable link with stock management [SCI-8944]

* Avoid skipping auth token verification for assets download [SCI-8944]
 2023-08-04 11:21:43 +02:00
Alex Kriuchykhin a943ea2dd7
Merge pull request #5888 from wandji20/wb-SCI-8907 
Create step orderable element for step_text when creating a step via the API [SCI-8907]
 2023-08-03 14:19:05 +02:00
wandji20 90b3f8943a Improve api step controller create action [SCI-8907] 2023-08-03 04:08:26 +01:00
Oleksii Kriuchykhin b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
Martin Artnik 80c5268efd Add read-only mode to OVE [SCI-8962] 2023-08-02 15:46:07 +02:00
wandji 31f8bc19d5
Add unique database index to checklist items position (#5886) 
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
 2023-08-02 15:37:01 +02:00
Martin Artnik 76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
ivanscinote 242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +02:00
wandji20 88b7befbcd Create step orderable element for step_text when creating a step via the API [SCI-8907] 2023-08-01 19:55:36 +01:00
wandji20 a0372d14bf Improve base controller timestamp filter method [SCI-8738] 2023-08-01 18:59:58 +01:00
ajugo fa187f3b31
Add shared assets download and fix loading of the shareable button on task [SCI-8754] (#5878) 
* Add shared assets download and fix loading of the shareable button on task [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Load asset for specific task [SCI-8754]
 2023-08-01 16:46:41 +02:00
wandji20 07411fbc25 Refactor base controller timestamp filter method [SCI-8738] 2023-08-01 13:25:17 +01:00
Soufiane 3f3064ba19
Fix Auth issues task public view [SCI-8936] (#5890) 2023-08-01 14:23:48 +02:00
Soufiane 8d6c417936
Extract date formatting from user browser in shareable links views [SCI-8778] (#5889) 2023-08-01 10:38:00 +02:00
wandji20 1e64a246fe Rename filter_timestamps_range to timestamp_filters [SCI-8738] 2023-07-31 11:21:40 +01:00
wandji20 8e96c2427a Add options to filter records by created_at or updated_at timestamps [SCI-8738] 2023-07-27 01:31:57 +01:00
Martin Artnik 3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Ivan Kljun 216f01f151 Apply hounder linter styling suggestions 2023-07-25 15:58:40 +02:00
Ivan Kljun 18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Soufiane 4858f41b3e
Remove user_team related tests [SCI-8815] (#5860) 2023-07-25 14:35:17 +02:00
Alex Kriuchykhin 026e96652b
Fix team name escaping in inventories export modal [SCI-8922] (#5859) 2023-07-25 13:37:45 +02:00