Commit graph

12354 commits

Author SHA1 Message Date
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
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
Giga Chubinidze
a5c7e7b8c8 changed flash message 2024-01-17 12:58:43 +04: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
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
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
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
Gregor Lasnibat
7b1a31eaf3 (fix) Modal opened behind the item card [SCI-10008] 2024-01-15 12:09:47 +01:00
ajugo
701c4c2f86
Fix unlinkind relationship connections [SCI-9912] (#6942) 2024-01-15 12:03:09 +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
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
Martin Artnik
05c376a14b Fix notifications being triggered for archived models [SCI-9967] 2024-01-08 15:23:16 +01:00
Gregor Lasnibat
ac8f5d8198
(fix) Background of opened modal from item card is not disabled [SCI-9931] (#6891) 2024-01-08 15:09:46 +01:00
wandji
c43dd38af4
Fix CSS issues add relationship modal [SCI-9955] (#6897) 2024-01-08 14:49:38 +01:00
Soufiane
4649a17cf9
Fix failing tests for item relationships [SCI-9719] (#6900) 2024-01-08 14:41:38 +01:00
ajugo
e2233523d2
Simplified create method for Repository row connections [SCI-9909] (#6873) 2024-01-08 14:14:24 +01:00
wandji
c607b8a323
Improve migration for repository_row_connections [SCI-9908] (#6863) 2024-01-08 12:01:06 +01:00
Ivan Kljun
370b3a03ed Remove blur event listener from legacy inline edit [SCI-9951] 2024-01-08 12:00:26 +01:00
wandji
16bf3217e4
Fix issue opening item card [SCI-9961] (#6898)
* Fix issue opening item card [SCI-9961]

* Fix failing tests [SCI-9961]
2024-01-08 11:30:04 +01:00
wandji
465c8d1f80
Unify API step and result elements controllers implementation and types [SCI-9907] (#6854)
* Unify api step and result elements controllers implementation and types [SCI-9907]

* Update wrong serializer types [SCI-9907]

* Rename result and step text types [SCI-9907]

* Combine result and step assets serializer [SCI-9907]
2024-01-08 10:31:14 +01:00
Gregor Lasnibat
ab98965947
(fix) Wide code sample on a shared task [SCI-9942] (#6890) 2024-01-05 16:43:58 +01:00
ajugo
2020a8ce17
Merge pull request #6886 from sboursen-scinote/sb_SCI-9948
Fix issues with relationships columns in inventory table [SCI-9948]
2024-01-05 16:41:12 +01:00
Soufiane
79ac010a05
Fix API V2 endpoints for item relationships [SCI-9719] (#6893) 2024-01-05 16:02:05 +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
ajugo
9e26d24dc9
Reset relationship counter when duplication repository row [SCI-9930] (#6881) 2024-01-05 14:47:44 +01:00
Martin Artnik
d680b3a256
Merge pull request #6827 from ivanscinote/SCI-9862-ik
Show modal when no predefined app for opening asset locally [SCI-9862]
2024-01-05 14:26:09 +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
sboursen-scinote
e62a4a60ad Fix issues with relationships columns in inventory table [SCI-9948] 2024-01-05 10:40:12 +01:00
Ivan Kljun
53c9be6f21 Fix hound suggestions [SCI-9862] 2024-01-04 16:45:22 +01:00
Soufiane
67ea1b15fe
Implement API V2 endpoints for item relationships [SCI-9719] (#6847) 2024-01-04 16:42:25 +01:00
Alex Kriuchykhin
da7b7518fc
Fix file text extraction for API results endpoints [SCI-9933] (#6874)
Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
2024-01-04 14:31:56 +01:00