102 commits

Author	SHA1	Message	Date
aignatov-bio	2baca019eb	Remove tooltip from step edit button (#1905)	2019-07-08 12:52:03 +02:00
Urban Rotnik	9cb4454537	New implementation for attachments creation	2019-06-27 17:02:06 +02:00
Urban Rotnik	1fd0ca6795	Add steps preview	2019-06-27 16:46:02 +02:00
aignatov-bio	71b3228310	Update protocol preview style [SCI-3416] (#1729) ... * Update protocol appearance	2019-05-13 10:45:12 +02:00
aignatov-bio	634b58bd6a	Various UX improvements for note section [SCI-3444] (#1742) ... * Various UX improvments for note section	2019-05-11 16:04:28 +02:00
Anton Ignatov	995408e7fc	Fix protocol update error, rollback bootstrap gems and fix step name	2019-05-08 17:18:19 +02:00
Urban Rotnik	774521df7a	Changes to comments section in Task Steps	2019-04-23 15:02:58 +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
Urban Rotnik	ee3dc571e1	Update attachments view, add ordering on FE	2019-04-09 14:17:40 +02:00
Urban Rotnik	26cf8271a1	Change step header, remove vertical line	2019-04-05 10:57:38 +02:00
Jure Grabnar	cbf109f884	Fix create WOPI file button ... Closes SCI-3137	2019-04-04 17:05:25 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Jure Grabnar	9a4cd4fda2	Add file_present true	2019-04-04 16:57:36 +02:00
Jure Grabnar	3b8e6fa47c	Test office online	2019-04-04 16:57:36 +02:00
Jure Grabnar	26848ecaef	Refactor step position + 1 into a method	2019-04-03 13:07:30 +02:00
Miha Mencin	1b19e67c07	Revert "Step header changes, removed vertical line" ... This reverts commit b0f0ded87d.	2019-03-27 10:21:40 +01:00
Urban Rotnik	b0f0ded87d	Step header changes, removed vertical line ... SCI-3134	2019-03-25 17:25:13 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
mz3944	4d460d14ea	Merge pull request #1378 from mz3944/mz-SCI-2861 ... All users in smart annotation have removed in brackets [SCI-2861]	2018-11-20 21:22:23 +01:00
Matej Zrimšek	c144d599fc	Fix user smart annotation showing as if the user is removed from team [SCI-2861]	2018-11-19 08:02:25 +01:00
Oleksii Kriuchykhin	fb309a12b9	Refactor result and step comments initialization [SCI-2830]	2018-11-13 16:57:42 +01:00
Zanz2	22a565a684	Made fixes according to review	2018-09-14 13:07:09 +02:00
Zanz2	2d1d4c78bc	Merge branch 'master' into zz_in_app_tooltips_help_sci2662	2018-08-21 11:27:01 +02:00
Zanz2	1159a32ce2	Implemented all except 2 tooltips, debbugging why they dont work now	2018-08-20 13:03:30 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
mlorb	81392362ac	Final button colour changes	2018-05-18 16:24:24 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
mlorb	9e11f3b220	update buttons positions and wording throughout app	2018-04-25 13:57:12 +02:00
zmagod	b4deb232c0	rename variable: not_in_repository => display_image_tag	2018-04-12 13:40:17 +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
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
mz3944	bb21f6543c	Merge pull request #1004 from mz3944/mz-SCI-2011 ... Wrapping up the permissions [SCI-2011]	2018-03-06 07:10:40 +01:00
Luka Murn	070450f813	Merge branch 'release-1.12.11' ... Conflicts: config/initializers/extends.rb	2018-03-01 14:04:57 +01:00
Oleksii Kriuchykhin	aa933ad1f4	Add extendable file types mappings for icons [PIP-46]	2018-02-26 14:23:02 +01:00
Matej Zrimšek	5bda53eebf	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
Matej Zrimšek	8ef6c8f91f	Refactored remaining experiment level permissions (and everything below it).	2018-02-14 14:39:07 +01:00
Matej Zrimšek	d6e7ef465c	Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]	2018-02-14 14:19:22 +01:00
Matej Zrimšek	854333b0e6	Grouped permissions for experiment with canaid gem (WIP).	2018-02-14 14:19:00 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
mlorb	806fcbce36	refactor update protocol in repository permission	2017-12-14 14:18:16 +01:00
mlorb	e0d1ae174e	refactor read protocol in repository permission	2017-12-14 14:18:15 +01:00
zmagod	3dc3ed906f	fixes bug with embedded images [fixes SCI.1624]	2017-10-02 18:06:42 +02:00
zmagod	2081e0a94b	Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1	2017-05-10 15:14:17 +02:00
zmagod	8d0c22327b	adds asc order to checklists [fixes SCI-1228]	2017-05-04 15:17:34 +02:00
zmagod	55c8c498e2	add image upload functionality to result text	2017-04-24 12:28:27 +02:00
zmagod	550f563666	working version for steps first run	2017-04-21 16:09:04 +02:00