Commit graph

16228 commits

Author SHA1 Message Date
Martin Artnik
cc29759dd9
Merge pull request #6967 from G-Chubinidze/gc_SCI_9986_v2
Add "Settings" link to Notifications modal [SCI-9986]
2024-01-24 10:45:22 +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
Giga Chubinidze
ab2b6b589a Implement button examples [SCI-10012] 2024-01-24 12:47:45 +04:00
Ivan Kljun
6b50039dac Change event name to be same as function name [SCI-10010] 2024-01-24 09:32:31 +01:00
Gregor Lasnibat
b8173988f9
Merge pull request #6994 from lasniscinote/gl_SCI_10029
(fix) CSS: Error message for too big file in inventory table [SCI-10029]
2024-01-23 20:27:40 +01:00
Ivan Kljun
c2fa110fb2 Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-10010-ik 2024-01-23 15:32:27 +01:00
aignatov-bio
3360d58439
Merge pull request #6995 from aignatov-bio/ai-sci-10073-fix-experiment-workflow-image
Fix workflow image update [SCI-10073]
2024-01-23 15:24:08 +01:00
Anton
75bbd993ee Fix workflow image update [SCI-10073] 2024-01-23 15:20:12 +01:00
Gregor Lasnibat
76ec7a0189 (fix) CSS: Error message for too big file in inventory table [SCI-10029] 2024-01-23 15:15:46 +01:00
Gregor Lasnibat
73beb3abf5
Merge pull request #6992 from lasniscinote/gl_SCI_10074
(fix) Content disappears until page refresh when moving it between results [SCI-10074]
2024-01-23 14:58:21 +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
Gregor Lasnibat
e46cfdc0d4 (fix) Content disappears until page refresh when moving it between results [SCI-10074] 2024-01-23 14:10:08 +01:00
ajugo
8eeaf1015e
Merge pull request #6990 from rekonder/aj_SCI_10072
Fix archive label for assigned items on repository cards  [SCI-10072]
2024-01-23 13:19:36 +01:00
Ivan Kljun
0eb323b2f1 Add wrong-version modal for SciNote Edit [SCI-10010] 2024-01-23 11:54:42 +01:00
Andrej
c90c29332f Fix archive label for assigned items on repository cards [SCI-10072] 2024-01-23 11:38:59 +01:00
Oleksii Kriuchykhin
d71061a75d Merge branch 'release/1.28.0' into develop 2024-01-23 11:17:14 +01:00
aignatov-bio
b6e8fc7950
Merge pull request #6989 from aignatov-bio/ai-sci-10045-small-fixes-for-table
Small fixes for table [SCI-10045][SCI-10043]
2024-01-23 11:11:01 +01:00
Anton
9277d646ac Small fixes for table [SCI-10045] 2024-01-23 11:08:42 +01:00
Alex Kriuchykhin
bbe01f9d38
Fix inclusion of TinyMCE images in project exports [SCI-10051] (#6988) 2024-01-23 10:16:25 +01:00
Martin Artnik
c3bee668dc
Merge pull request #6987 from artoscinote/ma_SCI_9757
Fix Open menu in attachment preview screen [SCI-9757]
2024-01-23 10:02:04 +01:00
ajugo
32b721e07d
Remove Assigned section from item card for snapshot [SCI-10066] (#6986) 2024-01-23 09:27:00 +01:00
Gregor Lasnibat
85cd24fa81
(fix) Assign from task page is closed at opening item card [SCI-10063] (#6985) 2024-01-23 09:26:30 +01:00
aignatov-bio
b7f906546d
Merge pull request #6984 from aignatov-bio/ai-sci-9959-fix-checklists
Refactor checklist [SCI-9959]
2024-01-22 21:10:19 +01:00
Martin Artnik
81a4924d6b Fix Open menu in attachment preview screen [SCI-9757] 2024-01-22 16:41:10 +01:00
ajugo
53253b462e
Fix loading project activites [SCI-10034] (#6977) 2024-01-22 15:32:30 +01:00
Anton
1fff6da45d Refactor checklist [SCI-9959] 2024-01-22 14:01:32 +01:00
Martin Artnik
a90bf802e0
Merge pull request #6983 from lasniscinote/gl_SCI_10061
(fix) Well plate 12 option and 24 translation missing [SCI_10061_v2]
2024-01-22 11:13:14 +01:00
Gregor Lasnibat
fc606a7dd4 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-22 11:01:31 +01:00
Soufiane
313782d3d4
Implement API V2 tests for item relationships [SCI-10038] (#6972) 2024-01-22 10:50:23 +01:00
wandji
482472fb21
Fix missing unlink icon for child item relationship [SCI-10062] (#6982) 2024-01-22 10:49:07 +01:00
Soufiane
e70889c001
Unlink items to other shared repositories on unsharing [SCI-10055] (#6981)
- Team A has Repository A with Item A
 - Team B
 - Team C has Repository C with Item C

1) Share Repository A and Repository C to Team B

2) Link Item A to Item C in Team B

3) Unshare Repository A from Team B

Item A is unlinked to Item C
2024-01-22 10:45:23 +01:00
aignatov-bio
35774441f2
Merge pull request #6970 from G-Chubinidze/gc_SCI_9989
Remove archive confirmation modals from all tables [SCI-9989]
2024-01-22 10:07:19 +01:00
Martin Artnik
cfb64a125c
Merge pull request #6980 from aignatov-bio/ai-sci-10035-wizard-component
Add wizard component [SCI-10035]
2024-01-22 09:43:03 +01:00
Giga Chubinidze
9b49e891a0 changed experiment move logic similar to modules move 2024-01-22 02:16:24 +04:00
Anton
97c155f626 Add wizard component [SCI-10035] 2024-01-19 20:36:11 +01:00
Martin Artnik
62f040d475
Merge pull request #6978 from lasniscinote/gl_SCI_10061
(fix) Well plate 12 option and 24 translation missing [SCI-10061]
2024-01-19 15:28:43 +01:00
Gregor Lasnibat
5c305c8728 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-19 15:26:42 +01:00
Martin Artnik
e0d0d9d5d3
Merge pull request #6976 from lasniscinote/gl_SCI_10057
(fix) CSS- item relationship space in child section [SCI-10057]
2024-01-19 14:59:17 +01:00
Gregor Lasnibat
1bb6055f91 (fix) CSS- item relationship space in child section [SCI-10057] 2024-01-19 14:56:02 +01:00
Martin Artnik
9c755fd911
Merge pull request #6968 from G-Chubinidze/gc_SCI_9962_v2
Improvements of the SciNote Edit option in "Add-ons" [SCI-9962]
2024-01-19 12:20:45 +01: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
aignatov-bio
a179351315
Merge pull request #6975 from aignatov-bio/ai-sci-add-design-page
Add design page
2024-01-19 10:52:49 +01:00
Anton
ed2a54229a Add design page 2024-01-19 10:52:07 +01:00
G-Chubinidze
d8ae621851
Merge pull request #6969 from G-Chubinidze/gc_SCI_9988
Remove time component from project created at and remove visible to column from projects [SCI-9988]
2024-01-19 13:47:42 +04:00
Giga Chubinidze
05b1e906bb removed archive confirm locales 2024-01-19 13:46:34 +04:00
Ivan Kljun
c9490ca528 Implement saving of table state to DB [SCI-9983] 2024-01-19 10:12:54 +01:00