Commit graph

89 commits

Author SHA1 Message Date
Martin Artnik
a85fc77261 Merge branch 'develop' into features/storage-locations 2024-08-26 11:12:04 +02:00
Martin Artnik
2370cfaf15 Don't show content toolbar if no inserts are available [SCI-10980] 2024-08-13 13:24:37 +02:00
Anton
8d942d857f Hide action toolbar on collapsed result [SCI-10968] 2024-08-07 11:53:00 +02:00
Anton
49ddeb7403 Merge branch 'develop' into features/storage-locations 2024-07-31 12:19:31 +02:00
Andrej
5714e684ef Change step/result toolbar interaction [SCI-10929] 2024-07-30 15:48:12 +02:00
Andrej
3b2748ae71 Add state saving for result [SCI-10794] 2024-07-30 09:33:27 +02:00
Martin Artnik
7f2d4cba3e Merge branch 'develop' into features/ui-tweaks 2024-07-22 10:59:12 +02:00
Anton
afe96a3b65 Add toolbar for steps and results [SCI-10785] 2024-07-04 13:25:53 +02:00
Andrej
aedbab9375 Open collapsed steps/results on content insert [SCI-10799] 2024-06-27 15:56:41 +02:00
Ivan Kljun
7ac7ebd32d Enable renaming attached files [SCI-10256] 2024-05-30 13:28:35 +02:00
Martin Artnik
bc6e43052f Merge branch 'develop' into features/inventory-import-improvements 2024-05-13 11:52:27 +02:00
aignatov-bio
7db878ced6
Merge pull request #7327 from G-Chubinidze/gc_SCI_10253
Wrong sorting icon on result page [SCI-10253]
2024-05-09 11:02:35 +02:00
wandji20
ef3ef8bb7b Disable click events when duplicating content for protocol step and result [SCI-10609] 2024-04-17 10:20:58 +01:00
Ivan Kljun
830a31b9b2 Preserve sort order of Results [SCI-10440] 2024-04-04 10:24:17 +02:00
Anton
45c96651cd Merge branch 'develop' into features/inventory-import-improvements 2024-04-03 14:49:00 +02:00
wandji20
d4d2ad55e6 Fix Canvas - Broken new comment badge while adding new comments [SCI-10541] 2024-03-28 12:03:17 +01:00
Ivan Kljun
7366134fe3 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10256-ik 2024-03-26 15:28:09 +01:00
Giga Chubinidze
a42187c8ab Wrong sorting icon on result page [SCI-10253] 2024-03-21 13:56:00 +04:00
Ivan Kljun
a5eda08cf2 Enable renaming attached files [SCI-10256] 2024-03-21 10:38:27 +01:00
Soufiane
41510f8067
Fix color of filter icon in task results [SCI-10437] (#7284) 2024-03-14 20:22:16 +01:00
Martin Artnik
f8aae8aca6 Merge branch 'develop' into features/inventory-import-improvements 2024-02-20 15:18:07 +01:00
wandji
5bc542e834
Fix displayed comment counter for first comment in protocol steps and results [SCI-9573] (#7013) 2024-01-30 14:35:44 +01:00
Oleksii Kriuchykhin
384afbcc4b Merge branch 'features/asset-sync' into develop 2024-01-25 11:32:26 +01: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
Gregor Lasnibat
fc606a7dd4 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-22 11:01:31 +01:00
Gregor Lasnibat
5c305c8728 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-19 15:26:42 +01:00
Ivan Kljun
86ca3b32bc Fix createElement method in results.vue [SCI-9943] 2024-01-17 09:28:34 +01:00
Gregor Lasnibat
30300dbe1d (fix) Fix formatting in VUE files [SCI-9936] 2024-01-08 16:11:27 +01:00
Giga Chubinidze
9ff30b2795 Add 12 well plate option - "Insert content" select menu (protocol, results, protocol template) 2023-12-18 12:32:33 +04:00
Oleksii Kriuchykhin
9983d70eec Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-23 11:11:46 +01:00
Anton
2b51a4f4bd Vue3 migration mfixes [SCI-9733][SCI-9735][SCI-9736][SCI-9738] 2023-11-20 11:41:30 +01:00
Anton
9be17cfaf3 Result page fixes [SCI-9731] 2023-11-17 15:01:28 +01:00
Oleksii Kriuchykhin
f7d8fc96ac Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-17 10:44:32 +01:00
Anton
f92f0790ed Fix resizeable navigator 2023-11-08 19:32:43 +01:00
Soufiane
5601e72679
Open newly added result in edit mode [SCI-9586] (#6586) 2023-11-06 16:55:03 +01:00
Martin Artnik
5a073b1364
Merge branch 'develop' into features/bugfixes-and-css 2023-10-27 10:29:13 +02:00
Anton
0ffd3dcee3 Add image paster [SCI-9588] 2023-10-26 12:15:30 +02:00
Anton
da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Anton
635a4b7fb3 Fix drag n drop on results 2023-10-19 17:41:13 +02:00
Anton
3dd36e1dda Add drag n drop to results [SCI-9576] 2023-10-19 15:58:20 +02:00
aignatov-bio
1155e208a3
Merge pull request #6497 from aignatov-bio/ai-sci-9535-fix-three-dots-alignment
Fix thee dots alignment [SCI-9535]
2023-10-19 14:31:57 +02:00
Anton
e1d4e5269a Fix thee dots alignment [SCI-9535] 2023-10-19 11:45:01 +02:00
ajugo
8b890bc10e
Fix well plate creation on the result page [SCI-9543] (#6456) 2023-10-16 16:00:52 +02:00
Ivan Kljun
7c0e8221c1 Fix moving result elements [SCI-9430] 2023-10-09 14:54:22 +02:00
Martin Artnik
14a693b697 Highlight selected sort in results sort dropdown [SCI-9428] 2023-10-03 16:19:27 +02:00
Andrej
e1ca9175b7 Fix marvinjs loading and speedup creating of the wopi files [SCI-9409] 2023-10-02 08:32:50 +02:00
Martin Artnik
3ce0779663
Merge pull request #6290 from ivanscinote/SCI-9344-sticky-toolbar-issues
Fix results sticky toolbar [SCI-9344]
2023-09-27 14:03:12 +02:00
Ivan Kljun
1373994559 Fix results sticky toolbar [SCI-9344] 2023-09-26 12:20:49 +02:00
Ivan Kljun
f16354e498 Add hidden element to support legacy code for MarvinJS at results [SCI-9346] 2023-09-26 10:09:45 +02:00
Anton
ad3cd98d6e CSS fixes protocol page 2023-09-22 11:59:39 +02:00