Commit graph

299 commits

Author SHA1 Message Date
Andrej
9e887db01d Disable azure authentication for giot [SCI-10631] 2024-04-16 11:17:42 +02:00
wandji20
9ac0dca68a Split external services for CSP for script_src and connect_src [sci_10572] 2024-04-05 11:12:35 +01:00
Andrej
ac9c16d459 Merge branch 'develop' into features/sso-improvements 2024-03-26 10:36:04 +01:00
Anton
ed0db94089 Merge branch 'develop' into features/new-datatable 2024-02-21 12:51:17 +01:00
Oleksii Kriuchykhin
66f5df87e9 Merge branch 'develop' into features/sso-improvements 2024-02-16 09:46:20 +01:00
ajugo
6184d0caa8
Add obsolete tag for not used activites [SCI-10121] (#7050) 2024-02-05 10:25:20 +01:00
Oleksii Kriuchykhin
e724b15499 Merge branch 'develop' into features/sso-improvements 2024-02-01 15:38:07 +01:00
Ivan Kljun
e4e3a61c5a Merge remote-tracking branch 'upstream/features/new-datatable' into SCI-9983-ik 2024-02-01 11:00:31 +01:00
Gregor Lasnibat
6f72727e38 (dev) Redesign Addons page in the Settings [SCI-10002-core] 2024-01-31 10:22:22 +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
Martin Artnik
ef5f822af2 Merge branch 'develop' into features/asset-sync 2024-01-15 11:57:03 +01:00
Giga Chubinidze
83a2657bd1 Improvements of the SciNote Edit option in "Add-ons" [SCI-9962][SCI9760] 2024-01-12 03:10:11 +04:00
G-Chubinidze
84c53cb5f5
Merge branch 'features/asset-sync' into gc_SCI_9710 2024-01-03 18:23:25 +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
Alex Kriuchykhin
dbedac3a9b
Add omniauth_openid_connect gem, implement basic sign-in flow [SCI-9578] (#6666) 2023-12-20 14:02:09 +01:00
Martin Artnik
9b97e397ed Merge branch 'develop' into features/asset-sync 2023-12-13 16:05:18 +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
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
Giga Chubinidze
b155462496 updated numbering to fit develop branch 2023-12-06 11:54:46 +04:00
G-Chubinidze
e1ff625351
Merge branch 'features/asset-sync' into gc_SCI_9710 2023-12-06 11:48:18 +04:00
Martin Artnik
804ee30169 Add scheme to asset sync url in extends 2023-12-05 15:39:57 +01:00
Martin Artnik
235d94e1cf Implement SciNote edit button with checks and info [SCI-9756] 2023-12-05 12:35:55 +01:00
Martin Artnik
54fe02d289
Merge pull request #6718 from G-Chubinidze/gc_SCI_9390
Smaller changes in activity grouping [SCI-9390]
2023-11-27 14:11:04 +01:00
Giga Chubinidze
cc48087beb Smaller changes in activity grouping [SCI-9390] 2023-11-27 15:54:14 +04:00
G-Chubinidze
006b0d32b3
Merge branch 'features/notification-revamp' into gc_SCI_9695 2023-11-27 15:05:45 +04:00
Giga Chubinidze
ceb94f72c0 added always on subgroup 2023-11-27 15:01:23 +04:00
Giga Chubinidze
28921bec47 Default Notifications and migration (notifications revamp) [SCI-9695] 2023-11-27 09:21:34 +04:00
Alex Kriuchykhin
9e9f8ab402
Add external_id field to repository list and checklist items [SCI-9454] (#6702) 2023-11-24 14:21:11 +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
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
Martin Artnik
6308779668 Merge branch 'develop' into features/notification-revamp 2023-10-27 12:04:07 +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
ajugo
a98d86e9b8
Add activities for cell editing on the new item card [SCI-9423] (#6465) 2023-10-24 16:22:10 +02:00
aignatov-bio
bb0bb7088a
Merge pull request #6450 from aignatov-bio/ai-sci-9513-migrate-user-settings-to-vue
Refactor user settings page [SCI-9513]
2023-10-16 15:21:54 +02:00
Martin Artnik
dd4ea9be8a
Merge pull request #6449 from G-Chubinidze/gc_SCI_9390
Smaller changes in activity grouping [SCI-9390]
2023-10-16 10:03:04 +02:00
Anton
16b5df353f Refactor user settings page [SCI-9513] 2023-10-16 09:41:37 +02:00
Giga Chubinidze
9e86f23858 cleanup 2023-10-16 11:33:53 +04:00
Giga Chubinidze
ee6da5b0d6 Smaller changes in activity grouping [SCI-9390] 2023-10-16 11:27:44 +04:00
Martin Artnik
1912337376
Merge branch 'features/notification-revamp' into features/notifications-improvements 2023-10-13 14:55:16 +02:00
Oleksii Kriuchykhin
9e67b20b38 Merge branch 'features/october-release' into develop 2023-10-12 15:40:21 +02:00
aignatov-bio
d7dd6fdf15
Remove result activities from protocol group [SCI-9491] (#6420) 2023-10-12 15:36:39 +02:00
Anton
726ff5e238 Remove old notification extends [SCI-9384] 2023-10-12 11:38:19 +02:00
Anton
1ab62616c4 Fix marvinJS move on results [SCI-9499] 2023-10-10 14:29:06 +02:00
Anton
6b6ecf1b43 Fix activity type selector [SCI-9491] 2023-10-09 09:40:42 +02:00
wandji20
b5acdd2bf6 Refactor application helper method [SCI-9406] 2023-10-03 13:24:39 +01:00