Anton
0ec734b467
Merge branch 'develop' into features/notification-revamp
2023-11-23 10:05:42 +01: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
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
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
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
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
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
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
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
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
