Commit graph

15641 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
f39e9501cf
Removed proxing of API V1 endpoints to the new V2 namespace [SCI-9976] (#6943) 2024-01-15 10:01:51 +01:00
Martin Artnik
424da0a218
Merge pull request #6939 from G-Chubinidze/gc_SCI_9987
Make File Checkout feature switchable in settings [SCI-9987]
2024-01-15 09:44:37 +01:00
ajugo
98ee391d03
Filter already connected items on repository item relationship modal [SCI-9916] (#6934) 2024-01-15 09:41:52 +01:00
ajugo
81fbd38b0c
Increase timeout for PDF generation in Grover config [SCI-9969] (#6937) 2024-01-15 09:38:22 +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
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