673 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	7fff3e8f78	Merge branch 'hotfix/1.26.6.2' into develop	2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin	b67691acb5	Merge branch 'develop' into features/protocol_versioning	2023-03-17 13:53:30 +01:00
aignatov-bio	33c880149c	Add new general account [SCI-7963] (#5127)	2023-03-16 12:54:24 +01:00
sboursen-scinote	c6bb9850ea	Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007]	2023-03-15 09:24:45 +01:00
Alex Kriuchykhin	d82470aa03	Improve handling and escaping of special characters in input fields [SCI-8125] (#5135)	2023-03-13 18:00:30 +01:00
Giga Chubinidze	b59f922143	CSS: Pixel-perfect issues for Protocol templates [SCI-8100]	2023-03-13 14:25:04 +04:00
sboursen-scinote	b3f7c41548	Update the filter dropDown globaly [SCI-8007]	2023-03-08 16:25:10 +01:00
sboursen-scinote	248b13aa72	Fix hound [SCI-8030]	2023-03-03 14:32:08 +01:00
sboursen-scinote	443ee4350c	Fix protocol repository sidebar on archived view [SCI-8030]	2023-03-03 14:11:40 +01:00
Martin Artnik	165e012d23	Replace highlight.js with prism.js [SCI-7974]	2023-02-28 16:22:35 +01:00
Alex Kriuchykhin	e020b4a416	Improve tags sanitization in smart annotations (#5008)	2023-02-21 16:53:04 +01:00
Anton	ea9d2d8291	Merge branch 'develop' into features/protocol_versioning	2023-02-14 11:07:58 +01:00
Anton	1a0b28c74e	Add archive view for protocols template	2023-02-09 11:38:27 +01:00
Martin Artnik	eceeb7ceb5	Add targetable class to tinyMCE packs [SCI-7187]	2023-02-07 15:47:44 +01:00
Soufiane	937c8564f0	Update Invite new user to team modal [SCI-6007] (#4854) ... Update Invite new user to team modal [SCI-6007]	2023-02-01 16:27:50 +01:00
Anton	f6fe827326	Improve microinteractions in experiment table [SCI-7540]	2023-01-17 13:40:30 +01:00
artoscinote	80eb1639bc	Merge pull request #4823 from scinote-eln/features/tiny_mce_6 ... Features/tiny mce 6	2023-01-13 13:53:03 +01:00
ajugo	67dcbb0fa6	Open the correct experiment view [SCI-7662][SCI-7741] (#4798) ... * Fix experiment view loading [SCI-7662] * Fix experiment view loading [SCI-7662]	2023-01-12 11:31:04 +01:00
Anton	e38c45314b	Update sidebar along with experiment table [SCI-7704]	2023-01-10 13:45:15 +01:00
Martin Artnik	19b282cba2	Merge branch 'develop' into features/tiny_mce_6	2023-01-10 11:13:23 +01:00
artoscinote	9914f19634	Merge pull request #4760 from G-Chubinidze/gc_SCI_7651 ... Missing experiment table empty state, fix breadcrumbs [SCI-7651]	2023-01-06 10:51:34 +01:00
Giga Chubinidze	79c7e6f0a2	Missing experiment table empty state, fix breadcrumbs [SCI-7651]	2023-01-06 11:40:41 +04:00
Martin Artnik	4e779e70a4	Merge branch 'develop' into features/tiny_mce_6	2023-01-04 14:21:02 +01:00
ajugo	6844144503	Fix experiment table sidebar navigation [SCI-7652] (#4741)	2023-01-03 12:24:56 +01:00
aignatov-bio	ea661f3c19	Merge branch 'develop' into features/new_experiment_views	2022-12-22 13:33:25 +01:00
Martin Artnik	c828d02b99	Merge branch 'develop' into features/tiny_mce_6	2022-12-07 14:07:43 +01:00
Anton	fdeb22c6cd	Update protocols layout [SCI-7515]	2022-12-05 14:02:13 +01:00
artoscinote	a0682f962a	Merge pull request #4674 from G-Chubinidze/gc_SCI_7542 ... Add the time to the existing timestamp in the comments side panel [SCI-7542]	2022-12-02 10:18:08 +01:00
Giga Chubinidze	22248d4fed	Add the time to the existing timestamp in the comments side panel [SCI-7542]	2022-12-02 10:49:06 +04:00
Giga Chubinidze	47d593f0db	Missing navigate away pop up at inventory page [SCI-7492]	2022-11-23 15:38:01 +04:00
Anton	63ce422367	Add basic filters for experiment table [SCI-7215]	2022-11-09 15:27:39 +01:00
Oleksii Kriuchykhin	a5336608f8	Fix user role selection when inviting new users [SCI-7338]	2022-10-14 11:35:35 +02:00
Oleksii Kriuchykhin	173e3b09cd	Fix user invitation modal [SCI-7308]	2022-10-06 17:55:51 +02:00
Anton	0c596bb701	Merge branch 'develop' into features/label-templates	2022-09-15 10:40:17 +02:00
Anton	d7990cb058	Add new permissions for label templates [SCI-7088]	2022-09-14 15:13:13 +02:00
Anton	0d1b4cb01a	Merge branch 'features/team-permissions' into features/label-templates	2022-09-13 14:20:57 +02:00
artoscinote	44b7c866b5	Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385) ... * Move tinymce to webpacker and upgrade to v6 [SCI-7081] * Cleanup and refactor [SCI-7081] * Clean up legacy plugins [SCI-7150] * Linter fix [SCI-7081]]	2022-09-05 11:29:19 +02:00
ajugo	b6f273410b	Fix protocol repository CSS [SCI-7064] (#4335) ... * Fix protocol repository CSS [SCI-7064] * Fix protocol repository CSS [SCI-7064] * Fix hound [SCI-7064]	2022-08-10 10:27:15 +02:00
Alex Kriuchykhin	f67654ffeb	Merge pull request #4332 from okriuchykhin/ok_SCI_6986_v2 ... Fix protocol linked protocol changes tracking [SCI-6986]	2022-08-09 17:03:48 +02:00
Oleksii Kriuchykhin	d1a46b3fc2	Fix protocol linked protocol changes tracking [SCI-6986]	2022-08-09 14:15:49 +02:00
artoscinote	187197488b	Pdf viewer and protocol fixes [SCI-7074] (#4327)	2022-08-09 10:13:43 +02:00
Anton	6131b6c0b7	Add new templates section and navigation [SCI-7017]	2022-07-26 13:53:51 +02:00
Oleksii Kriuchykhin	382d54320e	Improve repository table loading speed [SCI-7002]	2022-07-25 15:39:11 +02:00
ajugo	c2f17760ea	Replace favicon in public folder and fix what's new title [SCI-5319] (#4224) ... * Fix what's new tab name [SCI-5319] * Change favicons in public folder [SCI-5319]	2022-07-12 10:16:04 +02:00
ajugo	82132c865c	Add archived result counter and fix result counter [SCI-6946][6975] (#4223)	2022-07-12 09:58:21 +02:00
Martin Artnik	9abbe22c26	Merge branch 'develop' into features/step-editing-improvements	2022-06-02 11:26:39 +02:00
Anton	7bc5c622a7	Add comments to step [SCI-6837]	2022-05-25 15:06:12 +02:00
ajugo	0fa2e5f30b	Remove icons from task tabs [SCI-6621] (#4105)	2022-05-25 10:45:08 +02:00
Oleksii Kriuchykhin	cac33bed25	Update user invitations with new user roles [SCI-6823]	2022-05-19 09:04:25 +02:00
Oleksii Kriuchykhin	b148bd2057	Add results counter to secnd navigation [SCI-6722]	2022-04-22 12:24:14 +02:00
artoscinote	42605e1a8a	Fix inviting users to team [SCI-6725] (#4026)	2022-04-15 15:31:08 +02:00
artoscinote	401a32edd9	Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) ... * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612]	2022-04-04 11:04:03 +02:00
aignatov-bio	5e92429212	Add micro-interactions to reminders flyout [SCI-6627] (#3951) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-24 10:16:47 +01:00
ajugo	7cba738a9b	Date remidner flyout [SCI-6503] (#3937) ... * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503]	2022-03-22 13:33:58 +01:00
ajugo	d1610fba53	Low stock flyout reminders [SCI-6502] (#3932) ... * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502]	2022-03-15 10:24:35 +01:00
artoscinote	96289b1188	Display text in smaller device navigation [SCI-5580] (#3821)	2022-02-04 11:37:26 +01:00
Alex Kriuchykhin	2a6b33deec	Fix downloading of BioEddie files in reports [SCI-6037] (#3623)	2022-02-02 10:41:57 +01:00
artoscinote	277b5f6eec	Fixed reCaptcha causing stack overflows on invite modal [SCI-6052] (#3534)	2022-01-06 10:11:20 +01:00
Alex Kriuchykhin	7c4143249e	Improve speed of assigned modules popout [SCI-6350] (#3754)	2022-01-04 10:18:08 +01:00
Oleksii Kriuchykhin	a99599efea	Merge branch 'features/new_permissions' into develop	2021-10-29 15:16:30 +02:00
Alex Kriuchykhin	1bde37db78	Merge branch 'develop' into ok_SCI_5579	2021-10-28 13:26:27 +02:00
aignatov-bio	328f1cfe4d	Add blank tasks to canvas [SCI-6133] (#3588)	2021-10-13 10:08:39 +02:00
artoscinote	f68d724202	Rework experiment permissions [SCI-6054] (#3538) ... * Rework experiment permissions [SCI-6054]	2021-09-30 11:32:11 +02:00
aignatov-bio	6a1223c498	Fix sidebar navigation for archived task [SCI-6050]	2021-09-10 12:05:40 +02:00
artoscinote	f839cb5256	Merge pull request #3464 from biosistemika/features/bioeddie-integration ... Features/bioeddie integration	2021-08-03 13:32:53 +02:00
artoscinote	c41247a5fd	Merge pull request #3439 from artoscinote/ma_SCI_5879 ... Implement Save & Register molecule [SCI-5879]	2021-08-03 12:15:46 +02:00
Oleksii Kriuchykhin	c26dcf4b23	Replace empty? with blank? [SCI-5579]	2021-07-23 11:56:28 +02:00
aignatov-bio	067758808e	Add download heml button to file preview [SCI-5876] (#3423) ... * Add download heml button to file preview [SCI-5876] * Remove safe navigation	2021-07-20 13:22:42 +02:00
aignatov-bio	4de35c983a	Open HELM files in bio eddie [SCI-5890] (#3442)	2021-07-20 13:06:47 +02:00
artoscinote	888131a465	Merge branch 'features/bioeddie-integration' into ma_SCI_5879	2021-07-20 09:48:13 +02:00
aignatov-bio	53456988ba	Add bioEddie activities and user licenses [SCI-5845][SCI-5842] (#3411) ... * Add bio eddie licens to users [SCI-5845] * Add activities for BioEddie [SCI-5842]	2021-07-19 21:33:28 +02:00
Martin Artnik	96a5b97bdb	Implement Save & Register molecule [SCI-5879]	2021-07-15 12:37:04 +02:00
Martin Artnik	ff0ac9f497	Fix free invite users modal [SCI-5900]	2021-07-13 15:51:05 +02:00
Martin Artnik	40a8f3a434	Switch to using dropdownSelector for emails input [SCI-5099]	2021-07-09 11:20:48 +02:00
Martin Artnik	fb040bee07	Fix styling, functionality issues with invite users modal [SCI-5099]	2021-07-08 16:10:20 +02:00
Martin Artnik	5f528fcdb5	Rework the team invite modal functionality on members page [SCI-5099]	2021-07-05 12:39:54 +02:00
Alex Kriuchykhin	f835f88e64	Merge pull request #3410 from okriuchykhin/ok_SCI_5097 ... Update Invite new user to team modal [SCI-5097]	2021-06-30 13:34:06 +02:00
Oleksii Kriuchykhin	ecec1ce194	Update Invite new user to team modal [SCI-5097]	2021-06-29 13:46:02 +02:00
aignatov-bio	786e74e4de	Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391) ... * Add backend for bioeddie [SCI-5654] * Add modal for bioeddie [SCI-5654] * Add bio eddie editor to steps and results [SCI-5654] * Fix markup and code styling	2021-06-23 19:48:44 +02:00
Martin Artnik	b6588c2334	Reworked task view sidebar [SCI-5701]	2021-06-18 16:52:19 +02:00
aignatov-bio	4a6f6a787a	Update help menu [SCI-5643] (#3368)	2021-06-08 15:34:19 +02:00
Oleksii Kriuchykhin	29c83ffbb1	Merge branch 'develop' into features/new-reports	2021-05-21 11:04:17 +02:00
aignatov-bio	a46b9cb8ea	Add document preview to reports [SCI-5559]	2021-04-07 11:15:22 +02:00
aignatov-bio	d3d79f4288	Small breadcrumbs fixes [SCI-5564]	2021-03-18 14:24:33 +01:00
aignatov-bio	63744b6a04	Add dropdown to breadcrumbs [SCI-5431]	2021-03-12 12:21:10 +01:00
Urban Rotnik	419b69ef60	Fix syntax error ... SCI-5518	2021-03-08 22:04:28 +01:00
Urban Rotnik	e1db291729	Merge pull request #3200 from urbanrotnik/ur-sci-5525 ... Add breadcrumbs on Experiments and Tasks pages [SCI-5525]	2021-03-08 14:13:44 +01:00
aignatov-bio	df4297f6f7	Merge branch 'develop' into features/local_file_previews	2021-03-08 11:30:47 +01:00
Urban Rotnik	401224ae11	Add breadcrumbs on Experiments and Tasks pages	2021-03-04 09:00:58 +01:00
aignatov-bio	24134174fc	Add titles to navigation items [SCI-5460]	2021-02-23 15:00:11 +01:00
aignatov-bio	8191306411	Fix experiment archive page route [SCI-5479]	2021-02-12 09:55:26 +01:00
aignatov-bio	1eff3494fb	Fix archived experiments page routes and clean old archive page [SCI-5479]	2021-02-11 14:21:15 +01:00
aignatov-bio	a339d821bd	Merge pull request #3105 from aignatov-bio/ai-sci-5255-update-marvin-js-model-styling ... Update marvinJS modal CSS [SCI-5255]	2021-02-05 15:36:14 +01:00
aignatov-bio	a7a948abaf	Add archive/restore toolbar buttons and backend [SCI-5457]	2021-02-03 14:29:50 +01:00
aignatov-bio	29cf9be1f6	Add filters to experiments pages [SCI-5366] (#3119) ... * Move filters to shared folder [SCI-5366]	2021-01-29 13:24:02 +01:00
Mojca Lorber	1080c22b30	Update Experiments page layout and the toolbar row	2021-01-28 22:47:08 +01:00
aignatov-bio	908678fcff	Update marvinJS modal css [SCI-5255]	2021-01-20 12:37:41 +01:00
Alex Kriuchykhin	f15d984d47	Fix navigation between archived and active projects [SCI-5419] (#3100) ... * Fix navigation between archived and active projects [SCI-5419]	2021-01-19 11:28:59 +01:00
aignatov-bio	adb9084787	Fix comments red dot and ordering of comments [SCI-5384] (#3084) ... * Fix comments red dot and ordering of comments [SCI-5384]	2021-01-14 16:28:11 +01:00
Oleksii Kriuchykhin	cf3b0916f6	Fix flash messages on sign-in [SCI-5386]	2021-01-12 15:28:30 +01:00
Oleksii Kriuchykhin	78ec862a2c	Fix folder creation for archived view [SCI-5383]	2021-01-12 13:06:43 +01:00
aignatov-bio	276d6abe19	Update archive navigation for tasks page [SCI-5347] (#3052) ... * Update archive navigation for tasks page [SCI-5347]	2021-01-07 17:18:52 +01:00
aignatov-bio	5aae35d700	Update archived experiments navigation (#3053)	2021-01-07 14:58:56 +01:00
aignatov-bio	1f6fff812a	Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) ... * Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]	2021-01-07 13:16:05 +01:00
Oleksii Kriuchykhin	53be6a95c4	Fix projects filter mark, titles and comments mark [SCI-5332]	2021-01-06 11:28:39 +01:00
Alex Kriuchykhin	a8991356b5	Merge pull request #3033 from okriuchykhin/ok_SCI_5341 ... Fix restore action for experiments and tasks [SCI-5341]	2021-01-05 10:09:39 +01:00
Oleksii Kriuchykhin	58cce0f153	Improve task restoring and refactor flash messages [SCI-5341]	2021-01-04 17:00:23 +01:00
Alex Kriuchykhin	4638e74e1e	Merge pull request #3041 from okriuchykhin/ok_SCI_5327 ... Fix links in sidebar navigation [SCI-5327]	2021-01-04 10:53:38 +01:00
Oleksii Kriuchykhin	8f0a3fb61c	Fix links in sidebar navigation [SCI-5327]	2020-12-30 22:49:02 +01:00
aignatov-bio	b3faa170fb	PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) ... * Add PDF Preview [SCI-5299]	2020-12-22 15:25:30 +01:00
Mojca Lorber	21c0ea4f8d	[SCI-5293] Remove Archived results tab on archived Task	2020-12-21 11:56:33 +01:00
Oleksii Kriuchykhin	67b3f853d7	Merge branch 'develop' into features/folders	2020-12-18 14:51:21 +01:00
Miha Mencin	f284ef1592	Merge pull request #3009 from okriuchykhin/ok_SCI_5276 ... Archiving: update archived TASK screen layout [SCI-5276]	2020-12-17 13:46:35 +01:00
Oleksii Kriuchykhin	7bb334e737	Archiving: update archived TASK screen layout [SCI-5276]	2020-12-17 13:26:44 +01:00
aignatov-bio	2ca7b81cea	Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011) ... * Change experiment archived card [SCI-5270]	2020-12-17 13:07:30 +01:00
Miha Mencin	ba3db65437	Merge pull request #3008 from okriuchykhin/ok_SCI_5273 ... Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]	2020-12-17 09:44:40 +01:00
Miha Mencin	ea9f3dcada	Merge pull request #2996 from okriuchykhin/ok_SCI_5253 ... Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]	2020-12-17 09:17:44 +01:00
Oleksii Kriuchykhin	94b6c96e48	Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]	2020-12-12 22:46:30 +01:00
Mojca Lorber	5cdab422df	Update layout of the navigation for experiments, tasks list and task page	2020-12-10 15:15:36 +01:00
aignatov-bio	6a44e23697	Add projects sidebar [SCI-5178] (#2995) ... * Add projects sidebar navigation [SCI-5178]	2020-12-08 16:07:26 +01:00
Oleksii Kriuchykhin	62374bee0a	Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]	2020-12-07 11:04:33 +01:00
Urban Rotnik	478d43f9ce	Merge pull request #2987 from urbanrotnik/ur-sci-5208 ... Projects cards and list view with filters [SCI-5208]	2020-12-03 12:30:37 +01:00
Urban Rotnik	3700faa04a	Update proejcts grid, include breadcrumbs, fix JS ... [SCI-5208]	2020-12-03 12:29:28 +01:00
Oleksii Kriuchykhin	9546b8f71d	Prepare backend for the improved navigation [SCI-5177]	2020-12-03 10:19:11 +01:00
aignatov-bio	c6f4d23a78	Fix protocol preview file background	2020-11-26 15:35:06 +01:00
aignatov-bio	1979883004	Add delete asset confirmation modal	2020-11-25 12:50:34 +01:00
Mojca Lorber	2a8c98b7ec	Implement ESC button to exit full-screen modals	2020-11-24 23:20:53 +01:00
aignatov-bio	77b7b1b231	Add errors handling and i18n	2020-11-21 12:31:49 +01:00
aignatov-bio	60ce51149d	Add CRUD to comments	2020-11-20 20:25:28 +01:00
aignatov-bio	da4b8aaf2f	Add comments list	2020-11-20 12:29:40 +01:00
aignatov-bio	2294d396f9	Add comments sidebar layout	2020-11-18 16:26:01 +01:00
aignatov-bio	12fdea8d89	Add context menu to attahcments	2020-11-04 13:08:40 +01:00
Mojca Lorber	8aed48d1ae	Merge branch 'develop' into features/office-file-previews	2020-11-02 13:45:06 +01:00
aignatov-bio	b0fe68553a	Fix tests	2020-10-29 14:30:26 +01:00
aignatov-bio	d99e279ecc	Add gallery to file preview	2020-10-29 14:30:26 +01:00
aignatov-bio	c56f7912ef	Update file preview	2020-10-29 14:23:32 +01:00
Miha Mencin	235f87e0d9	Merge pull request #2924 from biosistemika/release/1.20.2 ... Release/1.20.2	2020-10-28 13:58:25 +01:00
Mojca Lorber	ec41bdd414	Move open mobile app button to main navigation	2020-10-26 09:28:44 +01:00
aignatov-bio	aefaf4d0c1	Update image edit modal	2020-10-25 16:57:50 +01:00
Urban Rotnik	aa1520bfb8	Merge branch 'develop' into jg_sci_2228	2020-10-22 14:21:39 +02:00
aignatov-bio	016fc8a632	Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews	2020-10-15 15:25:54 +02:00
aignatov-bio	0a4b89cf39	Merge branch 'develop' into features/office-file-previews	2020-10-15 15:19:56 +02:00
aignatov-bio	1ed65eddfa	Move ordering to front-end	2020-09-25 15:06:09 +02:00
Oleksii Kriuchykhin	134e549ed5	Improve performance of fetching of statuses [SCI-5062]	2020-09-25 10:14:57 +02:00
aignatov-bio	780db9d134	Add assets view switcher	2020-09-24 17:10:36 +02:00
aignatov-bio	e4b94b582a	Add dynamic render of wopi files in viewport	2020-09-23 12:32:46 +02:00
mlorb	547af538b3	Merge pull request #2856 from mlorb/ml-sci-5009 ... Update empty states for smart annotation results and dismiss button [SCI-5009]	2020-09-22 15:31:22 +02:00
aignatov-bio	f8a28f378e	Add shared inventories to smart annotation	2020-09-21 14:36:34 +02:00
Mojca Lorber	d9a78d20d7	Update empty states for smart annotation results and dismiss button	2020-09-18 08:50:01 +02:00
aignatov-bio	e5d3fac112	Merge branch 'features/smart-annotation-improvements' into develop	2020-09-17 14:52:51 +02:00