Commit graph

1662 commits

Author SHA1 Message Date
G-Chubinidze 51bcc96251
Merge branch 'features/asset-sync' into gc_SCI_9757 2024-01-16 17:02:46 +04: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
Martin Artnik 8f95d8d438 Fix copy of app launch modal [SCI-9841] 2024-01-15 16:11:52 +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
Martin Artnik ef5f822af2 Merge branch 'develop' into features/asset-sync 2024-01-15 11:57:03 +01:00
ajugo 566decd9ed
Inventory relationship fixes [SCI-10005] (#6941) 2024-01-15 11:08:08 +01:00
ajugo 98ee391d03
Filter already connected items on repository item relationship modal [SCI-9916] (#6934) 2024-01-15 09:41:52 +01:00
Giga Chubinidze 4e29b4dab8 Add Settings link to Notifications modal [SCI-9986] 2024-01-15 05:03:18 +04:00
Martin Artnik 03f3c3063f
Merge pull request #6919 from lasniscinote/gl_SCI_9964
(fix) Deactivate the Items dropdown until the Inventory is chosen [SCI-9964]
2024-01-12 13:37:29 +01:00
Martin Artnik 0a07325e67
Merge pull request #6923 from ivanscinote/SCI-9974-ik2
Keep attachment thumbnail menu open when mouse moves out [SCI-9974]
2024-01-12 13:37:00 +01:00
Martin Artnik 5251218030
Merge pull request #6929 from lasniscinote/gl_SCI_9973
(fix) Update the multiselect dropdown color switch step 2 [SCI-9973]
2024-01-12 13:35:44 +01:00
Martin Artnik bd0cfda142
Merge pull request #6931 from G-Chubinidze/gc_SCI_9962_9760
Improvements of the SciNote Edit option in "Add-ons" [SCI-9962][SCI-9760]
2024-01-12 09:25:43 +01:00
Giga Chubinidze 5250bade57 hound fix 2024-01-12 03:16:10 +04:00
Giga Chubinidze 83a2657bd1 Improvements of the SciNote Edit option in "Add-ons" [SCI-9962][SCI9760] 2024-01-12 03:10:11 +04:00
sboursen-scinote 085918ca92 Prevent double edit activities when creating a table/well plate [SCI-9992] 2024-01-11 15:56:19 +01:00
Gregor Lasnibat 197c3fb9b3 (fix) Deactivate the Items dropdown until the Inventory is chosen [SCI-9964] 2024-01-11 13:06:14 +01:00
Gregor Lasnibat a7f332e630 (fix) Update the multiselect dropdown color switch step 2 [SCI-9973] 2024-01-11 11:59:08 +01:00
Gregor Lasnibat a38c2457a9
(fix) Selected items are incorrect on relationship modal [9965] (#6924) 2024-01-11 11:49:18 +01:00
ajugo b5d20b13c4
Remove relationship section for snapshot item cards [SCI-9963] (#6913) 2024-01-11 11:44:14 +01:00
Martin Artnik 3134104a92
Merge pull request #6927 from ivanscinote/SCI-9862-ik
Handle Windows not having an appropriate app for SciNote Edit [SCI-9862]
2024-01-11 11:05:14 +01:00
Ivan Kljun 22b7424884 Handle Windows not having an appropriate app for SciNote Edit [SCI-9862] 2024-01-11 10:41:11 +01:00
Oleksii Kriuchykhin 3b97571777 Merge branch 'features/inventory-items-relationships' into develop 2024-01-10 17:10:20 +01:00
Martin Artnik 7a4d17f63e Merge branch 'develop' into features/asset-sync 2024-01-10 16:31:21 +01:00
Ivan Kljun 01c2a602d0 Keep attachment thumbnail menu open when mouse moves out [SCI-9974] 2024-01-10 15:54:10 +01:00
ajugo fd5d44705c
Merge pull request #6917 from rekonder/aj_SCI_9970
Fix loading of non-repository tables on item cards changes [SCI-9970]
2024-01-10 09:49:33 +01:00
Andrej c73bc0bed1 Fix loading of non-repository tables on item cards changes [SCI-9970] 2024-01-10 09:43:16 +01:00
Soufiane 39b633dcdf
Fix delimiter spacing in items card [SCI-9950] (#6912) 2024-01-09 15:31:50 +01:00
ajugo a6c0c7294b
Improve objects loading and permissions checking for repository rows [SCI-9763] (#6875) 2024-01-09 09:37:50 +01:00
wandji a201c96aef
Fix issue add/removing stock [SCI-9966] (#6909) 2024-01-09 09:33:14 +01:00
Gregor Lasnibat fa29c99e4a
(fix) Correct the shadow depth on the Item card [SCI-9949] (#6905) 2024-01-09 09:28:44 +01:00
Soufiane 4ad84a43b7
Adjust spacing in items card relationships section [SCI-9950] (#6895) 2024-01-08 16:30:34 +01:00
Gregor Lasnibat 4c8e566fa9
Merge pull request #6901 from lasniscinote/gl_SCI_9936
(tech debt) Fix formatting in VUE files [SCI-9936]
2024-01-08 16:26:49 +01:00
Gregor Lasnibat 30300dbe1d (fix) Fix formatting in VUE files [SCI-9936] 2024-01-08 16:11:27 +01:00
Gregor Lasnibat 61965b8189
(fix) CSS item relationship [SCI-9934] (#6892) 2024-01-08 15:45:08 +01:00
wandji c43dd38af4
Fix CSS issues add relationship modal [SCI-9955] (#6897) 2024-01-08 14:49:38 +01:00
Soufiane 0a70d70c7f
Align bullet-point position with the first line for checklist items [SCI-9881] (#6887) 2024-01-05 15:14:56 +01:00
Soufiane e9d42beec4
Fix duplicated/missing attachements when bulk upload to result/step [SCI-9920] (#6879) 2024-01-05 14:23:44 +01:00
Soufiane c3f8e873e9
Fix 500 error when adding stock to item [SCI-9498] (#6883) 2024-01-05 13:10:45 +01:00
Martin Artnik 122c3aff1a Improve datepicker interactions for item sidebar [SCI-9956] 2024-01-05 12:59:17 +01:00
Oleksii Kriuchykhin 95ab33a58b Merge branch 'develop' into features/inventory-items-relationships 2024-01-05 11:27:32 +01:00
Ivan Kljun 44556f5070 Add Teleport for modals [SCI-9862] 2024-01-05 11:17:00 +01:00
Ivan Kljun 53c9be6f21 Fix hound suggestions [SCI-9862] 2024-01-04 16:45:22 +01:00
Ivan Kljun 60001e282c Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-9862-ik 2024-01-04 13:27:28 +01:00
Martin Artnik 0a5432f5bc
Merge pull request #6872 from artoscinote/ma_SCI_9737
Fix report table action buttons initialization [SCI-9737]
2024-01-04 11:00:39 +01:00
Ivan Kljun 2306496c3b Apply hound suggestions [SCI-9862] 2024-01-04 11:00:20 +01:00
Martin Artnik e360113838 Merge branch 'develop' into features/asset-sync 2024-01-04 10:07:11 +01:00
wandji 5c0c3e0eca
Add permission helper for connecting inventory items [SCI-9915] (#6868) 2024-01-04 09:47:40 +01:00