877 commits

Author	SHA1	Message	Date
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
aignatov-bio	b9c5089c2b	Add search to assigned tasks dropdown	2020-04-28 12:41:59 +02:00
aignatov-bio	087f71a82f	Add full view for my-module repository	2020-04-07 21:02:16 +02:00
aignatov-bio	37304df878	Fix markup	2020-03-19 15:48:45 +01:00
aignatov-bio	b188b0511b	Refactor TinyMCE autosave check	2020-03-19 15:45:14 +01:00
aignatov-bio	1d02ba5ebf	Open unsaved TinyMce editor	2020-03-18 16:03:36 +01:00
Alex Kriuchykhin	2a2e479cd3	Merge pull request #2470 from okriuchykhin/ok_SCI_4408 ... Enable time fraction for task due date [SCI-4408]	2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin	a518bfe023	Enable time fraction for task due date [SCI-4408]	2020-03-16 17:55:35 +01:00
aignatov-bio	b9a0fb47de	Add total size validation check to result files	2020-03-12 11:50:31 +01:00
aignatov-bio	d924faaafd	Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout ... Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]	2020-03-12 11:26:23 +01:00
Miha Mencin	26b687f2e6	Merge pull request #2460 from biosistemika/features/dashboard ... Features/dashboard	2020-03-10 18:06:23 +01:00
Miha Mencin	9836a8b5a2	Merge pull request #2434 from aignatov-bio/ai-sci-4352-inventory-item-is-not-saved-in-case-of-empty-dropdown ... Prevent create empty dropdown in inventories [SCI-4352]	2020-03-10 12:35:00 +01:00
Alex Kriuchykhin	769ba76afa	Merge pull request #2445 from okriuchykhin/ok_SCI_4379 ... Improve file upload checks [SCI-4382]	2020-03-10 09:47:23 +01:00
Miha Mencin	62b934f012	Merge branch 'develop' into features/dashboard	2020-03-09 09:56:32 +01:00
aignatov-bio	e729aa043e	Add recent work widget	2020-03-06 13:51:18 +01:00
aignatov-bio	7d7cdce91a	Add file size limitation to tinyMCE	2020-03-03 15:55:17 +01:00
Oleksii Kriuchykhin	11a5536af5	Improve file upload checks [SCI-4382]	2020-03-03 15:26:40 +01:00
Mojca Lorber	52493fd834	Add pagination for current tasks on dashboard	2020-03-03 12:07:21 +01:00
Oleksii Kriuchykhin	03f08c4c06	Merge branch 'hotfix/1.18.4' into develop	2020-03-02 11:56:45 +01:00
Oleksii Kriuchykhin	73623da02c	Merge branch 'develop' into features/dashboard	2020-02-28 16:46:56 +01:00
Alex Kriuchykhin	b83cbf33a7	Merge pull request #2408 from aignatov-bio/ai-sci-4345-file-results-bug ... Fix files handling in results [SCI-4345]	2020-02-28 16:40:05 +01:00
aignatov-bio	c4be9bca2f	Fix files handling in results	2020-02-28 14:55:13 +01:00
Oleksii Kriuchykhin	b4a8a7ba72	Switch to serial multiple file uploads for better compatibility [SCI-4404]	2020-02-27 16:58:00 +01:00
aignatov-bio	b2580c1704	Prevent create empty dropdown in inventories	2020-02-27 13:10:00 +01:00
aignatov-bio	f11b051715	Merge branch 'develop' into features/dashboard	2020-02-19 10:29:50 +01:00
aignatov-bio	47a86f2cf9	Hide tooltip if parent object disabled or hidden	2020-02-18 15:40:05 +01:00
aignatov-bio	ff45b17b53	Fix localization and small markup fixes	2020-02-17 15:32:43 +01:00
aignatov-bio	a438f6b4f0	Finished filters	2020-02-17 10:47:10 +01:00
mlorb	618aa698d5	Merge pull request #2407 from mlorb/ml-sci-4329 ... Fix adding too small/big number to input... [SCI-4329]	2020-02-14 10:40:20 +01:00
aignatov-bio	5200096f69	Merge pull request #2400 from aignatov-bio/ai-sci-4312-improve-search-for-dropdown ... Improve search input field in the flyouts [SCI-4312]	2020-02-12 14:16:06 +01:00
Mojca Lorber	0f67ce78c0	Fix adding too small/big number to input for decimals for number repo column type	2020-02-12 12:14:58 +01:00
Oleksii Kriuchykhin	5be4ffb139	Fix multiple file result creation [SCI-4346]	2020-02-11 20:08:36 +01:00
aignatov-bio	26783e64da	Fix protocols table CSS	2020-02-11 15:58:17 +01:00
aignatov-bio	eaf751bad6	Improve search input field in the flyouts	2020-02-11 15:01:52 +01:00
mlorb	c1aa269afc	Merge pull request #2392 from mlorb/ml-sci-4313 ... Add empty option in dropdown selector [SCI-4313]	2020-02-10 10:32:03 +01:00
Oleksii Kriuchykhin	5470bb9b9b	Fix file result only name update [SCI-4321]	2020-02-07 15:21:50 +01:00
Mojca Lorber	e9e7b85e0b	Add empty option in dropdown selector	2020-02-07 14:57:07 +01:00
Alex Kriuchykhin	913f599b9f	Merge pull request #2389 from okriuchykhin/ok_SCI_4301 ... Add unsaved data notification when navigating away from the inventory [SCI-4301]	2020-02-07 13:58:20 +01:00
Oleksii Kriuchykhin	21bf59b943	Add unsaved data notification when navigating away from the inventory [SCI-4301]	2020-02-06 16:46:16 +01:00
Mojca Lorber	e70bc67146	Implement missing style guide changes	2020-01-31 14:11:37 +01:00
aignatov-bio	9a9088a0da	Merge pull request #2354 from aignatov-bio/ai-sci-4279-fix-duplicate-tags-on-task ... Fix duplicate tags and small css issues [SCI-4279]	2020-01-30 13:42:22 +01:00
mlorb	a2afa11fef	Merge pull request #2378 from mlorb/ml-sci-4311 ... Fix scroll position on protocol and result page [SCI-4311]	2020-01-30 13:39:16 +01:00
Mojca Lorber	9388883479	Fix scroll position on protocol and result page	2020-01-29 14:28:52 +01:00
aignatov-bio	470f39ce04	Fix scrollbar	2020-01-29 11:14:25 +01:00
aignatov-bio	24b296fd86	Fix duplicate tags and small css issues	2020-01-23 13:38:02 +01:00
aignatov-bio	cd471bfb25	Update delimiter dropdown for manage column modal	2020-01-20 14:26:17 +01:00
aignatov-bio	597c88cacc	Fix smart annotation position	2020-01-17 13:55:43 +01:00
aignatov-bio	d32201ad58	Fix smart annotation position	2020-01-16 16:28:51 +01:00
Urban Rotnik	218316bea2	Update error handling for name and text	2020-01-16 13:30:05 +01:00
aignatov-bio	1ff0351a74	Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories	2020-01-16 11:36:00 +01:00
aignatov-bio	96e1d4a7d0	Add new error handling	2020-01-16 10:51:37 +01:00
aignatov-bio	a10e7de9a6	Fix smart annotation window position	2020-01-15 17:19:56 +01:00
aignatov-bio	b37d8f1275	Update layout for repository	2020-01-13 14:46:43 +01:00
Alex Kriuchykhin	d2e12e0683	Merge pull request #2265 from okriuchykhin/ok_SCI_4146 ... Restrict files to only images in RTE fields [SCI-4146]	2020-01-10 10:34:00 +01:00
aignatov-bio	9fdea4657c	Update validation for repository text field	2020-01-09 13:32:03 +01:00
aignatov-bio	54c78cf4d1	Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles ... Update colors and buttons	2020-01-08 12:30:51 +01:00
Oleksii Kriuchykhin	d9b9243da7	Merge branch 'develop' into features/new-column-types	2020-01-07 16:03:33 +01:00
aignatov-bio	f717ce66cb	Fix tests	2020-01-06 12:31:56 +01:00
aignatov-bio	464d03558a	Fix markup, replace buttons and add new logo	2020-01-06 10:40:20 +01:00
aignatov-bio	ef3814ccec	Add new buttons to protocols, tasks, experiments, projects	2020-01-06 10:40:20 +01:00
Urban Rotnik	fa6b1fa0db	JS fixes	2019-12-20 15:19:30 +01:00
Oleksii Kriuchykhin	403a3e0140	Restrict files to only images in RTE fields [SCI-4146]	2019-12-16 16:05:40 +01:00
aignatov-bio	7664f4be78	Add checklist and list edit mode	2019-12-11 14:49:14 +01:00
aignatov-bio	7fc9c0d1e4	Adding frontend for checklist edit mode	2019-12-10 15:58:59 +01:00
aignatov-bio	2a38928b7a	Merge pull request #2251 from aignatov-bio/ai-sci-4068-custom-select-on-manage-columns-forms ... Update drop-down for columns type selection [SCI-4068]	2019-12-09 14:09:21 +01:00
aignatov-bio	d8676596f1	Add checklists column type	2019-12-09 13:48:36 +01:00
aignatov-bio	c4a87bed52	Fix autosave for marvinJS in tinyMCE	2019-12-09 11:23:01 +01:00
aignatov-bio	eb708e4226	Update dropdown for column type selection	2019-12-06 16:14:16 +01:00
aignatov-bio	d643a08a9c	Merge pull request #2243 from aignatov-bio/ai-sci-4137-fix-activity-page-it-task ... Fix task activity page [SCI-4137]	2019-12-03 09:09:36 +01:00
aignatov-bio	010a44650c	Fix task activity page	2019-12-02 16:04:50 +01:00
aignatov-bio	2d4104b0f2	Fix smart annotation for autosave	2019-12-02 15:53:42 +01:00
aignatov-bio	84e47f5b4c	Fix autosave in steps and result	2019-11-29 16:10:14 +01:00
Urban Rotnik	9bf948c3a8	Add statuses validation on FE	2019-11-29 10:19:11 +01:00
Urban Rotnik	b2b6296cb5	Improve update items action, JS and views	2019-11-29 10:19:10 +01:00
Mojca Lorber	305104f639	Refactor text inventory type	2019-11-29 10:17:53 +01:00
aignatov-bio	bcd9c6aee3	Merge pull request #2238 from aignatov-bio/ai-sci-4101-improve-time-zone-date-format-interaction ... Improve time zone and date format interaction at preference page [SCI-4101]	2019-11-28 14:54:30 +01:00
aignatov-bio	06a11a4a49	Improve time zone and date format interaction at preference page	2019-11-27 15:14:40 +01:00
aignatov-bio	a87fc24251	UI activtiies fixes	2019-11-27 14:04:59 +01:00
aignatov-bio	ad137b47df	Merge pull request #2230 from aignatov-bio/ai-sci-4097-fix-dropdown-event-after-back-action ... Fix dropdown event after click browser back action [SCI-4097]	2019-11-25 13:58:04 +01:00
aignatov-bio	179dea085f	Fix dropdown event after click browser back action	2019-11-25 11:28:11 +01:00
aignatov-bio	84a9d764e0	Add arrows controll for dropdown	2019-11-23 21:09:34 +01:00
aignatov-bio	96523ae131	Update CSS for team preferences and enable autosave	2019-11-22 10:46:44 +01:00
aignatov-bio	0b04ca4012	Fix markup	2019-11-21 12:19:47 +01:00
aignatov-bio	56ae32323c	Add autosave for protocol keywords and user preferences	2019-11-20 14:57:53 +01:00
aignatov-bio	32d99f676c	Fix markup	2019-11-18 13:59:55 +01:00
aignatov-bio	264493a322	Finish removing Select2 library	2019-11-18 13:59:55 +01:00
aignatov-bio	e7ad7ae969	New tags drop down	2019-11-18 13:59:55 +01:00
Anton Ignatov	0ed3d84407	Fix styling	2019-11-18 13:59:54 +01:00
Anton Ignatov	b1c32d9a30	Improve dropdown and side panel	2019-11-18 13:59:54 +01:00
Anton Ignatov	7117b767f4	Fix commnets to PR	2019-11-18 13:59:54 +01:00
Anton Ignatov	17e457c686	Finished global activities refactoring	2019-11-18 13:59:54 +01:00
Anton Ignatov	fc70ce24f8	Refactor side filters for global activities	2019-11-18 13:59:54 +01:00
Anton Ignatov	4e517ca6c4	Fix eslint for main file	2019-11-18 13:59:54 +01:00
Anton Ignatov	7b855f54ac	Finish main part of selectors	2019-11-18 13:59:54 +01:00
Anton Ignatov	f832cfbbd4	Added tags	2019-11-18 13:59:54 +01:00
Anton Ignatov	04bd5269ec	Created new dropdown selector	2019-11-18 13:59:54 +01:00
aignatov-bio	a9690482d1	Add autosave feature to text fields	2019-11-12 11:26:18 +01:00
Alex Kriuchykhin	95686a9275	Merge pull request #2197 from okriuchykhin/ok_SCI_4053 ... Fix TinyMCE image URLs in the editor [SCI-4053]	2019-11-05 13:46:48 +01:00
Oleksii Kriuchykhin	67fdda1eeb	Fix TinyMCE image URLs in the editor [SCI-4053]	2019-11-05 13:38:47 +01:00
aignatov-bio	ae0db3a7bc	Update avatars and small CSS fixes	2019-11-05 10:43:02 +01:00
aignatov-bio	198697ff23	Fix avatar localization	2019-10-11 12:22:09 +02:00
aignatov-bio	54627faeb3	Fix tests	2019-10-11 11:46:51 +02:00
aignatov-bio	521a367960	Add predefined avatars	2019-10-11 11:46:51 +02:00
aignatov-bio	1f43f35073	First modal	2019-10-11 11:46:51 +02:00
aignatov-bio	a930f7affd	Fix async assets results	2019-10-08 19:51:03 +02:00
Urban Rotnik	bd1c5e4454	Fix focus for RTE	2019-10-04 14:55:14 +02:00
aignatov-bio	a39a95d2a7	Merge pull request #2122 from aignatov-bio/ai-sci-disable-autosave-feature ... Disable autosave notification feature	2019-10-04 09:17:16 +02:00
aignatov-bio	af69e12d1e	Disable autosave notification feature	2019-10-04 09:13:42 +02:00
aignatov-bio	0cbc699c62	Remove image icon from preview	2019-10-03 15:44:03 +02:00
aignatov-bio	e35617208d	Merge pull request #2118 from aignatov-bio/ai-sci-3841-enable-additional-tools ... Enable additional tools [SCI-3841]	2019-10-03 11:24:31 +02:00
aignatov-bio	65b1e0c041	Fix reload page	2019-10-03 11:19:12 +02:00
aignatov-bio	9000438025	Enable additional tools	2019-10-03 11:07:19 +02:00
aignatov-bio	301b37cccd	Fix duplicate code in file preview	2019-10-03 10:55:54 +02:00
Oleksii Kriuchykhin	dd7f2fe095	Fix large preview for documents [SCI-3938]	2019-10-01 16:14:28 +02:00
Oleksii Kriuchykhin	6a6a43f5ff	Improve file processing indicator [SCI-3938]	2019-10-01 15:20:46 +02:00
aignatov-bio	b8e917455a	Merge pull request #2104 from aignatov-bio/ai-sci-3907-update-marvin-js-asset-in-result-on-cancel ... Update MarvinJS asset on result text cancel [SCI-3907]	2019-10-01 13:39:01 +02:00
Anton Ignatov	33497d11a3	Merge branch 'activestorage_migration'	2019-10-01 10:36:05 +02:00
Anton Ignatov	859c5931a4	Update MArvinJS asset on result text cancel	2019-09-30 16:09:43 +02:00
Jure Grabnar	070c307721	Implement style changes suggested by Anton	2019-09-30 14:27:00 +02:00
Jure Grabnar	8441c5b6ed	Add anchor to result text editing	2019-09-30 11:34:39 +02:00
Jure Grabnar	477e41a96d	Refactor I18n strings for tiny_mce	2019-09-30 11:34:39 +02:00
Jure Grabnar	b3cafcec7c	Add restore draft notification to all models ... Close SCI-3751	2019-09-30 11:34:39 +02:00
Jure Grabnar	b286e4adfd	Fix styles for notification bar	2019-09-30 11:34:39 +02:00
Jure Grabnar	4f2182e2f5	Remove restoredraft icon	2019-09-30 11:34:39 +02:00
Jure Grabnar	6e33baa995	Add skeleton restore-draft notification for module description	2019-09-30 11:32:38 +02:00
Alex Kriuchykhin	53caaf647b	Merge pull request #2080 from okriuchykhin/ok_SCI_3891 ... Move file preview generation to delayed job [SCI-3891]	2019-09-27 10:50:21 +02:00
Anton Ignatov	d048b7fb56	Fix cancel button for marvinJS images	2019-09-26 11:25:34 +02:00
Jure Grabnar	ae83ef749f	Add tables functionality in tinymce ... Close SCI-3821	2019-09-24 12:44:00 +02:00
Anton Ignatov	6d81727bf1	Fix dirty event after update marvinjs image	2019-09-24 10:37:51 +02:00
Oleksii Kriuchykhin	aabeeec95a	Move file preview generation to delayed job [SCI-3891]	2019-09-23 21:07:03 +02:00
aignatov-bio	11f6517d0a	Fix duplicate marvinjs save (#2057)	2019-09-18 11:18:44 +02:00
aignatov-bio	737f9e572c	Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) ... * Replace marvinJS logo and fix some merge issues * Fix tests	2019-08-13 11:04:19 +02:00
aignatov-bio	6e5f078dea	Add activities for marvinJS [SCI-3630] (#1950) ... * Add marvinJs activities to step and results * Add activities for TinyMCE marvinJS assets * Fix markup	2019-08-09 09:47:07 +02:00
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin	d942788581	Implement read permissions checks for ActiveStorage controllers [SCI-3680]	2019-08-07 15:21:41 +02:00
aignatov-bio	aa5061a1af	Add custom context menu to TinyMCE images [SCI-3582] (#1944) ... * Add custom context menu to TinyMCE images * Fix permission check for unsaved objects * Fix markup	2019-08-07 10:28:42 +02:00
Oleksii Kriuchykhin	f3849e2ece	Fix TinyMCE plugings config [SCI-3679]	2019-08-06 15:46:55 +02:00
Oleksii Kriuchykhin	eaf9d59819	Merge branch 'activestorage_migration' into ok_SCI_3679	2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin	423528933e	Switch to global JS constants [SCI-3679]	2019-08-06 15:06:19 +02:00
Luka Murn	83bb89fdf5	Cherry-picked commit from ZZ (and LM)'s various changes	2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin	5e65b07bdc	Implement DirectUpload for Steps, Results and Inventories [SCI-3679]	2019-07-25 18:00:24 +02:00
Jure Grabnar	06657dbdf6	Add spinner when editing image annotation (#1948) ... Add spinner when editing image annotation	2019-07-25 11:28:13 +02:00
Urban Rotnik	1b9db2f61e	Fix for file annotating on Safari	2019-07-24 14:16:29 +02:00
Jure Grabnar	cdad167be2	Add spinner when editing image annotation ... Close SCI-3710	2019-07-23 15:02:33 +02:00
Anton Ignatov	ad7130d3b2	Simplify TinyMCE assets for MarvinJS	2019-07-19 09:27:03 +02:00
Anton Ignatov	d79fec3345	Move TinyMCE logic to correspond controller	2019-07-16 15:51:44 +02:00
Anton Ignatov	1e8663548e	Add MarvinJS assets to TinyMCE	2019-07-16 13:40:54 +02:00
Anton Ignatov	3339c1fbbf	Add MarvinJS to Result and TinyMce MarvinJS refactor	2019-07-15 17:17:14 +02:00
aignatov-bio	894e201e1b	Fix big file issue in step attachments [SCI-3682] (#1919) ... * Fix big file issue in step atachments * Fix markup	2019-07-15 11:00:01 +02:00
Anton Ignatov	ba1d6d45ca	Fix merging issues	2019-07-12 15:47:15 +02:00
Anton Ignatov	ffd415d409	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00
Anton Ignatov	7831b0a089	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 15:00:07 +02:00
Anton Ignatov	57a273d5d0	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 11:34:41 +02:00
aignatov-bio	d8d04b89cd	Fix autosave issue in mozzila (#1925)	2019-07-12 11:15:45 +02:00
aignatov-bio	70589126c3	Fix autosave for steps (#1926)	2019-07-12 10:16:49 +02:00
Oleksii Kriuchykhin	64b7a5646a	Implement custom document file previewer [SCI-3677]	2019-07-10 14:37:23 +02:00
aignatov-bio	7ac410e573	Fix visual bugs across ProtocolIo [SCI-3671] (#1914) ... * Fix visual bugs across ProtocolIo	2019-07-10 13:00:32 +02:00
Jure Grabnar	0ee0b1c834	Fix file preview not showing in modal when processing is done ... Close SCI-3587	2019-07-08 12:45:22 +02:00
Oleksii Kriuchykhin	4ea6b56582	Fix Step and Result file previews [SCI-3539]	2019-07-01 23:30:20 +02:00
aignatov-bio	a08d93376c	Add promo modal when MarvinJS disabled (#1872)	2019-07-01 11:51:13 +02:00
Anton Ignatov	6be227b2d3	Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration	2019-06-28 10:47:38 +02:00
aignatov-bio	83bc9eb22f	Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation ... Adding new activities for image editing [SCI-3369]	2019-06-24 10:31:39 +02:00
aignatov-bio	81c76fb112	Merge pull request #1854 from aignatov-bio/ai-sci-3586-comment-counter-not-updated ... Fix comments counter for zero comments [SCI-3586]	2019-06-24 09:39:22 +02:00
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
Anton Ignatov	76e09a2a3d	Clear TinyMce autosave after manual save	2019-06-21 14:21:03 +02:00
Anton Ignatov	57ef9573f2	Fix comments counter for zero comments	2019-06-21 10:43:41 +02:00
Anton Ignatov	df344f4d03	Merge branch 'master' into ai-sci-3369-activity-for-edited-image-annotation	2019-06-20 09:43:53 +02:00
Anton Ignatov	a843a016a0	Fix markup and naming	2019-06-19 15:19:47 +02:00
aignatov-bio	da8d748c49	Fix small comments bugs (#1832)	2019-06-14 16:20:47 +02:00
Anton Ignatov	f480c0eb8d	Adding new activtiies for image editing	2019-06-14 16:15:30 +02:00
aignatov-bio	52a2f5cd0e	Add recent protocols dropdown to task page [SCI-3417] (#1800) ... * Add recent protocols dropdown to task page	2019-06-13 15:47:29 +02:00
Oleksii Kriuchykhin	a855eade4c	Merge branch 'master' into ok_SCI_3461	2019-06-11 17:48:02 +02:00
Urban Rotnik	3d3c6d5350	Toolbar position fix for Safari	2019-06-04 15:55:44 +02:00
aignatov-bio	d207cf5dce	Refactored comments over SciNote [SCI-3505] (#1808) ... * Preparing helpers for comments * Refactored comments over scinote * Update events	2019-06-04 14:40:21 +02:00
Anton Ignatov	16d00340cd	Fix merge errors	2019-05-31 10:35:04 +02:00
Anton Ignatov	c9a29b12ba	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
aignatov-bio	fb30e6b6e5	Add check for refreshProtocolStatusBar function exist (#1794)	2019-05-22 10:31:29 +02:00
Oleksii Kriuchykhin	84a2ad4487	Refactor the async thumbnail reloading (spinner) [SCI-3461]	2019-05-21 17:29:33 +02:00
aignatov-bio	d97e803d01	Adding placeholder to TinyMCE editor (#1788)	2019-05-21 15:53:47 +02:00
mlorb	be0393e642	Merge pull request #1785 from biosistemika/lm-ml-sci-3193 ... Update protocol status bar upon protocol changing [SCI-3193]	2019-05-21 15:28:58 +02:00
aignatov-bio	2de2ead723	Refactor avatar image appearance across Scinote [SCI-3482] (#1787) ... * Refactor avatar appearance across Scinote	2019-05-21 15:19:44 +02:00
Mojca Lorber	b479a6a145	Cover all use cases for updating protocol status bar	2019-05-20 16:09:43 +02:00
Luka Murn	c26489acdc	Update protocol status bar upon changing of protocol description	2019-05-17 10:22:16 +02:00
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +02:00
aignatov-bio	d28d466dc9	Fix multiple confirm windows [SCI-3452] (#1763) ... * Fix multiple confirm windows	2019-05-14 16:25:34 +02:00
aignatov-bio	4a753f8519	Fix user smart annotation fpr tinyMCE (#1759)	2019-05-14 15:02:12 +02:00
aignatov-bio	fe2a3c4ee6	Add message when turbolinks change page with dirty tinyMCE [SCI-3452] (#1754) ... * Add message when turbolinks change page with dirty tinuMCE	2019-05-14 09:49:00 +02:00
Oleksii Kriuchykhin	4b1c4bd140	Fix handling of proccessing step attachments [SCI-3381]	2019-05-13 17:12:06 +02:00
aignatov-bio	039b2f3754	Fix zoom on Y axis [SCI-3374] (#1750) ... * Add zoom to image annotation	2019-05-13 11:01:39 +02:00
Oleksii Kriuchykhin	b60bd79e2b	Change implementation of TinyMCE floating toolbar [SCI-3439]	2019-05-13 10:26:15 +02:00
Anton Ignatov	65eff67926	Fix merge	2019-05-11 20:54:52 +02:00
Anton Ignatov	e5b4adcc25	Merge branch 'master-with-note-section' into features/marvinjs-integration	2019-05-11 20:51:01 +02:00
Mojca Lorber	86255b9037	Remove automatic saving on task and protocol description	2019-05-10 15:30:29 +02:00
Mojca Lorber	d761a5cecb	Make tiny mce saving at clicking anywhere outside of the editor works only for task and protocol description	2019-05-10 11:27:47 +02:00
Mojca Lorber	8e6413b031	Fix tiny mce visuals, saving and cursor position	2019-05-10 10:52:14 +02:00
Anton Ignatov	dcf94e78e1	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-08 14:03:41 +02:00
Anton Ignatov	826ed63f17	Fix floating tool bar and scroll issue after leaving editor	2019-05-07 15:21:15 +02:00
aignatov-bio	7d54f2ab01	Fix issue with TInyMCE upload plugin (#1723)	2019-05-07 10:24:02 +02:00
Alex Kriuchykhin	3f0401bf9a	Merge pull request #1709 from okriuchykhin/ok_SCI_3398 ... Fix TinyMCE for results [SCI-3398]	2019-05-06 10:47:11 +02:00
Anton Ignatov	565a4959b4	small fixes and improvments	2019-05-03 15:24:28 +02:00
Anton Ignatov	fef691d30f	Add error handling and secutiry checks	2019-05-02 16:12:25 +02:00
Anton Ignatov	f73dd38780	Add image editor to tinymce drawings	2019-04-30 18:32:59 +02:00
Anton Ignatov	f80d881847	Fix markup	2019-04-28 19:11:41 +02:00
Anton Ignatov	2847ec7609	Add env variable and check for MarvinJS available	2019-04-28 17:08:18 +02:00
Anton Ignatov	260810fff8	Add editing mode for tinymce images	2019-04-28 16:16:31 +02:00
Anton Ignatov	193edfbc35	Add marvin js support to TinyMCE	2019-04-27 22:54:59 +02:00
Anton Ignatov	54731856f0	Finish step chemical attachments	2019-04-27 19:08:40 +02:00
Anton Ignatov	cf4ff41ec6	Add delete feature	2019-04-27 13:51:35 +02:00
Anton Ignatov	46f0e0c0c2	Add marvin js assets to assets sort and name field	2019-04-27 12:46:45 +02:00
Anton Ignatov	fe620c4a63	Add marvin model and controller	2019-04-26 22:59:38 +02:00
Anton Ignatov	baa9b94a63	Add new graph button to step	2019-04-26 20:33:20 +02:00
Anton Ignatov	40c1c9aef7	Add marvin js modal	2019-04-26 18:24:21 +02:00
Oleksii Kriuchykhin	077ad52d4b	Fix TinyMCE for results [SCI-3398]	2019-04-26 17:37:01 +02:00
aignatov-bio	9fbfa9215e	Add zoom to image annotation [SCI-3374] (#1694) ... * Add zoom to image annotation	2019-04-26 15:21:01 +02:00
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
Urban Rotnik	ea0368aa11	Attachments update for edit page	2019-04-23 13:50:47 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
aignatov-bio	92d8e42a92	Add floating toolbar for tinymce (#1688)	2019-04-19 15:12:06 +02:00
aignatov-bio	ba1e3dc3c6	Add smooth loading for inline task and protoocl description editing (#1682)	2019-04-19 14:47:05 +02:00
Anton Ignatov	f1d801117d	disable zoom	2019-04-18 09:11:27 +02:00
Anton Ignatov	f6ecea42cf	Remove minimum zoom size	2019-04-17 18:51:52 +02:00
aignatov-bio	8d7cc57da1	Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) ... * Add zoom to image annotation and check jpeg file quality before save * Move compression to front end * Move quality extractor to paperclip processor	2019-04-15 09:49:44 +02:00
aignatov-bio	a086f88541	Disable save button while image loading (#1646)	2019-04-09 09:07:58 +02:00
Oleksii Kriuchykhin	9e91e9e59d	Improve large image saving after editing [SCI-3289]	2019-04-03 16:31:56 +02:00
Oleksii Kriuchykhin	c47d243b1f	Disable WOPI edit button in read only mode [SCI-3281]	2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin	ffa7c5ecb2	Fix permition checks for file editing and make protocol preview files read only [SCI-3281]	2019-04-02 16:38:53 +02:00
Anton Ignatov	c9f9523210	Remove src when save description and rename token tag	2019-04-02 13:41:32 +02:00
aignatov-bio	daaa6a367b	Adding custom scrollbar to global activities [SCI-3206] (#1623) ... * Adding custom scrollbar to global activities	2019-04-02 09:56:50 +02:00
Anton Ignatov	46ee2557d4	Fix tooltip stuck bug	2019-03-27 13:53:32 +01:00
Anton Ignatov	fc7400bec9	fix markup	2019-03-22 13:42:12 +01:00
Anton Ignatov	65521533b4	change js.erb to js	2019-03-22 13:35:11 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
aignatov-bio	723024202e	Image editor improvements [SCI - 3158, 3160, 3156, 3154] (#1563) ... * Improvments SCI - 3158, 3160, 3156, 3154	2019-03-22 09:27:50 +01:00
Anton Ignatov	bc58f0aecd	Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload	2019-03-21 11:48:51 +01:00
Anton Ignatov	55c93922ea	markup fixes	2019-03-20 14:46:54 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
Oleksii Kriuchykhin	0c2b7959b6	Fix smart annotations in RTE [SCI-3111]	2019-03-20 11:41:36 +01:00
Oleksii Kriuchykhin	b46f3566ef	Fix rendering of HTML in RTE fields [SCI-3111]	2019-03-19 23:32:24 +01:00
Oleksii Kriuchykhin	eb3d1ea6fe	Update RTE for step description [SCI-3111]	2019-03-19 17:42:49 +01:00
aignatov-bio	6eae12efab	Updating permission check for image editing [SCI - 3153, 3159] (#1568) ... *Add permission check for assets editing * Add check for image format	2019-03-19 13:52:57 +01:00
aignatov-bio	a0a3c4b97f	Fix file format bug (#1569)	2019-03-19 11:06:36 +01:00
Oleksii Kriuchykhin	ba41afe449	Re-orginize TinyMCE init callback [SCI-3062][SCI-3071]	2019-03-15 11:07:57 +01:00
Oleksii Kriuchykhin	2cc170c3d4	Close RTE on save [SCI-3062][SCI-3071]	2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin	a822227383	Add rich text editor to task and protocol description [SCI-3062][SCI-3071]	2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin	af94f79f0d	Submit image as FormData [SCI-2879]	2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin	feb75f62e1	Add workaround for image caching in fabric js [SCI-2855]	2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin	80e525fd97	Improve image editor behaviour [SCI-2855]	2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin	89e968c410	Add tui.image-editor [SCI-2815]	2019-03-11 15:08:15 +01:00
Oleksii Kriuchykhin	2769add4d9	Disable edit button for unsupported WOPI formats [SCI-2904]	2018-12-31 18:10:12 +01:00
mlorb	39b01bc8ed	fix in app help window does not close in some cases	2018-11-21 10:19:41 +01:00
mlorb	e5fca1b1cd	change the rich text max limit on frontend to 50000	2018-10-18 14:22:15 +02:00
Luka Murn	9632d1cd01	Set tooltips initialization to comply with turbolinks ... Also add custom styling options as another data attribute.	2018-10-02 13:49:19 +02:00
Luka Murn	c12f77d1d1	Fix styling (ESLint) on tooltip_helper.js	2018-10-02 11:25:51 +02:00
Luka Murn	63b4f7d909	Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 ... Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]	2018-09-24 16:23:53 +02:00
Zanz2	87d2b0db14	fixed accordign to pr review	2018-09-24 15:57:31 +02:00
Zanz2	5b955da74c	makes tooltip behaviour more reliable and less erratic	2018-09-16 21:34:36 +02:00
Zanz2	07757e382a	fixed hound	2018-09-14 13:43:31 +02:00
Zanz2	22a565a684	Made fixes according to review	2018-09-14 13:07:09 +02:00
Luka Murn	f9d771d01a	Add minor comment	2018-09-13 14:50:00 +02:00
Luka Murn	99c156de94	Fix (hopefully) the TinyMCE files from being cached ... Closes SCI-2717.	2018-09-12 15:28:21 +02:00
Zanz2	a0c6a0c407	changed name of data attribute	2018-09-07 15:33:38 +02:00
Zanz2	2d1d4c78bc	Merge branch 'master' into zz_in_app_tooltips_help_sci2662	2018-08-21 11:27:01 +02:00
Zanz2	36cca3d6aa	Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax	2018-08-21 11:11:25 +02:00
Zanz2	91f112dc38	Saving minor changes, deleted comments, stuck at drag n drop	2018-08-20 13:45:43 +02:00
Zanz2	1159a32ce2	Implemented all except 2 tooltips, debbugging why they dont work now	2018-08-20 13:03:30 +02:00
Zanz2	8c492e1491	started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute	2018-08-17 16:03:49 +02:00
Zanz2	e1cadfc75e	saving work, removed testing buttons	2018-08-17 11:52:10 +02:00
Zanz2	637c7dfb19	modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic	2018-08-17 11:33:44 +02:00
Zanz2	a09834db6a	testing, made new popover designs	2018-08-16 16:10:19 +02:00
Zanz2	d2373980d4	Testing out new popover	2018-08-16 15:07:59 +02:00
Zanz2	9fd02e71c9	initial popover/tooltip config	2018-08-16 13:04:42 +02:00
Zanz2	dfcaa40f1a	Merge branch 'master' into zz_refactor_icons_sci_2445_v2	2018-08-14 13:33:43 +02:00
Zanz2	45a4c1c598	changed the icons as per last comment in jira issue	2018-08-14 13:26:48 +02:00
Oleksii Kriuchykhin	5c999300b5	Fix avatar upload validators [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	b2bd1cb849	Upgrade to Turbolinks 5 [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
zmagod	e654725d9e	fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511]	2018-07-06 14:26:20 +02:00
Oleksii Kriuchykhin	a169639b3c	Fix uploaded file max size validation in JS [SCI-2590]	2018-07-05 15:23:26 +02:00
zmagod	db1944cc90	move maximum file size limit to an ENV variable [fixes SCI-2415]	2018-06-19 14:15:14 +02:00
Zmago Devetak	a8981d7039	Merge pull request #1201 from ZmagoD/zd_SCI_2421 ... fixes bug with tinymce/at.js [fixes SCI-2421]	2018-06-13 11:14:17 +02:00
Zmago Devetak	6cab1746cd	Merge pull request #1202 from ZmagoD/zd_SCI_2392 ... prevents asset preview modal to close on click [fixes SCI-2392]	2018-06-13 08:41:41 +02:00
mlorb	40f3365596	fix bug with truncating string	2018-06-11 14:47:25 +02:00
zmagod	32a09f9780	prevents asset preview modal to close on click [fixes SCI-2392]	2018-06-11 13:03:11 +02:00
zmagod	374a16abad	fixes bug with tinymce/at.js [fixes SCI-2421]	2018-06-11 10:18:35 +02:00
zmagod	712a3c7ff6	fixes css, changes spinner in preview modal	2018-05-16 10:40:49 +02:00
zmagod	e5c3fb6af2	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321	2018-05-10 10:38:56 +02:00
zmagod	38869ec037	adds title on disabled download file link	2018-05-10 09:47:10 +02:00
zmagod	66b676b5ce	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321	2018-04-26 17:04:36 +02:00
zmagod	0afe461962	fixes download link	2018-04-26 17:00:51 +02:00
mlorb	f97477f3f0	some extra button styling	2018-04-26 15:19:05 +02:00
mlorb	763d934aa7	fix buttons again	2018-04-26 15:02:24 +02:00
Luka Murn	cb6fe50832	Merge branch 'master' into ux-release-1 ... Conflicts: app/assets/javascripts/repositories/index.js	2018-04-26 11:38:54 +02:00
zmagod	c2d19fee52	fixes images preview in repository/library [fixes SCI-2321]	2018-04-24 13:11:55 +02:00
Luka Murn	fa603b54b8	Merge pull request #930 from okriuchykhin/ok_SCI_1860 ... Remove tutorial [SCI-1860]	2018-04-12 14:46:20 +02:00
Luka Murn	9bf8b5d864	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 ... Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml	2018-04-12 13:16:46 +02:00
zmagod	233e73c709	adds asset preview link to repository row modal and to table row item [fixes SCI-2110]	2018-04-10 17:06:53 +02:00
zmagod	ea4bd8831f	fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284]	2018-04-10 13:19:53 +02:00
zmagod	cf7761daaa	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223	2018-04-06 12:56:39 +02:00
Oleksii Kriuchykhin	8ee98b7cf0	Update Capybara and dependencies [SCI-2217]	2018-04-04 14:13:37 +02:00
Oleksii Kriuchykhin	51860652c1	Refactor smart annotations modal [SCI-2223]	2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
Oleksii Kriuchykhin	a105e61d48	Remove tutorial [SCI-1860]	2018-03-18 13:18:05 +01:00
zmagod	a6a25bbe08	add floating alert message	2018-03-13 16:33:48 +01:00
zmagod	2b55cd7090	rename variables	2018-03-02 14:14:27 +01:00
zmagod	e3ca782996	add info modal for repository items [fixes SCI-2066]	2018-02-27 16:21:46 +01:00
zmagod	bd1345d560	fixes bug with assets upload on task result page, ... adds ctrl+v listener to upload images from clipboard, adds image preview modal	2018-02-06 15:39:19 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin	89230bd730	Fix about modal [SCI-1875]	2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin	afb579bef1	Fix invite users dropdown [SCI-1893]	2017-12-21 16:49:10 +01:00
okriuchykhin	b3b0e367e8	Merge pull request #889 from okriuchykhin/ok_SCI_1747 ... Improve server side assets validation display for steps [SCI-1747]	2017-12-04 14:12:43 +01:00
Oleksii Kriuchykhin	745dac09a7	Improve clean-up of dropped files [SCI-1747]	2017-11-28 16:48:47 +01:00
Oleksii Kriuchykhin	e35031dd9a	Small code fixies [SCI-1747]	2017-11-28 11:34:57 +01:00
zmagod	d200e355ed	follow @Ducz0r 's suggestions	2017-11-24 11:45:07 +01:00
Oleksii Kriuchykhin	fe8b7d26c1	Improve server side assets validation display for steps [SCI-1747]	2017-11-21 13:48:06 +01:00
Mojca Lorber	ff998a6c98	change text for avatar size on my profile page	2017-11-15 14:21:04 +01:00
Oleksii Kriuchykhin	631b41cdaa	Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 11:38:23 +02:00
Mojca Lorber	a0f7030a70	fix bug with tinyMCE text validaton	2017-09-07 14:54:12 +02:00
Zmago Devetak	69919359f1	Merge pull request #738 from ZmagoD/zd_SCI_1452 ... fixes issue with smart annotations in repositories [fixes SCI-1452]	2017-07-12 14:50:29 +02:00
zmagod	baaec67399	fixes issue with smart annotations in repositories [fixes SCI-1452]	2017-07-10 16:22:32 +02:00
Luka Murn	3e80f761b8	Add "about" modal, prepare hooks, VERSION system for addons ... Also the addon generator is fixed so it properly creates VERSION file for new addons.	2017-07-10 15:27:50 +02:00
zmagod	6dd85d6c39	fixes drag'n drop bug in results on safari [fixes SCI-1370]	2017-06-14 09:45:49 +02:00
Luka Murn	e26337d5ee	Merge pull request #671 from biosistemika/custom-repositories ... Merge custom-repositories into master	2017-06-09 18:46:47 +02:00
zmagod	33b996ffee	refactor	2017-06-09 09:49:57 +02:00
zmagod	c6bb20039b	adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]	2017-06-07 13:29:39 +02:00
Mojca Lorber	51c4eeb106	renaming	2017-06-06 15:50:43 +02:00
Matej Zrimšek	2c6ad4aa05	Refactored modal popups for repositories to make them general. [fix 1269]	2017-06-05 14:13:24 +02:00
zmagod	67d902db52	refactor	2017-06-05 10:43:58 +02:00
Matej Zrimšek	c82fd66146	Removed unneeded utility JS function. [SCI-1269]	2017-06-02 17:52:04 +02:00
Matej Zrimšek	791bb934ca	Remove repository modal logic (WIP). [SCI-1269]	2017-06-02 17:50:33 +02:00
Matej Zrimšek	20265ddd69	Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]	2017-05-17 18:18:57 +02:00
Matej Zrimšek	79ec3b5e4c	Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	901558c733	Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
zmagod	9bec7dd96e	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248	2017-05-15 14:49:37 +02:00
zmagod	a4032f5cc6	first run	2017-05-10 13:53:32 +02:00
Oleksii Kriuchykhin	52ad5ecdc2	Fix error messages display during file upload in steps and results [SCI-1235]	2017-05-09 17:13:47 +02:00
okriuchykhin	bd0b930382	Merge pull request #598 from okriuchykhin/ok_SCI_152 ... Add counters for users and comments on canvas [SCI-152]	2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin	344b9c290a	Add counters for users and comments on canvas [SCI-152]	2017-05-08 17:32:55 +02:00
Zmago Devetak	4b816f5322	Merge pull request #568 from ZmagoD/zd_SCI_1119 ... Add images to fields with rich text formatting	2017-05-08 13:06:58 +02:00
zmagod	5b58824ec0	refactor	2017-05-03 15:30:08 +02:00
ajugo	081aa4aea7	Merge pull request #570 from rekonder/aj-SCI-1088 ... My profile - avatar size fix [SCI-1088]	2017-05-03 12:27:05 +02:00
Matej Zrimšek	8ad52354eb	Used locales instead of hardcoded values for intro.js tutorial popup.	2017-04-25 16:03:50 +02:00
Matej Zrimšek	e8bc9542cc	Removed some unneeded intro.js tutorial code.	2017-04-25 16:03:50 +02:00
Matej Zrimšek	a6573bd508	Next button is now always focused when navigating through tutorial steps. [fixes SCI-719]	2017-04-25 16:03:50 +02:00
Matej Zrimšek	a5cffd06f3	Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]	2017-04-25 16:03:50 +02:00
Mojca Lorber	49574e7a06	remove behavior of not allowing the empty tables in steps	2017-04-25 10:21:16 +02:00
rekonder	b93edac3b9	My profile - avatar size fixes [SCI-1088]	2017-04-25 10:02:00 +02:00
zmagod	66f43803c0	refactor, fix user annotation bug	2017-04-24 16:22:25 +02:00
zmagod	550f563666	working version for steps first run	2017-04-21 16:09:04 +02:00
zmagod	c25df63a14	add tinymce img importer and refactor input sanitize helper	2017-04-19 09:11:52 +02:00
Oleksii Kriuchykhin	181d981a51	Add image preview to protocol repository [SCI-877]	2017-04-12 16:05:38 +02:00
Zmago Devetak	5c9954bb89	Merge pull request #450 from ZmagoD/zd_SCI_939 ... Refactor "organizations" to "teams"	2017-02-01 13:12:02 +01:00
okriuchykhin	9909f9dcff	Merge pull request #456 from okriuchykhin/ok_SCI_951 ... Fix missing preview images in task and protocol management [SCI-951]	2017-01-27 14:42:41 +01:00
zmagod	e59b2e039a	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939	2017-01-27 11:15:31 +01:00
Oleksii Kriuchykhin	0f860496a7	Fix image preview after saving of report [SCI-951]	2017-01-26 14:42:14 +01:00
Mojca Lorber	13d1cc5171	fix entering new smart anotations	2017-01-26 13:50:32 +01:00
zmagod	8c035a1981	renames organization in assets	2017-01-25 12:12:27 +01:00
Oleksii Kriuchykhin	365eef506c	Fixes merge conflicts with smart-annotations branch	2017-01-24 15:20:50 +01:00
mlorb	02f314ce60	Merge pull request #443 from mlorb/ml_sci_919_v2 ... Remove table of content and customize link target [SCI-919]	2017-01-24 14:39:47 +01:00
Luka Murn	53699193a2	Merge branch 'smart-annotations' ... Conflicts: app/assets/javascripts/comments.js.erb app/assets/javascripts/protocols/index.js app/assets/javascripts/protocols/steps.js.erb app/assets/javascripts/samples/sample_datatable.js.erb app/controllers/my_module_comments_controller.rb app/controllers/project_comments_controller.rb app/controllers/result_comments_controller.rb app/controllers/step_comments_controller.rb app/datatables/sample_datatable.rb app/views/my_module_comments/_comment.html.erb app/views/project_comments/_comment.html.erb app/views/projects/show/_experiment.html.erb app/views/reports/elements/_experiment_element.html.erb app/views/reports/elements/_result_comments_element.html.erb app/views/reports/elements/_result_text_element.html.erb app/views/reports/elements/_step_checklist_element.html.erb app/views/reports/elements/_step_comments_element.html.erb app/views/reports/elements/_step_element.html.erb app/views/result_comments/_comment.html.erb app/views/results/_result_text.html.erb app/views/step_comments/_comment.html.erb app/views/steps/_step.html.erb db/schema.rb	2017-01-24 14:33:23 +01:00
Mojca Lorber	4dc7998fdd	Remove table of content and customize link target	2017-01-24 13:10:01 +01:00
Mojca Lorber	eb40513ada	remove functionalities from rich text formatting	2017-01-24 09:44:37 +01:00
zmagod	9c3bc8dac7	fixes checklist item user popover bug [fixes SCI-907]	2017-01-23 09:47:04 +01:00
Zmago Devetak	c1e7cc83a7	Merge pull request #434 from ZmagoD/zd_SCI_915 ... Text is deleted when entering smart annotation in rich text editor	2017-01-20 13:01:29 +01:00
Zmago Devetak	7bd368e002	Merge pull request #431 from ZmagoD/zd_add_code_highlight ... Fixes code highlight and smart annotations experiments bug	2017-01-20 12:59:21 +01:00
zmagod	71453398b1	bugfix	2017-01-20 11:33:49 +01:00
zmagod	4f7d62e79d	removes unneeded annotations [fixes SCI-915]	2017-01-20 11:33:10 +01:00
zmagod	9550c6dd35	fixes highlight.js	2017-01-19 17:09:25 +01:00
Matej Zrimšek	54f8b01341	Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894]	2017-01-19 15:26:28 +01:00
Oleksii Kriuchykhin	890c5e3c3d	Add “no results found” message in smart annotation [SCI-886]	2017-01-19 13:42:58 +01:00
Zmago Devetak	039a8d7da6	Merge pull request #426 from ZmagoD/zd_add_tinyMCE ... Add tiny mce	2017-01-19 12:57:55 +01:00
mz3944	da604d2619	Merge pull request #427 from mz3944/mz-sci-908 ... Some smart annotations refactoring [SCI-908]	2017-01-19 12:15:20 +01:00
zmagod	f2d5066dc7	fix some bugs	2017-01-19 11:37:59 +01:00
Matej Zrimšek	5d86bbb812	Smart annotations improved documentation. [SCI-908]	2017-01-19 10:56:02 +01:00
Matej Zrimšek	fec83e8c45	Smart annotations refactoring. [SCI-908]	2017-01-19 10:55:43 +01:00
zmagod	2ccafdd670	bug fix	2017-01-19 10:12:01 +01:00
zmagod	27d3868f37	fix bugs	2017-01-19 09:40:39 +01:00
zmagod	88d7cb200e	removed quill	2017-01-18 23:06:14 +01:00
zmagod	65fa631b1c	adding tinyMce first run	2017-01-18 22:40:08 +01:00
okriuchykhin	18d329fb42	Merge pull request #423 from okriuchykhin/ok_SCI_896 ... Make search work for full names in smart annotations [SCI-896]	2017-01-18 17:58:52 +01:00
Oleksii Kriuchykhin	6555fd02b6	Make search work for full names in smart annotations [SCI-896]	2017-01-18 16:57:51 +01:00
mz3944	b5e38afb64	Merge pull request #416 from mz3944/mz-sci-884 ... Smart annotation bug fixes [SCI-884, SCI-889] [WIP]	2017-01-18 16:13:19 +01:00
Matej Zrimšek	dbbb709bf2	Smart annotations minor refactoring. [SCI-884, SCI-889]	2017-01-18 16:04:39 +01:00
Matej Zrimšek	24458fe590	Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889]	2017-01-18 15:29:48 +01:00
Luka Murn	cf72da5635	Merge branch 'improved-files-handling' into 'master' ... Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb	2017-01-18 11:29:40 +01:00
Matej Zrimšek	d3c33c9dca	Refactored smart annotation JS. [SCI-884]	2017-01-17 10:05:41 +01:00
Luka Murn	a2935c6620	Add sample info modal popup to sample smart annotations ... This MR also loads datatables.js globally (as it's required by the modal), so I removed it everywhere in code, and it shouldn't be used anymore (e.g. '//= require datatables'). Closes SCI-892.	2017-01-16 15:52:02 +01:00
Matej Zrimšek	2877126dc6	Fixed selected search filter button style. [SCI-884]	2017-01-16 12:52:03 +01:00
Matej Zrimšek	15d7944302	Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889]	2017-01-13 18:51:05 +01:00
zmagod	1840fdb7e5	cleanup js	2017-01-12 09:52:29 +01:00
zmagod	3a1ec0eb5e	refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824]	2017-01-11 14:56:47 +01:00
zmagod	a4aa933151	refactor smart annotation parser helper	2017-01-11 10:34:14 +01:00
zmagod	a903772de8	style dropdown	2017-01-10 17:05:32 +01:00
zmagod	fc76a4ae6d	Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834	2017-01-10 14:22:04 +01:00
zmagod	89e8946a47	expand smart annotation	2017-01-10 14:14:21 +01:00
zmagod	e0e998a0d8	add smart annotation parser helper	2017-01-10 14:14:21 +01:00
zmagod	6efcf49927	working version of dropdown filter	2017-01-10 14:14:21 +01:00
zmagod	53d20df449	added xregexp	2017-01-10 14:14:21 +01:00
zmagod	94262b56ef	prepare data for atwho	2017-01-10 14:14:21 +01:00
Oleksii Kriuchykhin	4c9c9037ed	Enable image preview after editing protocol and disable preview modal animation [SCI-868]	2017-01-09 17:19:46 +01:00
Luka Murn	0ee5b98977	Refactor code a bit, add dismiss button to header	2017-01-07 09:59:52 +01:00
Oleksii Kriuchykhin	aa2b573278	Enable image preview while editing steps and code style improvements [SCI-694]	2017-01-06 15:58:23 +01:00
Luka Murn	7835753d3c	Add atwho-users URL to <body>	2017-01-06 12:48:37 +01:00
Luka Murn	b614ce714b	Restyle atwho dropdown	2017-01-05 14:06:48 +01:00
Luka Murn	a78bb79618	Temp commit	2017-01-05 12:07:17 +01:00
Luka Murn	3bee9d2e12	Save an (yet unworking) version of user smart annotations ... Used so other devs can start working on smart annotations.	2017-01-04 10:54:02 +01:00
Oleksii Kriuchykhin	0d01a4b2bd	Remove unneeded function from utils.js [SCI-819]	2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin	4065be9e4e	Fix marking of selected option [SCI-819]	2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin	e22ff6f8bb	Fix an issue with sample editing and type/group dropdowns [SCI-819]	2016-12-30 15:50:43 +01:00
Luka Murn	5beaa26224	Update utils.js ... Closes SCI-811.	2016-12-22 10:03:00 +01:00
Luka Murn	af6bf2aee1	Fix jQuery selector, make it work for new samples	2016-12-21 16:23:09 +01:00
Luka Murn	e52277bdad	Fix sample types & groups when editing sample in samples table ... Closes SCI-811.	2016-12-21 13:15:55 +01:00
Zmago Devetak	c8631077df	Merge pull request #361 from biosistemika/improved-sample-table ... Improved sample table	2016-12-16 15:37:54 +01:00
Zmago Devetak	daee14bed5	Merge pull request #343 from ZmagoD/zd_SCI_780 ... fixed step description links [fixes SCI-780]	2016-12-15 13:12:25 +01:00
zmagod	50c9dd3f59	fixed typo	2016-12-14 14:40:56 +01:00
zmagod	2426539715	fixes long names in columns dropdown [fixes SCI-784]	2016-12-13 14:54:37 +01:00
zmagod	b56913cc87	refactor	2016-12-12 16:21:38 +01:00
Matej Zrimšek	54de13de82	Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701]	2016-12-09 17:22:09 +01:00
Matej Zrimšek	0b12c87b09	Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701]	2016-12-09 16:44:50 +01:00
zmagod	e23be6cc0e	fixed step description links [fixes SCI-780]	2016-12-09 15:26:41 +01:00
Matej Zrimšek	aea679ec11	Added links for creating new sample type and group when creating new sample. [fixes SCI-701]	2016-12-09 11:39:12 +01:00
zmagod	9f1e436623	limits max size of all uploaded files at the one time [fixes SCI-740]	2016-12-07 09:02:04 +01:00
Matej Zrimšek	1db926101d	Minor refactoring.	2016-11-23 10:48:43 +01:00
Matej Zrimšek	6bc2603157	Fixed tutorial overlay unexpectedly blurring the screen when not running the tutorial. [fixes SCI-707]	2016-11-23 10:36:09 +01:00
Oleksii Kriuchykhin	d7aa155860	Disable keyboard navigation in tutorial [SCI-703]	2016-11-22 14:14:42 +01:00
Oleksii Kriuchykhin	cc86ff268f	Reload page after exit from tutorial [SCI-703]	2016-11-22 13:49:57 +01:00
mz3944	c5bc3a4dc6	Merge pull request #303 from mz3944/mz_and_new_tutorial_steps_SCI_571_v2 ... Added additional tutorial step for showing protocol link. Tutorial st…	2016-11-21 16:06:45 +01:00
Oleksii Kriuchykhin	d6f5f6b9bf	Changes default behaviour for absolute urls in Quill [SCI-684]	2016-11-21 14:18:08 +01:00
Matej Zrimšek	f13cc5be0e	Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).	2016-11-17 18:03:49 +01:00
Luka Murn	26d04b1f3c	Merge branch 'rich-text-formatting' into 'master' ... Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss	2016-11-17 16:39:33 +01:00
Matej Zrimšek	c8eb82cc85	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	0e97bfc002	Refactored and added back button for tutorial for steps 21-22. Minor tutorial function renaming and docs update.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	c64146904a	Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	47c1308ba6	Refactored and added back button for tutorial for step 18. Tutorial function now also works with one page step.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	00ed91e856	Refactored and added back button for tutorial for steps 16-17. Tutorial now exits upon page leave.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	4ee7baabec	Enriched tutorial function description.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	f4206ea3d0	No warning popup is shown when running tutorial.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	3f8d3d5939	Refactored and added back button for tutorial for steps 6-11.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	74e58b044f	Tutorial refactored using one method, for steps 1-5.	2016-11-17 14:46:04 +01:00
Luka Murn	d1701bd7ae	Merge pull request #276 from Ducz0r/lm-sci-637 ... Automatically resize textarea elements [SCI-637]	2016-11-17 09:58:36 +01:00
Luka Murn	a3bbf94643	Add a smart_text_area tag & implement it throughout application ... This fixes the mentioned issues @mlorb mentioned. Closes SCI-637.	2016-11-16 17:57:01 +01:00
Mojca Lorber	4d681bb63c	change strip html function	2016-11-11 12:34:57 +01:00
Mojca Lorber	3b7af3e66c	fix validation logic	2016-11-11 11:42:16 +01:00
Luka Murn	b42922d32c	Add autosize functionality to all textareas ... Closes SCI-637	2016-11-11 09:09:41 +01:00
Luka Murn	0e065026bd	Closes SCI-648	2016-11-10 16:18:17 +01:00
Luka Murn	6fe0d6b3df	A working invite modal!	2016-11-07 09:43:10 +01:00
Luka Murn	ccf8932611	Add first version of invite users modal	2016-11-07 09:43:09 +01:00