Commit graph

15714 commits

Author SHA1 Message Date
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
Martin Artnik
71c58e3769
Merge pull request #6932 from sboursen-scinote/sb_SCI-9992
Duplicated edit activities when creating a table/well plate [SCI-9992]
2024-01-12 11:21:29 +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
dependabot[bot]
4f21817b00
Bump follow-redirects from 1.15.2 to 1.15.4 (#6922)
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-11 11:29:25 +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
dependabot[bot]
7b49db6ff9
Bump puma from 6.3.1 to 6.4.2 (#6904)
Bumps [puma](https://github.com/puma/puma) from 6.3.1 to 6.4.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.1...v6.4.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-10 13:05:18 +01:00
Oleksii Kriuchykhin
8fba5a89d9 Bump version to 1.29.6 2024-01-10 10:45:13 +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
Martin Artnik
8be50c399a
Merge pull request #6915 from lasniscinote/gl_SCI_9942
(fix) Wide code sample on a shared task [SCI-9942_v2]
2024-01-09 13:34:04 +01:00
Gregor Lasnibat
5d4234a376 (fix) Wide code sample on a shared task [SCI-9942] 2024-01-09 12:56:30 +01:00
Martin Artnik
1a8e9c48ad
Merge pull request #6910 from ivanscinote/SCI-9806-ik
Change to asset_download_path in Asset Serializer [SCI-9806]
2024-01-09 10:01:57 +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
Alex Kriuchykhin
d92a4e2dce
Fix migration for updating wrong team reference on assets [SCI-9971] (#6903) 2024-01-08 16:31:09 +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
50aa1f05a7
Merge pull request #6902 from artoscinote/ma_SCI_9967
Fix notifications being triggered for archived models [SCI-9967]
2024-01-08 15:44:39 +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