Commit graph

15724 commits

Author SHA1 Message Date
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
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
Martin Artnik
a21fc9c95b
Merge pull request #6973 from ivanscinote/SCI-9993-ik
Fix status API request and thumbnail buttons in SciNote Edit [SCI-9993]
2024-01-18 14:58:01 +01:00
Ivan Kljun
a0445a70bf Fix status API request and thumbnail buttons in SciNote Edit [SCI-9993] 2024-01-18 14:49:46 +01:00
Martin Artnik
1b7fcf804d
Merge pull request #6971 from artoscinote/ma_SCI_10031
Enable clearing of list value in item card [SCI-10031]
2024-01-18 10:38:20 +01:00
Martin Artnik
dca868ac49 Enable clearing of list value in item card [SCI-10031] 2024-01-18 10:22:57 +01:00
ajugo
8995d64bfd
Set correct team to assets [SCI-10007] (#6966) 2024-01-18 10:20:35 +01:00
Giga Chubinidze
4f690db5a9 Improvements of the SciNote Edit option in "Add-ons" 2024-01-18 04:12:08 +04:00
Giga Chubinidze
a9a8a79fd9 Add "Settings" link to Notifications modal 2024-01-18 03:53:54 +04:00
ajugo
91287726c4
Add external_id to repository model [SCI-9977] (#6945) 2024-01-17 15:09:20 +01:00
Martin Artnik
62068fd8c3
Merge pull request #6928 from ivanscinote/SCI-9838-ik
Fix open locally buttons for thumbnail view [SCI-9838]
2024-01-17 15:01:45 +01:00
Martin Artnik
2299d7e4ff
Merge pull request #6964 from ivanscinote/SCI-9943-ik
Fix createElement method in results.vue [SCI-9943]
2024-01-17 15:00:47 +01:00
Martin Artnik
209ea96798
Merge pull request #6963 from G-Chubinidze/gc_SCI_9925
Red dot is applied on experiment/task page [SCI-9925]
2024-01-17 10:07:03 +01:00
Martin Artnik
baeacd73ef
Merge pull request #6965 from G-Chubinidze/gc_SCI_9991
Change text on Inventory modals [SCI-9991]
2024-01-17 10:04:40 +01:00
Giga Chubinidze
a5c7e7b8c8 changed flash message 2024-01-17 12:58:43 +04:00
Giga Chubinidze
536f777341 Change text on Inventory modals [SCI-9991] 2024-01-17 12:56:34 +04:00
Martin Artnik
b84d471e8b
Merge pull request #6962 from G-Chubinidze/gc_SCI_9757
Implement the Open Locally button on file previews [SCI-9757]
2024-01-17 09:46:41 +01:00
Ivan Kljun
86ca3b32bc Fix createElement method in results.vue [SCI-9943] 2024-01-17 09:28:34 +01:00
Giga Chubinidze
7a803971f9 Red dot is applied on experiment/task page [SCI-9925] 2024-01-17 05:06:32 +04:00
Giga Chubinidze
2ebe3ff2b8 Fixed js error in open locally menu vue 2024-01-16 20:31:12 +04:00
Martin Artnik
254024bca8
Merge pull request #6961 from artoscinote/ma_SCI_10031
Fix saving of blank checklist on item sidebar [SCI-10031]
2024-01-16 16:11:11 +01:00
Martin Artnik
7be280e6e1 Fix saving of blank checklist on item sidebar [SCI-10031] 2024-01-16 15:59:21 +01:00
ajugo
d0ecfe53dc
Add no access text to item card [SCI-10013] (#6959) 2024-01-16 15:06:03 +01:00
Martin Artnik
f0f1cd2487
Merge pull request #6821 from G-Chubinidze/gc_SCI_9757
Implement the Open Locally button on file previews [SCI-9757]
2024-01-16 14:03:08 +01:00
G-Chubinidze
51bcc96251
Merge branch 'features/asset-sync' into gc_SCI_9757 2024-01-16 17:02:46 +04:00
Alex Kriuchykhin
a43eacaa22
Fix inclusion of relationships column in repository exports [SCI-9716] (#6954) 2024-01-16 13:07:11 +01:00
Alex Kriuchykhin
393e624c16
Revert (fix) Item card behavior in cases of error states vol. 2 [SCI-9792] (#6953) 2024-01-16 11:41:20 +01:00
Martin Artnik
6ca8cff524
Merge pull request #6952 from artoscinote/ma_SCI_10018
Fix asset sync activity user [SCI-10018]
2024-01-16 10:53:52 +01:00
Martin Artnik
37b9a2c077 Fix asset sync activity user [SCI-10018] 2024-01-16 10:39:11 +01:00
Martin Artnik
42d01255da
Merge pull request #6940 from G-Chubinidze/gc_SCI_9986
Add Settings link to Notifications modal [SCI-9986]
2024-01-16 10:36:33 +01:00
Giga Chubinidze
21a9d0c691 updated setting url finding 2024-01-16 13:34:06 +04:00
Giga Chubinidze
b46f0f8d4b Changed hardcoded preferences link to vue variable 2024-01-16 05:20:00 +04:00
mvrazic
967950468d
e2e - added new tags - general-inventories-activities [SCI-10016] (#6947) 2024-01-15 17:17:55 +01:00
mvrazic
f57a2d550a
e2e - added new tags at inventories section [SCI-9919] (#6858) 2024-01-15 16:59:05 +01:00
Ivan Kljun
67d9fdbed5 Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-9838-ik 2024-01-15 16:20:33 +01:00
Martin Artnik
8f95d8d438 Fix copy of app launch modal [SCI-9841] 2024-01-15 16:11:52 +01:00
Ivan Kljun
2e1b86f9b2 Fix open locally buttons for thumbnail view [SCI-9838] 2024-01-15 16:08:59 +01:00
Gregor Lasnibat
e323f329e5
(fix) At click to relationship number in INV table item card is opened from the top [SCI-9927] (#6950) 2024-01-15 15:55:59 +01:00
Gregor Lasnibat
320f2d2801
(fix) Not unified form of number column content on item card [SCI-9982] (#6936) 2024-01-15 15:55:21 +01:00
Soufiane
f19e7fed9c
Fix the mapping of the columns in the task's full view table [SCI-9978] (#6946) 2024-01-15 15:53:23 +01:00
Martin Artnik
4c262bde83
Merge pull request #6949 from artoscinote/ma_SCI_9841
Fix issues with local edit buttons after merging develop [SCI-9841][SCI-9862]
2024-01-15 15:29:59 +01:00
Martin Artnik
7aff908bed Fix issues with local edit buttons after merging develop [SCI-9841][SCI-9862] 2024-01-15 15:16:02 +01:00
Martin Artnik
695c938f22 Fix asset thumbnail hover [SCI-9838] 2024-01-15 13:44:50 +01:00
ajugo
939d31b642
Fix loading archived status for item card relations [SCI-9910] (#6944) 2024-01-15 13:04:23 +01:00
Martin Artnik
bd1e2696c1
Merge pull request #6938 from lasniscinote/gl_SCI_10008
(fix) Modal opened behind the item card [SCI-10008]
2024-01-15 12:52:00 +01:00