Commit graph

3320 commits

Author SHA1 Message Date
Anton
75f7437001 Fix markup 2023-12-11 09:26:13 +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
469f581e20
Merge pull request #6769 from G-Chubinidze/gc_SCI_9788
Redundant notifications [SCI-9788]
2023-12-06 09:30:17 +01: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
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
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
cc8b993430 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-16 11:12:50 +01:00
ajugo
a765ab009d
Fix report template loading [SCI-9663] (#6651) 2023-11-16 09:05:21 +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
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
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
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