660 commits

Author	SHA1	Message	Date
Matej Zrimšek	791bb934ca	Remove repository modal logic (WIP). [SCI-1269]	2017-06-02 17:50:33 +02:00
Matej Zrimšek	b92a760a5c	Added dropdown GUI for editing repository. [SCI-1269]	2017-06-02 17:47:28 +02:00
Luka Murn	fcc3995049	Merge pull request #647 from biosistemika/master ... Bring latest master changes into custom-repositories	2017-05-30 14:18:14 +02:00
Zmago Devetak	1df6265326	Merge pull request #627 from ZmagoD/zd_SCI_1280 ... prevent to duplicate new step [fixes SCI-1280]	2017-05-29 09:55:22 +02:00
Mojca Lorber	c3051421b2	change truncate function	2017-05-25 11:01:24 +02:00
Mojca Lorber	8540f88b7e	small fix - renaming of ids and hrefs	2017-05-25 10:06:48 +02:00
mlorb	872f712be8	Merge branch 'custom-repositories' into ml_sci_1266_v2	2017-05-23 11:05:25 +02:00
mz3944	6b8c8deb16	Merge pull request #634 from mz3944/mz-SCI-414 ... Uncompleted steps not added to Reports	2017-05-23 09:58:05 +02:00
Oleksii Kriuchykhin	b223646f07	Small improvements [SCI-1273]	2017-05-23 08:53:53 +02:00
Mojca Lorber	a716a0b1db	change breadcrumbs on protocol managements page	2017-05-22 17:58:42 +02:00
Mojca Lorber	9ae615264d	add global repositories screen - tab control	2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin	e99e3edb7b	Add repositories dropdown to task navigation [SCI-1273]	2017-05-18 14:21:00 +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	f78c80b148	Added possibility to add uncompleted steps to report. [closes SCI-414]	2017-05-17 13:25:21 +02:00
zmagod	b21923cf98	prevent to duplicate new step [fixes SCI-1280]	2017-05-16 11:52:07 +02:00
Matej Zrimšek	2c6f888cbc	Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487]	2017-05-15 18:56:41 +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
Matej Zrimšek	ba693c65a8	Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	dbb79ebab1	Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Matej Zrimšek	b97cb91840	Refactoring of modal for adding content to report. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Matej Zrimšek	27cfd55ea5	Simplified popup modal for adding contents to report. [fixes SCI-487]	2017-05-15 17:43:12 +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	d34b2520b5	refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]	2017-05-12 15:59:58 +02:00
zmagod	070a829c49	change new results hendlers	2017-05-12 10:02:33 +02:00
Oleksii Kriuchykhin	bb8c7c342c	Add additional info to samples info modal [SCI-960]	2017-05-11 22:20:06 +02:00
zmagod	81a3cb0a41	adds results js code in modules	2017-05-11 16:54:28 +02:00
okriuchykhin	15f19b73fb	Merge pull request #610 from okriuchykhin/ok_SCI_1253 ... Add notifications counter badge to project card [SCI-1253]	2017-05-11 11:11:09 +02:00
okriuchykhin	000ca26452	Merge pull request #607 from okriuchykhin/ok_SCI_1243 ... Add specific classes to task card for analytics [SCI-1243]	2017-05-11 11:10:05 +02:00
Oleksii Kriuchykhin	a5926726ce	Add notifications counter badge to project card [SCI-1253]	2017-05-10 17:28:37 +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
Oleksii Kriuchykhin	08e7f09d07	Add specific classes to task card for analytics [SCI-1243]	2017-05-10 10:33:34 +02:00
okriuchykhin	ccc640f2bc	Merge pull request #593 from okriuchykhin/ok_SCI_1158 ... Add advanced search options [SCI-1158]	2017-05-09 10:23:34 +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
Oleksii Kriuchykhin	0ee7e11620	Add advanced search options [SCI-1158]	2017-05-05 16:41:23 +02:00
Zmago Devetak	de3d1172c1	Merge pull request #584 from ZmagoD/zd_SCI_1200 ... add popup for approval to complete the Task [fixes SCI-1200]	2017-05-05 14:57:27 +02:00
Zmago Devetak	28042d11e1	Merge pull request #589 from ZmagoD/zd_SCI_488 ... adds label to step in report [fixes SCI-488]	2017-05-05 14:56:01 +02:00
zmagod	b22350136f	adds label to step in report [fixes SCI-488]	2017-05-05 09:45:18 +02:00
zmagod	8d0c22327b	adds asc order to checklists [fixes SCI-1228]	2017-05-04 15:17:34 +02:00
zmagod	acc5594f1b	add popup for approval to complete the Task [fixes SCI-1200]	2017-05-04 12:41:22 +02:00
Mojca Lorber	f8f6a5f63a	fix bug edit canvas not working and fix positioning of cloned task/workflow	2017-05-04 10:54: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
zmagod	86c6ae3b03	display tinyMCE images in reports	2017-04-25 09:53:35 +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
zmagod	c25df63a14	add tinymce img importer and refactor input sanitize helper	2017-04-19 09:11:52 +02:00
okriuchykhin	3d805d529d	Merge pull request #554 from okriuchykhin/ok_SCI_877 ... Add image preview to protocol repository [SCI-877]	2017-04-18 08:58:39 +02:00
Oleksii Kriuchykhin	4fac6484b5	Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]	2017-04-14 16:05:35 +02:00
zmagod	f104444a0c	adds additional explanations [fixes SCI-1103]	2017-04-12 16:56:47 +02:00