Commit graph

12275 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 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
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
Giga Chubinidze aa47cbad95 Make File Checkout feature switchable in settings [SCI-9987] 2024-01-15 04:43:00 +04:00
Martin Artnik 8476419ba1
Merge pull request #6933 from sboursen-scinote/sb_SCI-9673-force-quotes
Force quoting of CSV fields for repository export [SCI-9673]
2024-01-12 13:43:55 +01: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
sboursen-scinote a55f79e4e4 Force quoting of csv fields for repository export [SCI-9673] 2024-01-12 10:38:37 +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
Gregor Lasnibat 7e3b6beafe
(fix) Can not add text/number to item card from task assigned item table [SCI-9834] (#6916) 2024-01-11 11:35:45 +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
ajugo 4fe3fe5167
Change default value for table metadata [SCI-9932] (#6894) 2024-01-10 17:28:14 +01:00
wandji e31448c8e7
Add archived label for inventories and item in item card relationships and modal [SCI-9122] (#6884) 2024-01-10 17:23:15 +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
Gregor Lasnibat 7a3c6084b1
(fix) Item card minor issue [SCI-9814_v2] (#6920) 2024-01-10 15:32:31 +01:00
Soufiane a7dd9d49b2
Add links to items in linked/unlinked related activities [SCI-9718] (#6921) 2024-01-10 15:32:01 +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
Soufiane 5b365fce3b
Fix error handling for items relationships destroy action [SCI-9718] (#6911) 2024-01-09 15:31:21 +01:00
aignatov-bio 2f2fbc926e
Merge pull request #6899 from ivanscinote/SCI-9951-ik
Remove blur event listener from legacy inline edit [SCI-9951]
2024-01-09 15:18:21 +01:00
Gregor Lasnibat 5d4234a376 (fix) Wide code sample on a shared task [SCI-9942] 2024-01-09 12:56:30 +01:00
Ivan Kljun 245c848c99 Change to asset_download_path in Asset Serializer [SCI-9806] 2024-01-09 09:44:00 +01:00
ajugo a6c0c7294b
Improve objects loading and permissions checking for repository rows [SCI-9763] (#6875) 2024-01-09 09:37:50 +01:00
ajugo d02e614245
Fix label printing form inventory item [SCI-9972] (#6906) 2024-01-09 09:33:40 +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