263 commits

Author	SHA1	Message	Date
wandji	e61d593a0e	Add disabled button for unsupported wopi files [SCI-9901] (#7271)	2024-03-13 16:20:55 +01:00
Martin Artnik	be4f27750c	Merge branch 'release/1.30.0' into develop	2024-03-13 15:26:35 +01:00
Oleksii Kriuchykhin	d004b1e7a0	Merge branch 'features/bugfixes' into develop	2024-03-08 11:21:26 +01:00
Andrej	92946e33ff	Merge branch 'features/inventory-import-improvements' into features/bugfixes	2024-03-06 10:18:35 +01:00
Giga Chubinidze	e243da184f	Button code for "Open locally" [SCI-10291]	2024-03-06 05:17:45 +04:00
Gregor Lasnibat	c9ecf359a9	(fix) To change text in Move to different step modal [SCI-10096]	2024-03-04 11:49:08 +01:00
Andrej	2be9dd3d74	Fix flickering of dropdown menu on thumbnail file preview [SCI-10329]	2024-03-04 09:24:04 +01:00
Giga Chubinidze	ca831cb103	Loading file to results - wrong file and preview [SCI-10254]	2024-02-27 12:48:34 +04:00
Anton	d72e63a0f2	Merge branch 'develop' into features/inventory-import-improvements	2024-02-26 10:46:49 +01:00
Anton	ed0db94089	Merge branch 'develop' into features/new-datatable	2024-02-21 12:51:17 +01:00
Martin Artnik	f8aae8aca6	Merge branch 'develop' into features/inventory-import-improvements	2024-02-20 15:18:07 +01:00
Gregor Lasnibat	7c4e4a8ee7	(fix) TinyMCE issues - Code samples & Wide tables [SCI-10076]	2024-02-20 14:31:37 +01:00
Martin Artnik	35dc70048e	Modal code cleanup [SCI-10224]	2024-02-15 14:10:24 +01:00
Martin Artnik	87eeaab08d	Fix WOPI editing not opening in new tab [SCI-10224]	2024-02-15 13:15:05 +01:00
Ivan Kljun	aec115f669	Add polling for asset changes for SciNote Edit [SCI-10122]	2024-02-07 11:26:40 +01:00
Martin Artnik	b5b29f66fc	Open locally button fixes on preview [SCI-9757]	2024-02-05 12:45:15 +01:00
Ivan Kljun	78f3456da0	Move modals logic to open_locally.js [SCI-10010]	2024-02-01 10:42:40 +01:00
Ivan Kljun	cc4fa19bc1	Merge remote-tracking branch 'upstream/develop' into SCI-10010-ik	2024-02-01 10:15:58 +01:00
Martin Artnik	4739da3ed1	Preview Open locally menu fixes [SCI-9795]	2024-01-31 15:15:24 +01:00
Anton	72b40a63a0	Merge branch 'develop' into features/new-datatable	2024-01-30 12:02:04 +01:00
Ivan Kljun	6b50039dac	Change event name to be same as function name [SCI-10010]	2024-01-24 09:32:31 +01:00
Ivan Kljun	c2fa110fb2	Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-10010-ik	2024-01-23 15:32:27 +01:00
Ivan Kljun	0eb323b2f1	Add wrong-version modal for SciNote Edit [SCI-10010]	2024-01-23 11:54:42 +01:00
Martin Artnik	c3bee668dc	Merge pull request #6987 from artoscinote/ma_SCI_9757 ... Fix Open menu in attachment preview screen [SCI-9757]	2024-01-23 10:02:04 +01:00
Martin Artnik	81a4924d6b	Fix Open menu in attachment preview screen [SCI-9757]	2024-01-22 16:41:10 +01:00
Anton	1fff6da45d	Refactor checklist [SCI-9959]	2024-01-22 14:01:32 +01:00
Anton	bd48ae1d07	Merge branch 'features/asset-sync' of github.com:scinote-eln/scinote-web into features/asset-sync	2024-01-19 11:34:42 +01:00
Anton	9d19fe8382	Merge branch 'develop' into features/asset-sync	2024-01-19 11:33:40 +01:00
Anton	4b3666b4f8	Merge branch 'develop' into features/new-datatable	2024-01-19 11:10:32 +01:00
Ivan Kljun	a0445a70bf	Fix status API request and thumbnail buttons in SciNote Edit [SCI-9993]	2024-01-18 14:49:46 +01: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
Giga Chubinidze	2ebe3ff2b8	Fixed js error in open locally menu vue	2024-01-16 20:31:12 +04:00
G-Chubinidze	51bcc96251	Merge branch 'features/asset-sync' into gc_SCI_9757	2024-01-16 17:02:46 +04:00
mvrazic	967950468d	e2e - added new tags - general-inventories-activities [SCI-10016] (#6947)	2024-01-15 17:17:55 +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
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
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
sboursen-scinote	085918ca92	Prevent double edit activities when creating a table/well plate [SCI-9992]	2024-01-11 15:56:19 +01:00
Anton	de72f60cc1	Merge branch 'develop' into features/new-datatable	2024-01-11 15:14:36 +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
Anton	3346c55941	Merge branch 'develop' into features/new-datatable	2024-01-09 10:36:21 +01:00
Gregor Lasnibat	30300dbe1d	(fix) Fix formatting in VUE files [SCI-9936]	2024-01-08 16:11:27 +01:00