622 commits

Author	SHA1	Message	Date
aignatov-bio	c6f4d23a78	Fix protocol preview file background	2020-11-26 15:35:06 +01:00
aignatov-bio	60359b595c	Add button disabling	2020-11-26 14:37:12 +01:00
aignatov-bio	b0ebdceb08	Fix typo	2020-11-26 14:04:26 +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	2449f2b500	Fix smart annotation for comments	2020-11-21 12:34:36 +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	483ff8f1f2	Merge pull request #2964 from biosistemika/features/office-file-previews ... Features/office file previews merge branch	2020-11-19 11:11:39 +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
Oleksii Kriuchykhin	8eec4e4b59	Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]	2020-11-02 22:19:33 +01:00
Mojca Lorber	8aed48d1ae	Merge branch 'develop' into features/office-file-previews	2020-11-02 13:45:06 +01:00
aignatov-bio	12991e8fd3	Commit add asset preview mode switcher to step	2020-10-29 16:42:05 +01:00
aignatov-bio	f51416d83a	Update permission markup	2020-10-29 14:59:14 +01:00
aignatov-bio	131d487e69	Add file preview to list view	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
Urban Rotnik	bb5c703696	Merge pull request #2878 from urbanrotnik/ur-sci-5040 ... Support multiple file upload in TinyMCE fields [SCI-5040]	2020-10-29 14:14:38 +01:00
Urban Rotnik	54f38c8ded	Move validation before request	2020-10-29 08:45:55 +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
Urban Rotnik	fc8704b520	Add fileUtils for sizeCheck, add url to textarea data attribute	2020-09-30 13:20:11 +02:00
Urban Rotnik	dc0072e707	Support multiple file upload in TinyMCE fields	2020-09-29 08:21:31 +02:00
aignatov-bio	780db9d134	Add assets view switcher	2020-09-24 17:10:36 +02:00
aignatov-bio	4f7814cff4	Fix markup	2020-09-24 13:32:43 +02:00
aignatov-bio	ff33cb45e0	Improve smart annotation in TinyMCE fields	2020-09-24 13:29:20 +02:00
aignatov-bio	b6f038ff09	Merge pull request #2863 from aignatov-bio/ai-sci-5037-update-regexp-for-smart-annotation ... Update regexp for smart annotation [SCI-5037]	2020-09-23 16:39:24 +02:00
aignatov-bio	e4b94b582a	Add dynamic render of wopi files in viewport	2020-09-23 12:32:46 +02:00
aignatov-bio	d719c26b6c	Add error handling for MarvinJS	2020-09-23 12:26:26 +02:00
aignatov-bio	21dcf1157c	Update regexp for smart annotation	2020-09-23 11:13:59 +02:00
aignatov-bio	7fa98de1da	Merge pull request #2859 from aignatov-bio/ai-sci-5036-fix-smart-annotation-cursor-position ... Fix smart annotation cursor position [SCI-5036]	2020-09-23 10:11:13 +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
Mojca Lorber	8b3fce9656	Move it again	2020-09-22 11:38:32 +02:00
Mojca Lorber	0ad93d1288	Move close modal function to global event	2020-09-22 11:30:05 +02:00
aignatov-bio	fd7773a3dc	Fix smart annotation cursor position	2020-09-22 10:15:01 +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	644f30fb10	Fix syntax for uglifier	2020-09-17 15:35:12 +02:00
aignatov-bio	e5d3fac112	Merge branch 'features/smart-annotation-improvements' into develop	2020-09-17 14:52:51 +02:00
aignatov-bio	8dbc69aa31	Remove console.log	2020-09-17 14:48:26 +02:00
aignatov-bio	f11f54db33	Small fixes	2020-09-17 13:11:54 +02:00
aignatov-bio	b4102f3cfd	Add try/cath for JSON.parse	2020-09-17 11:43:08 +02:00
aignatov-bio	9cb26a1cb9	Fix markup	2020-09-17 11:43:08 +02:00
aignatov-bio	3691d21215	Fix multiple smart annotation selected	2020-09-17 11:43:08 +02:00
aignatov-bio	86667feb6b	Add remembered state for smart annotation	2020-09-17 11:43:07 +02:00
Mojca Lorber	9cd8e3b7ac	Change default status values, add project and experiment to saved state and fix parsing error handeling	2020-09-16 09:48:06 +02:00
aignatov-bio	67d3a1ad12	Fix markup	2020-09-15 12:06:20 +02:00
aignatov-bio	6dc4422d82	Fix markup	2020-09-15 11:56:44 +02:00
Mojca Lorber	13f719a9e1	Add saving state for filters on dashboard	2020-09-14 18:15:57 +02:00
aignatov-bio	008563a7f4	Update user smart annotation	2020-09-11 13:00:13 +02:00
aignatov-bio	7a86bb47c5	Add styling and highligh	2020-09-09 14:17:19 +02:00
Urban Rotnik	0ae39678d4	Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state ... Add error message for locked task, update some permission checks[SCI-4982]	2020-09-09 14:04:08 +02:00
aignatov-bio	661220890f	Update error handling	2020-09-09 12:25:34 +02:00
aignatov-bio	f4a13a73cb	Refactor smart annotation front-end	2020-09-09 12:25:34 +02:00
Urban Rotnik	d9b691103c	Add permission error message	2020-09-08 15:42:30 +02:00
Mojca Lorber	9dac4079f8	Replace old arrow with new one and remove redundant javascript for arrow collapsing	2020-09-04 14:43:30 +02:00
Urban Rotnik	a259800590	Merge branch 'develop' into jg_sci_2228	2020-08-31 16:29:23 +02:00
aignatov-bio	c07ebe90fa	Add migration for task states	2020-08-27 11:34:59 +02:00
aignatov-bio	21e4dcd96a	Add wopi preview for office files	2020-08-25 13:22:36 +02:00
aignatov-bio	5360db76be	Fix dropdrown selector	2020-08-12 14:00:10 +02:00
Urban Rotnik	073979534c	Merge branch 'features/task-flows' into develop_to_task_flows	2020-08-04 16:43:05 +02:00
Urban Rotnik	e221d960e7	Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard" ... This reverts commit 8b6d57058c, reversing changes made to 957ac92669.	2020-08-04 15:07:22 +02:00
Urban Rotnik	7c14da70d9	Merge branch 'features/task-flows' into develop_to_task_flows	2020-08-04 14:50:46 +02:00
Urban Rotnik	cce76f6f0f	Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults ... Add ordering for result page [SCI-4895]	2020-08-04 11:17:43 +02:00
Urban Rotnik	ac3c06d882	Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items ... Add export for assigned items [SCI-4748]	2020-08-03 11:30:31 +02:00
aignatov-bio	536367362c	Add statuses to dashboard filters	2020-07-31 10:59:10 +02:00
aignatov-bio	15b5f9bb68	Add ordering for result page	2020-07-28 15:39:29 +02:00
aignatov-bio	1d3055011f	Merge branch 'features/tinymce-tables' into develop	2020-07-22 13:41:43 +02:00
aignatov-bio	e69e3ea8d3	Add export for assigned items	2020-07-17 15:17:09 +02:00
Mojca Lorber	9464d2753d	Fix naming of filter field for repositories tables	2020-07-15 10:52:47 +02:00
aignatov-bio	6245e19069	Merge pull request #2718 from biosistemika/master ... Merge master to develop	2020-07-09 12:56:31 +02:00
aignatov-bio	630bef1adf	Add special characters to smart annotation	2020-06-29 14:47:35 +02:00
Miha Mencin	6db1401759	Merge pull request #2670 from aignatov-bio/ai-sci-4745-fix-manage-column-dropdown-position ... Fix dropdown position for full-screen modals [SCI-4745]	2020-06-29 09:43:13 +02:00
aignatov-bio	6a41290d9d	Add tables to TinyMce and small table improvments	2020-06-24 15:51:59 +02:00
aignatov-bio	4f8a612106	add new line	2020-06-24 15:25:34 +02:00
aignatov-bio	a3ea0927c9	Revert helper JS to es5	2020-06-24 15:12:13 +02:00
aignatov-bio	80970b6448	Remove hashes from datatable helper	2020-06-24 14:39:33 +02:00
Oleksii Kriuchykhin	7ea577d8d4	Merge branch 'features/inventory-archiving' into develop	2020-06-24 14:04:54 +02:00
Urban Rotnik	193375818e	Disable checkboxes for shared inventories	2020-06-24 13:41:00 +02:00
aignatov-bio	6f2d5b359e	Add action buttons to repository index	2020-06-19 15:54:45 +02:00
aignatov-bio	7f9af06f78	Fix dropdown position for full screen modals	2020-06-18 13:29:28 +02:00
aignatov-bio	2b9062ac92	Add checkbox selector to datatable	2020-06-09 13:16:50 +02:00
aignatov-bio	15de84ff2f	Not include marvinJS library, if marvinJS disabled	2020-06-08 09:59:26 +02:00
Urban Rotnik	9d96baf008	Escape special chars for FE and BE	2020-06-02 15:16:01 +02:00
Urban Rotnik	4fc37e12a0	Fix dropdown render for columns manage modal	2020-06-01 18:41:58 +02:00
aignatov-bio	f7a215c953	Fix escape issue in dropdowns	2020-05-28 10:55:36 +02:00
aignatov-bio	9973151278	Merge pull request #2598 from aignatov-bio/ai-sci-4662-fix-new-comment-field ... Fix new comment field [SCI-4662]	2020-05-25 09:09:33 +02:00
aignatov-bio	8161bbb31c	Fix new comment field	2020-05-22 16:51:11 +02:00
aignatov-bio	3287070df7	Improve search through assigned tasks	2020-05-22 14:36:28 +02:00
Oleksii Kriuchykhin	bc1ee1bd8d	Fix error message for file upload limit on steps [SCI-4645]	2020-05-18 16:16:39 +02:00
aignatov-bio	820514789d	Update tinymce gem version	2020-05-17 17:36:26 +02:00
Urban Rotnik	a2ade6e0ec	Merge branch 'develop' into features/new-task-layout	2020-05-15 14:27:56 +02:00
aignatov-bio	af4ac7c53b	Add const to dropdown library	2020-05-14 16:29:50 +02:00
aignatov-bio	309f8c1a3d	Small snapshots CSS corrections	2020-05-14 16:29:50 +02:00
aignatov-bio	cbaaa7413c	Fix smart annotation position for horizontal scroll	2020-05-13 12:45:22 +02:00
aignatov-bio	d2a479c2e8	Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory ... Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]	2020-05-08 12:39:28 +02:00
aignatov-bio	dad5ac7a27	Fix snapshot button place	2020-05-07 19:36:30 +02:00
Urban Rotnik	276351bbed	Remove Tooltips JS code	2020-04-28 12:51:59 +02:00