Commit graph

3638 commits

Author SHA1 Message Date
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