155 commits

Author	SHA1	Message	Date
Alex Kriuchykhin	7db53fad7c	Merge pull request #1566 from okriuchykhin/ok_SCI_3062 ... Add rich text editor to task and protocol description [SCI-3062][SCI-3071]	2019-03-19 13:28:05 +01:00
Oleksii Kriuchykhin	5bc41c1f06	Fix task tags field after merging latest master to feature branch	2019-03-15 14:21:34 +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	645930b8d7	Merge branch 'master' into features/note-section	2019-03-14 16:25:51 +01:00
aignatov-bio	125d2a3b9b	New inline tags editing in task [SCI 3093] (#1529) ... * Adding inline tags selection	2019-03-06 09:18:45 +01:00
aignatov-bio	b1df8c9aa7	Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524) ... * Adding inline editing to experiment title, project title and task title	2019-03-06 09:17:34 +01:00
Miha Mencin	a372ebf07d	Revert "Task info section improvements [SCI - 3058]"	2019-02-27 21:00:11 +01:00
Anton Ignatov	a4cabb203b	Task info section improvements	2019-02-25 16:55:09 +01:00
Oleksii Kriuchykhin	e62e1873b0	Fix issue with caching in inventories dropdown [SCI-2776]	2019-01-17 15:04:20 +01:00
Oleksii Kriuchykhin	132f46b136	Improve error handling in task inventories dropdown [SCI-2776]	2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin	534866467b	Add counters to task inventories dropdown [SCI-2776]	2019-01-03 14:11:00 +01:00
mlorb	b7efce579b	fix tooltip style	2018-12-13 12:43:12 +01:00
Oleksii Kriuchykhin	60a19734b2	Enable caching for navigation sidebar [SCI-2757]	2018-11-29 11:28:36 +01:00
Alex Kriuchykhin	20e2cbf0ca	Merge pull request #1391 from okriuchykhin/ok_SCI_2880 ... Fix smart annotations rendering issues [SCI-2880]	2018-11-28 09:47:20 +01:00
Oleksii Kriuchykhin	2e00f1546a	Fix handsontable initialization [SCI-2882]	2018-11-26 14:11:46 +01:00
Oleksii Kriuchykhin	b926cadba4	Fix smartannotations rendering issues [SCI-2880]	2018-11-23 15:07:08 +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	380a96dcce	Add caching for step and result fragments [SCI-2830]	2018-11-14 11:57:53 +01:00
Oleksii Kriuchykhin	fb309a12b9	Refactor result and step comments initialization [SCI-2830]	2018-11-13 16:57:42 +01: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	22a565a684	Made fixes according to review	2018-09-14 13:07:09 +02:00
Zanz2	15c124f3fd	replaced image icon with paperclip, to represent files, removed all image icons	2018-08-27 13:07:18 +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
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	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	38c36ab798	Fix modals handling with Turbolinks [SCI-2253]	2018-08-02 11:25:14 +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
Luka Murn	9a4fdd166e	Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix ... Conflicts: app/views/projects/index.html.erb	2018-06-12 17:44:42 +02:00
okriuchykhin	acd6efae57	Merge pull request #1200 from okriuchykhin/ok_SCI_2212 ... Add result content hook [SCI-2212]	2018-06-11 09:28:30 +02:00
Oleksii Kriuchykhin	87925271e8	Add result content hook [SCI-2212]	2018-06-08 14:22:03 +02:00
zmagod	86c4093bf2	adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]	2018-06-08 09:41:04 +02:00
Luka Murn	b324a2dab3	Restyle activities page	2018-06-07 09:29:47 +02:00
mlorb	3368e3b963	Merge branch 'ux-release-1' into ml-sci-2271	2018-05-23 14:06:54 +02:00
mlorb	5e689f6b4d	fix toggle button on inventory page	2018-05-23 11:20:42 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
mlorb	c2cf52bb34	add another toggle button	2018-05-18 16:34:01 +02:00
mlorb	81392362ac	Final button colour changes	2018-05-18 16:24:24 +02:00
mlorb	ed27a7a62a	some extra restyling/unifying off app	2018-05-11 18:02:17 +02:00
mlorb	b5649f0574	Merge branch 'ux-release-1' into ml-sci-2336-v1	2018-05-10 13:59:57 +02:00
Zmago Devetak	0a4deeaa35	Merge pull request #1112 from ZmagoD/zd_SCI_2261 ... propagate assigned repository items in workflow [fixes SCI-2261]	2018-05-10 09:57:49 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
mlorb	d2c0ae241e	Merge pull request #1121 from mlorb/ml-sci-2244 ... Update buttons positions and wording throughout app [SCI-2244]	2018-05-03 11:05:15 +02:00
mlorb	f97477f3f0	some extra button styling	2018-04-26 15:19:05 +02:00
zmagod	24acd5c779	fixes per @duco 's request	2018-04-26 14:13:46 +02:00
mlorb	9e11f3b220	update buttons positions and wording throughout app	2018-04-25 13:57:12 +02:00
zmagod	503ad1ba20	removes samples from views [fixes SCI-2304]	2018-04-24 08:26:55 +02:00