206 commits

Author	SHA1	Message	Date
Mojca Lorber	da98788031	small code fixes	2017-06-06 09:57:50 +02:00
Mojca Lorber	13bf4ad229	create new repository	2017-06-06 09:54:39 +02:00
Matej Zrimšek	419d638163	Renamed reposiotry edit and destroy permission helper. [fix 1269]	2017-06-05 17:36:26 +02:00
Matej Zrimšek	5c9a453439	Added permissions for deleting and renaming of repositories. [SCI-1269]	2017-06-02 17:50:34 +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
Matej Zrimšek	19ffd77d32	Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305]	2017-05-26 18:14:15 +02:00
Oleksii Kriuchykhin	157b1630b9	Add missing include for sinitize_input [SCI-1309]	2017-05-25 16:28:06 +02:00
mlorb	58ac457d38	fix merge bug	2017-05-23 11:32:02 +02:00
mlorb	872f712be8	Merge branch 'custom-repositories' into ml_sci_1266_v2	2017-05-23 11:05:25 +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
Oleksii Kriuchykhin	ad39d09a53	Disable turbolinks on search links to fix JS errors [SCI-452]	2017-05-12 13:23:29 +02:00
Zmago Devetak	9911c0d148	Merge pull request #613 from ZmagoD/zd_SCI_1241_v3 ... replace all ActionController::Base.helpers.sanitize calls with custom…	2017-05-11 14:30:26 +02:00
zmagod	80a0af8c9f	replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]	2017-05-11 11:36:47 +02:00
okriuchykhin	f239238064	Merge pull request #611 from okriuchykhin/ok_SCI_1252 ... Fix root_url method unavailable in application_helper [SCI-1252]	2017-05-11 11:15:00 +02:00
Oleksii Kriuchykhin	229693ec61	Fix root_url method unavailable in application_helper [SCI-1252]	2017-05-10 18:15:08 +02:00
zmagod	511f39e093	add constants	2017-05-10 15:33:33 +02:00
zmagod	10db322307	fixes input sanitize method [fixes SCI-1248]	2017-05-10 14:57:11 +02:00
Zmago Devetak	13570ba5cb	Merge pull request #602 from ZmagoD/zd_SCI_1247 ... fixes pdf export and image size [fixes SCI-1247]	2017-05-10 09:31:55 +02:00
Zmago Devetak	cd503580b2	Merge pull request #599 from ZmagoD/zd_SCI_1241 ... fix samples bug [SCI-1241]	2017-05-09 15:55:43 +02:00
Mojca Lorber	7ca62a16bb	fix hound	2017-05-09 14:55:23 +02:00
Mojca Lorber	e1475fbfef	fix bug with avatar in system log	2017-05-09 14:40:02 +02:00
zmagod	2d69896897	fixes pdf export and image size [fixes SCI-1247]	2017-05-09 13:59:59 +02:00
zmagod	df13478186	fix samples bug [SCI-1241]	2017-05-09 11:25:00 +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	d6f303581f	refactor	2017-05-08 12:56:33 +02:00
Zmago Devetak	e47bf8f013	Merge pull request #582 from ZmagoD/zd_SCI_1051 ... fix reports pdf for user annotation [SCI-1051]	2017-05-08 10:24:40 +02:00
zmagod	b22350136f	adds label to step in report [fixes SCI-488]	2017-05-05 09:45:18 +02:00
zmagod	289a148332	refactor	2017-05-03 15:33:23 +02:00
zmagod	5b58824ec0	refactor	2017-05-03 15:30:08 +02:00
zmagod	1b618e88e5	fix reports pdf for user annotation [SCI-1051]	2017-05-03 10:50:43 +02:00
osboxes.org	21a39fc704	Code indentation corrected [fixes SCI-1214]	2017-04-28 10:31:14 +01:00
osboxes.org	f72802f9f2	Tab Teams is highlighted when in Audit trails [fixes SCI-1214]	2017-04-26 16:31:44 +01:00
zmagod	1fefeee3d1	adds team space related methods	2017-04-25 13:44:31 +02:00
zmagod	66f43803c0	refactor, fix user annotation bug	2017-04-24 16:22:25 +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	0fe84c4e24	Merge pull request #550 from okriuchykhin/ok_SCI_1157 ... Improve speed of search [SCI-1157]	2017-04-12 13:11:26 +02:00
Oleksii Kriuchykhin	07d658ab82	Improve speed of search [SCI-1157]	2017-04-11 14:55:44 +02:00
Zmago Devetak	91793c295a	Merge pull request #542 from ZmagoD/zd_SCI_825 ... Smart annotations and Notifications	2017-04-10 15:10:17 +02:00
zmagod	90faeec410	fixes typos and protocol step links	2017-04-10 11:21:28 +02:00
zmagod	9bb1bb3f9b	refactor [fixes SCI-825]	2017-04-06 15:08:03 +02:00
zmagod	d331911ffe	completed step annotations	2017-04-06 08:42:16 +02:00
Mojca Lorber	a0fe47a05d	change helper method for user info popover	2017-04-04 15:22:41 +02:00
zmagod	99c116f257	first run	2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin	2faa137f67	Add user popover method for users [SCI-1127]	2017-04-03 15:10:00 +02:00
zmagod	239a44c26b	change send to public_send	2017-03-24 16:25:50 +01:00
zmagod	4635a3320d	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends	2017-03-24 16:09:28 +01:00
zmagod	5cc6cd094e	refactor	2017-03-17 16:47:58 +01:00