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

3569 commits

Author SHA1 Message Date
Ivan Kljun 24faeae5de Update last_modified_by for assets on edit [SCI-10033] 2024-01-24 15:18:34 +01:00
Ivan Kljun 718f5fbfad Add error messages to AssetSyncController [SCI-10020] 2024-01-24 11:02:37 +01:00
ajugo fc99c0ef5b
Fix reordering of the result elements [SCI-10079] (#6998) 2024-01-24 10:07:59 +01:00
Alex Kriuchykhin f9a1b952b6
Split inventory item relationships API V2 endpoint into separate endpoints for parents and children [SCI-10078] (#6996) 2024-01-24 10:04:38 +01:00
Anton 75bbd993ee Fix workflow image update [SCI-10073] 2024-01-23 15:20:12 +01:00
Martin Artnik bd4471b98b
Merge pull request #6865 from G-Chubinidze/gc_SCI_9840 
"Move" feature for multiple selected tasks and experiments (bulk action) [SCI-9840]
 2024-01-23 14:32:23 +01:00
Giga Chubinidze 98af81cd8a Changed error handling [SCI-9840] 2024-01-23 17:28:11 +04:00
Oleksii Kriuchykhin d71061a75d Merge branch 'release/1.28.0' into develop 2024-01-23 11:17:14 +01:00
Anton 1fff6da45d Refactor checklist [SCI-9959] 2024-01-22 14:01:32 +01:00
Soufiane 313782d3d4
Implement API V2 tests for item relationships [SCI-10038] (#6972) 2024-01-22 10:50:23 +01:00
Giga Chubinidze 9b49e891a0 changed experiment move logic similar to modules move 2024-01-22 02:16:24 +04:00
Anton bd48ae1d07 Merge branch 'features/asset-sync' of github.com:scinote-eln/scinote-web into features/asset-sync 2024-01-19 11:34:42 +01:00
Anton 9d19fe8382 Merge branch 'develop' into features/asset-sync 2024-01-19 11:33:40 +01:00
Anton 4b3666b4f8 Merge branch 'develop' into features/new-datatable 2024-01-19 11:10:32 +01:00
Anton ed2a54229a Add design page 2024-01-19 10:52:07 +01:00
Ivan Kljun c9490ca528 Implement saving of table state to DB [SCI-9983] 2024-01-19 10:12:54 +01:00
Oleksii Kriuchykhin d146dc8cb4 Merge branch 'develop' into features/sso-improvements 2024-01-19 09:31:12 +01:00
Giga Chubinidze a5c7e7b8c8 changed flash message 2024-01-17 12:58:43 +04:00
Anton af811db890 Remove old tables code [SCI-10006] 2024-01-16 14:13:40 +01:00
Martin Artnik 37b9a2c077 Fix asset sync activity user [SCI-10018] 2024-01-16 10:39:11 +01:00
ajugo 939d31b642
Fix loading archived status for item card relations [SCI-9910] (#6944) 2024-01-15 13:04:23 +01:00
ajugo 701c4c2f86
Fix unlinkind relationship connections [SCI-9912] (#6942) 2024-01-15 12:03:09 +01:00
Martin Artnik ef5f822af2 Merge branch 'develop' into features/asset-sync 2024-01-15 11:57:03 +01:00
ajugo 566decd9ed
Inventory relationship fixes [SCI-10005] (#6941) 2024-01-15 11:08:08 +01:00
ajugo 98ee391d03
Filter already connected items on repository item relationship modal [SCI-9916] (#6934) 2024-01-15 09:41:52 +01:00
Anton 7233f4c8ab Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2024-01-11 15:27:10 +01:00
Anton de72f60cc1 Merge branch 'develop' into features/new-datatable 2024-01-11 15:14:36 +01:00
Anton 62edf89699 Replace reports table [SCI-9803] 2024-01-11 10:06:39 +01:00
wandji e31448c8e7
Add archived label for inventories and item in item card relationships and modal [SCI-9122] (#6884) 2024-01-10 17:23:15 +01:00
Oleksii Kriuchykhin 3b97571777 Merge branch 'features/inventory-items-relationships' into develop 2024-01-10 17:10:20 +01:00
Martin Artnik 7a4d17f63e Merge branch 'develop' into features/asset-sync 2024-01-10 16:31:21 +01:00
Soufiane a7dd9d49b2
Add links to items in linked/unlinked related activities [SCI-9718] (#6921) 2024-01-10 15:32:01 +01:00
Soufiane 5b365fce3b
Fix error handling for items relationships destroy action [SCI-9718] (#6911) 2024-01-09 15:31:21 +01:00
Anton 3346c55941 Merge branch 'develop' into features/new-datatable 2024-01-09 10:36:21 +01:00
ajugo a6c0c7294b
Improve objects loading and permissions checking for repository rows [SCI-9763] (#6875) 2024-01-09 09:37:50 +01:00
Soufiane 4649a17cf9
Fix failing tests for item relationships [SCI-9719] (#6900) 2024-01-08 14:41:38 +01:00
ajugo e2233523d2
Simplified create method for Repository row connections [SCI-9909] (#6873) 2024-01-08 14:14:24 +01:00
wandji 465c8d1f80
Unify API step and result elements controllers implementation and types [SCI-9907] (#6854) 
* Unify api step and result elements controllers implementation and types [SCI-9907]

* Update wrong serializer types [SCI-9907]

* Rename result and step text types [SCI-9907]

* Combine result and step assets serializer [SCI-9907]
 2024-01-08 10:31:14 +01:00
Anton 993a8da518 Migrate inventory tables [SCI-9804] 2024-01-05 19:03:14 +01:00
Oleksii Kriuchykhin 95ab33a58b Merge branch 'develop' into features/inventory-items-relationships 2024-01-05 11:27:32 +01:00
Soufiane 67ea1b15fe
Implement API V2 endpoints for item relationships [SCI-9719] (#6847) 2024-01-04 16:42:25 +01:00
Alex Kriuchykhin da7b7518fc
Fix file text extraction for API results endpoints [SCI-9933] (#6874) 
Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
 2024-01-04 14:31:56 +01:00
Martin Artnik e360113838 Merge branch 'develop' into features/asset-sync 2024-01-04 10:07:11 +01:00
wandji 5c0c3e0eca
Add permission helper for connecting inventory items [SCI-9915] (#6868) 2024-01-04 09:47:40 +01:00
wandji b36354d521
Set order for inventory and inventory items endpoints (RepositoryRowConnectionController) [SCI-9914] (#6859) 2024-01-03 17:09:37 +01:00
Alex Kriuchykhin dd312062d3
Fix permissions checking for active storage blobs belonging to different teams [SCI-9918] (#6871) 2024-01-03 17:09:15 +01:00
G-Chubinidze 84c53cb5f5
Merge branch 'features/asset-sync' into gc_SCI_9710 2024-01-03 18:23:25 +04:00
Giga Chubinidze 544611c3fa hound fix 2024-01-03 18:19:32 +04:00
Anton 4671754d52 Migrate protocols table [SCI-9802] 2024-01-03 14:57:32 +01:00
Giga Chubinidze eaf713e4bd move response status fix 2024-01-03 17:50:18 +04:00
Giga Chubinidze ebdeaf8b42 add transaction to move exp function 2024-01-03 12:58:13 +04:00
Giga Chubinidze cc8a10edb0 "Move" feature for multiple selected tasks and experiments (bulk action) 2023-12-29 12:53:46 +04:00
Soufiane 5ca33bb96a
Add activities for item relationships [SCI-9718] (#6788) 2023-12-21 12:33:06 +01:00
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