1517 commits

Author	SHA1	Message	Date
zmagod	8d0c22327b	adds asc order to checklists [fixes SCI-1228]	2017-05-04 15:17:34 +02:00
mz3944	0ebf294844	Merge pull request #562 from mz3944/mz-SCI-1187 ... Added general locale for cases when a name is optional and is not spe…	2017-04-18 15:26:35 +02:00
Matej Zrimšek	a889174938	Name of result tables should be nil, as it can't be specified. [fixes SCI-1187]	2017-04-18 15:08:13 +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
Zmago Devetak	e1a30cc17c	Merge pull request #558 from ZmagoD/zd_SCI_1192 ... fixes broken users search method for smart annotation [fixes SCI-1192]	2017-04-14 15:38:33 +02:00
zmagod	8af3858209	fix hound	2017-04-14 11:13:58 +02:00
zmagod	9ee971c24b	fixes broken users search method for smart annotation [fixes SCI-1192]	2017-04-13 16:14:12 +02:00
Zmago Devetak	cb1ad9e0be	Merge pull request #555 from ZmagoD/zd_SCI_1103 ... adds additional explanations [fixes SCI-1103]	2017-04-13 15:15:08 +02:00
zmagod	0987cf8abc	fixes hound alerts	2017-04-13 14:55:18 +02:00
Zmago Devetak	40af0df882	Merge pull request #551 from ZmagoD/zd_SCI_1189 ... fixes the user_name field in csv export [fixes SCI-1189]	2017-04-13 14:36:44 +02:00
zmagod	a6183af63d	fix method_missing again	2017-04-13 14:34:58 +02:00
mlorb	ddc0e86c92	Merge pull request #556 from mlorb/ml_sci_1174 ... Fix bug with changing user own role from admin to normal user [SCI-1174]	2017-04-13 14:33:58 +02:00
Zmago Devetak	ec60044949	Merge pull request #548 from ZmagoD/zd_SCI_1129_v2 ... Disables annimateSpiner in result assets actions	2017-04-13 14:06:50 +02:00
zmagod	0534bce1ed	adds super in method_missing	2017-04-13 14:03:56 +02:00
zmagod	241af0620a	fixes hound alerts	2017-04-13 13:27:43 +02:00
zmagod	b6daf2648b	refactor zip_export	2017-04-13 13:01:05 +02:00
zmagod	f104444a0c	adds additional explanations [fixes SCI-1103]	2017-04-12 16:56:47 +02:00
Mojca Lorber	27c661d7c4	fix bug with changing user own role from admin to normal user	2017-04-12 16:56:10 +02:00
Oleksii Kriuchykhin	181d981a51	Add image preview to protocol repository [SCI-877]	2017-04-12 16:05:38 +02:00
mlorb	2932052628	Merge pull request #549 from mlorb/ml_sci_1172 ... Fix overlapping text in audit trail table [SCI-1172, SCI-1181]	2017-04-12 15:10:48 +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
Zmago Devetak	9c31239318	Merge pull request #552 from biosistemika/release-1.9.0 ... Release 1.9.1	2017-04-12 13:08:37 +02:00
zmagod	f4fdb840d8	fixes the user_name field in csv export [fixes SCI-1189]	2017-04-12 09:05:54 +02:00
Oleksii Kriuchykhin	07d658ab82	Improve speed of search [SCI-1157]	2017-04-11 14:55:44 +02:00
Mojca Lorber	b09c18a9bc	fix overlaping text in audit trail table	2017-04-11 14:29:31 +02:00
zmagod	929d8aab5e	disables annimateSpiner in result assets actions	2017-04-10 15:40:36 +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
Zmago Devetak	ccb6cd0c8c	Merge pull request #546 from ZmagoD/zd_SCI_1185 ... adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-10 09:12:03 +02:00
Luka Murn	cd4664e4d0	Merge pull request #544 from Ducz0r/lm-sci-794-fix ... Only require jquery-ui-sortable on samples page [SCI-794]	2017-04-10 07:44:57 +02:00
mz3944	2c78d10768	Merge pull request #532 from biosistemika/mz-SCI-1150 ... Fixed so that file deletion callbacks are triggered	2017-04-07 15:18:43 +02:00
zmagod	122e638b7e	adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-07 15:01:26 +02:00
Luka Murn	becdd687a6	Only require jquery-ui-sortable on samples page ... (hopefully) closes SCI-794.	2017-04-07 13:05:22 +02:00
zmagod	9610c5f5a0	fix info dropdown links [fixes SCI-1141]	2017-04-07 11:31:09 +02:00
Matej Zrimšek	1447a34dc7	Files didn't get deleted in previous commit. [fixes SCI-1150]	2017-04-06 16:59:34 +02:00
okriuchykhin	aa776aaa71	Merge pull request #541 from okriuchykhin/ok_SCI_615 ... Fix moving of the steps after adding a new one [SCI-615]	2017-04-06 15:50:01 +02:00
zmagod	e77df92017	fix samples_controller	2017-04-06 15:26:24 +02:00
zmagod	9bb1bb3f9b	refactor [fixes SCI-825]	2017-04-06 15:08:03 +02:00
zmagod	439cd0cd89	add notification to experiments	2017-04-06 14:55:18 +02:00
zmagod	046b608018	add notification for my_module/project comments	2017-04-06 14:07:22 +02:00
zmagod	b398bb7516	add step annotations methods in steps_action concerns	2017-04-06 13:06:20 +02:00
zmagod	f16607579f	refactor steps annotation	2017-04-06 13:03:13 +02:00
Oleksii Kriuchykhin	5c0197220d	Fix moving of the steps after adding a new one [SCI-615]	2017-04-06 12:53:21 +02:00
Matej Zrimšek	e72184d10d	Fixed so that file deletion callbacks are triggered (and hence audit trails for this is generated). [fixes SCI-1150]	2017-04-06 11:34:03 +02:00
mlorb	4855111dcb	Merge pull request #540 from mlorb/ml_sci_1089_v2 ... Remove ERROR from message [SCI-1089]	2017-04-06 10:44:20 +02:00
zmagod	bb437bd8c5	adds notification to results annotation	2017-04-06 09:33:49 +02:00
zmagod	d331911ffe	completed step annotations	2017-04-06 08:42:16 +02:00
mlorb	e9441559d3	Merge pull request #538 from mlorb/ml_sci_1044_vol3 ... Change helper method for user info popover	2017-04-05 17:04:30 +02:00
Mojca Lorber	5e62046627	remove ERROR from message	2017-04-05 14:40:55 +02:00