1241 commits

Author	SHA1	Message	Date
Gregor Lasnibat	c030d2b6d1	Fix missing paperclip icon for file attachment [SCI-9224]	2023-09-06 13:52:03 +02:00
Gregor Lasnibat	f172c97a79	Fix missing OVE file preview [SCI-9214]	2023-09-06 12:45:42 +02:00
aignatov-bio	b5883178a4	Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework ... Rework inline edit vue component UI [SCI-9016]	2023-09-06 10:49:18 +02:00
Anton	48b89fc699	Fix activities for results [SCI-9206][SCI-9205][SCI-9207]	2023-09-05 16:25:21 +02:00
Martin Artnik	94932d0b04	Fix attachment deletion and image errors [SCI-9209]	2023-09-05 14:43:16 +02:00
aignatov-bio	7a32703c1a	Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability	2023-09-05 14:41:23 +02:00
aignatov-bio	647fb76910	Merge branch 'features/september-release' into ai-sci-9108-add-infinite-scroll	2023-09-05 14:40:03 +02:00
aignatov-bio	c33243b962	Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields ... Add title to text component [SCI-9141]	2023-09-05 14:32:42 +02:00
aignatov-bio	c3a5bf2e37	Merge pull request #6136 from aignatov-bio/ai-sci-9195-fix-tinymce-sticky-header ... Fix tinymce header [SCI-9195]	2023-09-05 14:31:20 +02:00
Ivan Kljun	a6abfc7e31	Applying hound suggestions [SCI-9016]	2023-09-05 13:39:21 +02:00
Anton	b4659e88a9	Fix tinymce header [SCI-9195]	2023-09-05 12:06:48 +02:00
Ivan Kljun	86e2cfe747	Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework	2023-09-05 11:31:30 +02:00
artoscinote	8d352b758a	Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation ... Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]	2023-09-05 11:09:08 +02:00
Ivan Kljun	56744e2dcd	Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]	2023-09-05 11:02:39 +02:00
artoscinote	c59ee1c358	Merge pull request #6132 from G-Chubinidze/gc_SCI_9179 ... Archiving results doesn't work [SCI-9179]	2023-09-05 10:53:43 +02:00
Giga Chubinidze	b7da98c1dd	Archiving results doesn't work [SCI-9179]	2023-09-05 11:55:15 +04:00
Anton	86f413cc71	Add title to text component [SCI-9141]	2023-09-04 14:13:29 +02:00
Giga Chubinidze	3b8669ed84	Add timestamps to results [SCI-9181]	2023-09-04 11:40:32 +04:00
Gregor Lasnibat	b382bb441e	Fix save empty OVE [SCI-9193]	2023-09-02 06:44:30 +02:00
lasniscinote	178d46dfae	Merge pull request #6134 from lasniscinote/gl_SCI_9213 ... Fix gene sequence attachment icons [SCI-9213]	2023-09-05 12:58:19 +02:00
Alex Kriuchykhin	f0fe040932	Fix OVE asset preview reloading after update [SCI-9112] (#6122)	2023-09-05 11:36:37 +02:00
Gregor Lasnibat	589faef72f	Fix gene sequence attachment icons [SCI-9213]	2023-09-02 03:14:51 +02:00
Ivan Kljun	40638dbb63	Rework inline edit vue component UI [SCI-9016]	2023-09-01 17:18:13 +02:00
wandji	c46c2ee9d6	Detach the File name changes from changing filename inside the OVE [SCI-9169] (#6116)	2023-09-01 13:54:41 +02:00
artoscinote	dc535bce52	Merge pull request #6121 from G-Chubinidze/gc_SCI_9186 ... Button translation in the "Move to different result" Modal [sci-9186]	2023-09-01 11:40:57 +02:00
artoscinote	7b73e03a5f	Merge pull request #6120 from G-Chubinidze/gc_SCI_9185 ... Placeholder text in the "Move to different result" modal dropdown [SCI-9185]	2023-09-01 11:40:34 +02:00
Giga Chubinidze	b71323d720	changed object mutation/changed placeholder check	2023-09-01 13:37:48 +04:00
artoscinote	51227b5c65	Merge pull request #6119 from G-Chubinidze/gc_SCI_9081 ... Placeholder text (titles, description field) [SCI-9081]	2023-09-01 11:02:06 +02:00
Martin Artnik	3724a4a067	Merge branch 'develop' into features/september-release	2023-09-01 10:30:48 +02:00
wandji	bed7f574f0	Hide align toolbar option in OVE editor [SCI-9113] (#6113) ... * Hide align toolbar option in OVE editor [SCI-9113] * Hide alligment toolbar in OVE editor [SCI-9113]	2023-09-01 10:18:36 +02:00
Giga Chubinidze	6db9134065	Button translation in the "Move to different result" Modal	2023-09-01 11:59:56 +04:00
Giga Chubinidze	100fdde5ca	Placeholder text in the "Move to different result" modal dropdown	2023-09-01 11:49:43 +04:00
Anton	d2ffaa209c	Fix results CSS [SCI-9177]	2023-08-31 15:53:38 +02:00
Oleksii Kriuchykhin	b4eb4d38e6	Merge branch 'develop' into features/ove-integration	2023-08-31 15:52:38 +02:00
wandji	167abe5239	Add .json extension to OVE import tooltip [SCI-9116] (#6112) ... * Add .json extension to OVE import tooltip [SCI-9116] * Override import and downlod tooltip values [SCI-9116]	2023-08-31 12:51:49 +02:00
Anton	2d76e628be	Add infinite scroll to results [SCI-9108]	2023-08-30 15:51:23 +02:00
G-Chubinidze	7a1b1b5cf5	UI rework of thumbnail view asset controls [SCI-9015] (#6104) ... * UI rework of thumbnail view asset controls [SCI-9015] * styling change css -> tailwind	2023-08-30 15:42:55 +02:00
Martin Artnik	c6e8bc1d2a	Fix TinyMCE sticky header calculation [SCI-9184]	2023-08-30 13:28:36 +02:00
aignatov-bio	f5235a9b9d	Merge pull request #6097 from aignatov-bio/ai-sci-8980-scrolling-on-task-page ... Add sticky scrolling to task page [SCI-8980]	2023-08-30 11:54:28 +02:00
Anton	6a287fa54f	Add sticky scrolling to task page [SCI-8980]	2023-08-30 11:09:27 +02:00
artoscinote	ffb8c7c455	Merge pull request #6100 from scinote-eln/hotfix/1.28.0.2 ... Hotfix/1.28.0.2	2023-08-29 16:31:04 +02:00
aignatov-bio	e8f839d719	Merge pull request #6088 from aignatov-bio/ai-sci-8977-ui-revamp-filters-modal ... Revamp filters flyouts [SCI-8977]	2023-08-29 10:18:54 +02:00
Anton	eb44724ece	Fix marving JS button initialization [SCI-9144]	2023-08-28 15:53:58 +02:00
Anton	171a996aec	Revamp filters flyouts [SCI-8977]	2023-08-28 13:15:41 +02:00
G-Chubinidze	bbffce5e03	Placeholder text (titles, description field) [SCI-9081] (#6087) ... * Placeholder text (titles, description field) [SCI-9081] * removed serializer code * Update table.vue	2023-08-28 10:36:40 +02:00
Giga Chubinidze	0e2f9ff81d	removed serializer code	2023-08-28 12:14:44 +04:00
Giga Chubinidze	6d8d804c71	Placeholder text (titles, description field) [SCI-9081]	2023-08-28 10:32:08 +04:00
ajugo	db4aa53f72	Merge pull request #5993 from sboursen-scinote/sb_SCI-9038 ... Set sequence attachments file icon [SCI-9038]	2023-08-25 21:53:22 +02:00
Anton	6615c01cb4	Add input field with search history [SCI-9102]	2023-08-25 15:02:27 +02:00
Soufiane	a19ab3b519	Fix OVE CSS issues [SCI-9114] (#6081) ... - Fix broken CSS import. - Hide body scroll when editor is open. - Fix editor header design.	2023-08-25 14:22:37 +02:00
sboursen-scinote	195df7936f	Use custom images for marvin and OVE [SCI-9038]	2023-08-25 13:59:18 +02:00
wandji	61da3a12b9	Add menubar to ove editor [SCI-9115] (#6079) ... * Add menubar to ove editor [SCI-9115]	2023-08-25 11:36:33 +02:00
Anton	e66968357a	Fix hound	2023-08-25 09:46:53 +02:00
Anton	f31d2b8912	Add move ability to attachments [SCI-9088]	2023-08-24 15:57:03 +02:00
Martin Artnik	dfa2afa480	Fix sticky tinyMCE menu offset [SCI-9131]	2023-08-24 14:21:30 +02:00
ivanscinote	059530620b	Implement delegated event handling for rel='external' [SCI-8737] (#6050) ... * Replace tinymce target='_blank' with rel='external' [SCI-8737] * Add noopener to rel='external' links	2023-08-24 11:12:11 +02:00
Soufiane	9d0f62824e	Remove blinking button from actiontoolbar when loading [SCI-9067] (#6062)	2023-08-24 09:19:35 +02:00
ajugo	253be93368	Fix loading of navigators [SCI-8797] (#5868)	2023-08-23 15:49:00 +02:00
artoscinote	0bea4a06ef	Add result duplicate action [SCI-8959] (#6019)	2023-08-23 15:05:31 +02:00
Ivan Kljun	39ed4b1b92	Hide Cancel/Save btns after click at Share task modal [SCI-9008]	2023-08-23 14:20:24 +02:00
artoscinote	e1416e3efd	Merge branch 'features/september-release' into ma_SCI_9013	2023-08-23 12:01:14 +02:00
Martin Artnik	b3965e5aca	Implement result filters [SCI-9013]	2023-08-23 11:59:21 +02:00
artoscinote	e03920affd	Merge branch 'develop' into ma_SCI_8462	2023-08-23 11:21:32 +02:00
Anton	beed1cdb9d	Make top navigation and breadcrumbs collapsable [SCI-9090]	2023-08-22 16:24:34 +02:00
ivanscinote	c8bc4bef01	Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737] (#5866) ... Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737]	2023-08-22 14:59:34 +02:00
aignatov-bio	c111d287ef	Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements ... Add element movements between step and results [SCI-9024]	2023-08-22 12:26:57 +02:00
Anton	e9174ad158	Add element movements between step [SCI-9024]	2023-08-22 12:15:55 +02:00
Andrej	29cddf5ef7	Merge branch 'develop' into features/ove-integration	2023-08-22 11:00:34 +02:00
Andrej	35ecd064d2	Fix tinymce help plugin language inclusion [SCI-9086]	2023-08-22 10:24:45 +02:00
G-Chubinidze	1253511020	Merge pull request #6035 from G-Chubinidze/gc_SCI_9014 ... Add thumbnail asset preview to list view assets [SCI-9014]	2023-08-22 12:22:06 +04:00
Giga Chubinidze	c699095d1a	Add thumbnail asset preview to list view assets [SCI-9014]	2023-08-22 05:55:20 +04:00
wandji	1d051aeb0f	Fix CSS UI issues for shareable links task sharing [SCI-9080] (#6031) ... * Fix css UI issues for shareable links task sharing [SCI-9080]	2023-08-21 16:07:38 +02:00
Anton	0161277380	Fix bootstrap in report [SCI-9085]	2023-08-21 15:26:58 +02:00
artoscinote	8f24e90ee4	Merge pull request #6030 from wandji20/wb-SCI-9074 ... Fix css issue protocol template author edit [SCI-9074]	2023-08-21 12:58:23 +02:00
artoscinote	d8da463dc2	Merge pull request #5956 from ivanscinote/SCI-9008-share-task-modal ... Move blur event to whole modal at Share task [SCI-9008]	2023-08-21 12:04:54 +02:00
wandji20	b41b0b04f0	Fix css issue protocol template author edit [SCI-9074]	2023-08-21 11:01:07 +01:00
artoscinote	00167e30b0	Merge pull request #6029 from artoscinote/ma_SCI_8422 ... Fix filtering of template tags [SCI-8422]	2023-08-21 11:56:28 +02:00
Ivan Kljun	5902ee28e1	Remove blur event function as it is redundant	2023-08-21 11:52:57 +02:00
Martin Artnik	fc18c76efd	Fix filtering of template tags [SCI-8422]	2023-08-21 11:44:01 +02:00
Anton	2d64d2fcbf	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00
wandji20	5e6138fa18	Replace unecessary margin value with tailwind value [SCI-9018]	2023-08-21 09:27:28 +01:00
wandji20	0ae44eb3a7	Use default tailwind size for task assigned protocol description [SCI-9018]	2023-08-21 09:27:28 +01:00
wandji20	7c07befd3e	Fix CSS issues in protocols, and quick start(new task) [SCI-9018]	2023-08-21 09:27:28 +01:00
Ivan Kljun	0553b5b0dc	Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal	2023-08-21 09:32:59 +02:00
Ivan Kljun	b357e3117c	Merge remote-tracking branch 'upstream/features/september-release' into SCI-8893-navigator-freezes	2023-08-21 09:16:32 +02:00
Ivan Kljun	0c1f47eada	Add hound linter suggestion	2023-08-21 09:09:40 +02:00
artoscinote	20c20012b2	Merge pull request #5863 from ivanscinote/SCI-8807-notifications ... Remove system notifications [SCI-8807]	2023-08-18 10:28:05 +02:00
artoscinote	f21c1ba7c5	Merge pull request #6009 from artoscinote/ma_SCI_8959 ... Add some basic result component layout [SCI-8959]	2023-08-17 16:42:26 +02:00
Martin Artnik	23a8872e11	Add some basic result component layout [SCI-8959]	2023-08-17 16:32:42 +02:00
artoscinote	2cc49ec6b5	Merge pull request #6005 from wandji20/wb-SCI-9003 ... Fix CSS style issues [SCI-9003]	2023-08-17 15:48:07 +02:00
ajugo	dd80b4019b	Merge pull request #5942 from sboursen-scinote/sb_SCI-8987 ... Fix micro-interactions for shareable links modals [SCI-8987]	2023-08-17 15:28:43 +02:00
sboursen-scinote	ef9368d2cb	Fix micro-interactions for shareable links modals [SCI-8987]	2023-08-17 15:22:16 +02:00
ajugo	032655f4e7	Merge pull request #6002 from rekonder/aj_SCI_8986 ... Show toast message on successful copy [SCI-8986]	2023-08-17 15:14:05 +02:00
wandji20	4a3f8146e3	Fix CSS style issues [wb-SCI-9003]	2023-08-17 13:11:58 +01:00
Alex Kriuchykhin	c356018965	Merge pull request #5918 from sboursen-scinote/sb_SCI-8981 ... Share button is disabled for locked and archived tasks [SCI-8981]	2023-08-17 14:10:09 +02:00
Anton	16eedcdade	Revamp modals across app [SCI-8978]	2023-08-17 14:01:26 +02:00
Andrej	9a09fbc8ce	Show toast message on successful copy [SCI-8986]	2023-08-17 11:21:53 +02:00
Andrej	6e8dda64b2	Create new sequence attachment on task protocol step [SCI-8948]	2023-08-17 09:38:44 +02:00
Giga Chubinidze	63ed250f4a	Result action menu [SCI-8954]	2023-08-17 10:29:34 +04:00
sboursen-scinote	d631098d9a	Fix multiple issues with edit sequence on task protocol [SCI-8966] ... - Fix edit button label and icon - Fix preview modal for gene-sequence	2023-08-16 17:01:43 +02:00
Alex Kriuchykhin	975a197716	Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues ... Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]	2023-08-16 15:34:57 +02:00
Ivan Kljun	1880723c8c	Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]	2023-08-16 10:49:34 +02:00
Martin Artnik	8d31c5eb3b	Merge branch 'develop' into features/ove-integration	2023-08-16 10:41:26 +02:00
artoscinote	083bd4b1e2	Merge pull request #5827 from aignatov-bio/ai-sci-8843-fix-notification-infinite-scroll ... Fix infinite scroll for notifications [SCI-8843]	2023-08-16 10:27:07 +02:00
sboursen-scinote	dc27620d00	Make share button independent of task status flow or archived state [SCI-8981]	2023-08-16 10:22:55 +02:00
Anton	6e5fa5ccd7	Add create actions [SCI-8953]	2023-08-11 15:04:49 +02:00
Anton	a46674b3a3	Fix small bootstrap issues [SCI-9051]	2023-08-11 11:34:11 +02:00
Anton	f6191dbb67	Add elements and attachments to new result [SCI-8953]	2023-08-11 11:03:26 +02:00
Alex Kriuchykhin	c6a545d8b3	Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961)	2023-08-10 16:25:04 +02:00
Anton	ac37885885	Merge branch 'develop' into features/september-release	2023-08-10 15:01:58 +02:00
aignatov-bio	acab34679d	Merge pull request #5960 from aignatov-bio/ai-test-jquery-pr ... Restore bootstrap overrides	2023-08-10 14:43:12 +02:00
Anton	3c0ccc730f	Restore bootstrap overrides	2023-08-10 14:36:06 +02:00
Martin Artnik	16dbd48ad3	Merge branch 'develop' into features/september-release	2023-08-10 13:21:27 +02:00
Ivan Kljun	949da66414	Move blur event to whole modal at Share task [SCI-9008]	2023-08-10 11:58:35 +02:00
Martin Artnik	4d4eebd78e	Fix glitchy dropdowns on Safari [SCI-8946]	2023-08-10 11:46:31 +02:00
Soufiane	aedd3e0b6d	Fix multiple issues for Shared tasks feature [SCI-8985] (#5936) ... - Centre vertically all related modals - Convert task header tabs to sentence case	2023-08-10 09:43:31 +02:00
Andrej	104a9d5c17	Implemented trial period for open vector editor [SCI-8962]	2023-08-10 08:58:49 +02:00
Martin Artnik	a952319afd	Merge branch 'develop' into features/september-release	2023-08-09 16:43:15 +02:00
artoscinote	c42a10e131	Merge pull request #5945 from ivanscinote/SCI-8955-result-content-rearange ... Make result content rearrangable [SCI-8955]	2023-08-09 15:58:17 +02:00
Anton	2da83f460f	Test moving jquery	2023-08-09 14:43:17 +02:00
Ivan Kljun	669bb3dd48	Make result content rearrangable (UI needs to be finalised and tested with actual data) [SCI-8955]	2023-08-09 13:58:25 +02:00
Anton	f688995635	Refactor task page UX [SCI-8951]	2023-08-09 11:03:30 +02:00
wandji	a1e6392a45	Fix bugs with jquery3 upgrade [SCI-8973] (#5933) ... * Fix bugs with jquery3 upgrade [SCI-8973] * Remove deprecated jquery method (.error, .completed, .success) [SCI-8973] * Fix linter error [SCI-8973]	2023-08-09 10:33:58 +02:00
Anton	fcd76661c7	Fix inline edit	2023-08-08 11:09:26 +02:00
Anton	758b28261d	Merge branch 'develop' into features/september-release	2023-08-07 16:30:28 +02:00
Martin Artnik	11fb166a0c	Migration fix, additional endpoints, cleanup [SCI-8947]	2023-08-07 16:09:15 +02:00
Martin Artnik	633abf69c0	Basic results toolbar implementation [SCI-8952]	2023-08-07 16:09:15 +02:00
Martin Artnik	fd55aa21a6	Basic results component and structure [SCI-8947]	2023-08-07 16:09:13 +02:00
ajugo	c8fbdacf22	Merge pull request #5921 from rekonder/aj_SCI_8986 ... Copy shareable link when you enable sharing for task [SCI-8986]	2023-08-07 15:17:49 +02:00
Anton	7961bee35f	Merge branch 'develop' into features/september-release	2023-08-07 14:11:29 +02:00
Alex Kriuchykhin	dacc6b48aa	Merge pull request #5924 from scinote-eln/features/protocol-parsing ... Merge features/protocol-parsing to develop	2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin	6cf7403b21	Merge branch 'develop' into features/protocol-parsing	2023-08-07 12:55:20 +02:00
Anton	89c526103d	Merge branch 'develop' into features/remove-front-end-gems	2023-08-07 11:23:21 +02:00
Anton	937bc60542	Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release	2023-08-07 10:37:20 +02:00
Anton	89d7241f60	Merge branch 'develop' into features/september-release	2023-08-07 10:35:15 +02:00
Andrej	84233506c0	Copy shareable link when you enable sharing for task [SCI-8986]	2023-08-07 09:47:44 +02:00
Alex Kriuchykhin	b365553a14	Merge pull request #5917 from scinote-eln/features/august-release ... Merge features/august release to develop	2023-08-04 14:01:44 +02:00
sboursen-scinote	40f78f4a28	Fix shareable links CSS [SCI-8975] ... - Fix the style of the toggle button globally. - Fix permissions on who can toggle team shareable links. - Change wrong translations in shareable links modal. - Remove placeholder text for start-date	2023-08-04 12:34:04 +02:00
sboursen-scinote	c27c7245bc	Fix various CSS issues [SCI-8940] ... - Maintain the position of the top navigation controls when user is without team. - Add "missing" avatar to avatar change modal - Disable wrapping of (A) in archived P/E/T - Fix padding/margin issues in Archived tasks and Protocol templates	2023-08-04 09:11:53 +02:00
Ivan Kljun	0bdbe84d4d	Add hound linter suggestions	2023-08-02 17:02:11 +02:00
Ivan Kljun	2d26c70d40	Create vue method for toggling navigator state	2023-08-02 16:45:06 +02:00
Oleksii Kriuchykhin	b49b7c4a80	Merge branch 'develop' into features/shareable-links	2023-08-02 16:05:21 +02:00
Martin Artnik	80c5268efd	Add read-only mode to OVE [SCI-8962]	2023-08-02 15:46:07 +02:00
wandji	31f8bc19d5	Add unique database index to checklist items position (#5886) ... * Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841] * Improve protocol checklist item reordering [SCI-8841] * Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]	2023-08-02 15:37:01 +02:00
Martin Artnik	76a0f433cd	Basic OVE editor implementation [SCI-8929]	2023-08-02 14:13:04 +02:00
ivanscinote	242df0632d	Merge branch 'features/august-release' into SCI-8807-notifications	2023-08-02 13:40:06 +02:00
ajugo	fa187f3b31	Add shared assets download and fix loading of the shareable button on task [SCI-8754] (#5878) ... * Add shared assets download and fix loading of the shareable button on task [SCI-8754] * Add additional check before asset loading [SCI-8754] * Add additional check before asset loading [SCI-8754] * Load asset for specific task [SCI-8754]	2023-08-01 16:46:41 +02:00
wandji	2680b317e5	Fix issue when toggling repository items search fields [SCI-8874] (#5855) ... * Fix issue when toggling repository items search fields [SCI-8874] * Refactor outside click directive and make it available for all components [SCI-8874]	2023-08-01 10:41:58 +02:00
ajugo	e71d5805ca	Refactored settings for Label templates feature and Zebra printing [SCI-8918] (#5895) ... * Refactored settings for Label templates feature and Zebra printing [SCI-8918] * Add check for label template [SCI-8918]	2023-08-01 10:30:57 +02:00
artoscinote	f117c21ea5	Merge pull request #5873 from aignatov-bio/ai-sci-8905-refactor-insert-menu ... Refactor insert menu [SCI-8905]	2023-08-01 10:13:23 +02:00