117 commits

Author	SHA1	Message	Date
aignatov-bio	4f941610b2	Small layout changes for protocol	2020-04-24 11:50:03 +02:00
mlorb	1cea6116b5	Merge pull request #2515 from mlorb/ml-sci-4493 ... Add protocol options dropdown [SCI-4493]	2020-04-23 17:21:26 +02:00
aignatov-bio	f65b50c6ff	Fix rebase conflicts	2020-04-23 16:36:22 +02:00
aignatov-bio	34d6e903a4	Add assign items modal and update modal for task inventories	2020-04-23 15:24:40 +02:00
Alex Kriuchykhin	1802d7cb59	Merge pull request #2516 from okriuchykhin/ok_SCI_4525 ... Add versions sidebar to assigned repository rows full view modal [SCI-4525]	2020-04-23 13:18:23 +02:00
Oleksii Kriuchykhin	608ee23ec4	Add task details popover [SCI-4503]	2020-04-21 15:11:57 +02:00
Oleksii Kriuchykhin	f811d11c59	Add versions sidebar to assigned repository rows full view modal [SCI-4525]	2020-04-21 14:49:36 +02:00
Mojca Lorber	6fecee8c0c	Add protocol options dropdown	2020-04-21 10:03:53 +02:00
aignatov-bio	338f3a0192	Fix css	2020-04-14 13:08:07 +02:00
aignatov-bio	15b291347b	Fix I18n	2020-04-14 12:10:17 +02:00
aignatov-bio	c1cac01b28	Add repositories dropdown list	2020-04-14 12:10:16 +02:00
aignatov-bio	e4b65aaf6f	Finish full view repository	2020-04-08 15:13:21 +02:00
aignatov-bio	fc810b5524	Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list ... Add assigned repositories list [SCI-4507]	2020-04-03 13:59:26 +02:00
aignatov-bio	9a64ebdfd0	Update sql and add accordion effect	2020-04-03 13:15:56 +02:00
aignatov-bio	9678372dd5	Add assigned repositories list	2020-04-02 12:05:07 +02:00
Mojca Lorber	cb554e815a	Add new task layout details section	2020-04-01 13:05:35 +02:00
Mojca Lorber	bd177f4f2f	Renaming fixes	2020-03-31 11:22:53 +02:00
Mojca Lorber	7006036626	Add new task general layout and add notes section	2020-03-30 12:51:35 +02:00
aignatov-bio	f2ed3198d5	Add due date autosave field	2019-11-21 12:14:43 +01:00
aignatov-bio	4ddcbe5d75	Fix user permission for recent protocols (#1843)	2019-06-19 14:06:02 +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	1128fedc51	Refactor title inline editing permission checking [SCI-3471]	2019-05-20 13:13:31 +02:00
Alex Kriuchykhin	bcbaf73669	Merge pull request #1773 from okriuchykhin/ok_SCI_3468 ... Add permission checking to inline editor fields [SCI-3468]	2019-05-15 17:49:15 +02:00
Oleksii Kriuchykhin	2ef926e795	Add permission checking to inline editor fields [SCI-3468]	2019-05-15 17:47:09 +02:00
aignatov-bio	f970eea525	Some gui fixes (#1757)	2019-05-14 09:43:02 +02:00
Miha Mencin	765c6ebd6a	Merge pull request #1747 from biosistemika/lm-sci-3438-fix ... Fix TinyMCE images in task description and task protocol description view [SCI-3438]	2019-05-13 10:56:30 +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
Luka Murn	059ebf6f27	Fix task and protocol description (TinyMCE) rendering on task page ... Closes SCI-3438.	2019-05-10 20:39:26 +02:00
Mojca Lorber	7be151bd2d	Visual fixes for edit/add step on protocol	2019-04-30 14:57:50 +02:00
Urban Rotnik	c94d3ce950	Remove duplicated button	2019-04-26 07:57:46 +02:00
aignatov-bio	84993ea3ef	Update protocol repository for new description format [SCI-3371] (#1689) ... * Update protocol repository for new description format * move image clone method to concerns	2019-04-24 13:34:56 +02:00
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Oleksii Kriuchykhin	b46f3566ef	Fix rendering of HTML in RTE fields [SCI-3111]	2019-03-19 23:32:24 +01:00
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	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	60a19734b2	Enable caching for navigation sidebar [SCI-2757]	2018-11-29 11:28:36 +01:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +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
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	ab4961ddb1	adds overlay partial	2017-06-05 11:31:05 +02:00
zmagod	67d902db52	refactor	2017-06-05 10:43:58 +02:00
zmagod	1c021b11db	adds drag and drop files upload to steps [fixes SCI-1310]	2017-06-02 16:34:09 +02:00
zmagod	acc5594f1b	add popup for approval to complete the Task [fixes SCI-1200]	2017-05-04 12:41:22 +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
Oleksii Kriuchykhin	cf8566df33	Add task complete/uncomplete functionality [SCI-999]	2017-02-10 14:27:20 +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
Oleksii Kriuchykhin	75031e17b9	Remove double sanitization from views [SCI-102]	2017-01-12 16:54:15 +01:00
Oleksii Kriuchykhin	0350f2f792	Add html escaping to name filelds in the views [SCI-102]	2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin	0546716a0b	Improve user input sanitization, fix bugs [SCI-102]	2017-01-11 15:50:11 +01:00
Oleksii Kriuchykhin	d2b76d8385	Improved image preview modal [SCI-694]	2016-12-19 17:36:18 +01:00
Oleksii Kriuchykhin	0541253ffa	Added modal for images preview [SCI-694]	2016-12-16 15:53:16 +01:00
Oleksii Kriuchykhin	d2491a18a4	Tutorial Save Protocol step added [SCI-571]	2016-11-11 10:06:18 +01:00
zmagod	1eb9f772f4	refactor sciNote comments js and unified all comments behavior [fixes SCI-474]	2016-09-27 10:30:48 +02:00
zmagod	02bfa1949e	fixed project comments	2016-09-27 09:00:02 +02:00
zmagod	9f56df02d2	removes comment tab and add comment in the info tab [fixes SCI-436]	2016-09-20 18:53:51 +02:00
zmagod	e3ae22763e	removed comments tab in protocol step	2016-09-15 08:46:14 +02:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00