1497 commits

Author	SHA1	Message	Date
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
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
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
mlorb	7730493ef4	Merge pull request #535 from biosistemika/ml_sci_1044_vol2 ... Fix bug with constants	2017-04-04 15:46:50 +02:00
Mojca Lorber	b222a34a97	fix hound	2017-04-04 15:38:16 +02:00
Mojca Lorber	a0fe47a05d	change helper method for user info popover	2017-04-04 15:22:41 +02:00
okriuchykhin	8cff0a9a5b	Merge pull request #534 from okriuchykhin/ok_SCI_1127_v2 ... Add user popover method for users [SCI-1127]	2017-04-04 14:36:16 +02:00
zmagod	99c116f257	first run	2017-04-04 09:19:43 +02:00
Mojca Lorber	715fafe58c	fix bug with constants	2017-04-03 17:07:58 +02:00
Oleksii Kriuchykhin	2faa137f67	Add user popover method for users [SCI-1127]	2017-04-03 15:10:00 +02:00
zmagod	e1ee53eeb5	generates query in background worker	2017-04-03 13:37:54 +02:00
mlorb	317739af1e	Merge pull request #530 from biosistemika/ml_sci_1044 ... Add data-hook and yadcf-filter plug-in [SCI-1044]	2017-03-31 14:00:23 +02:00
Mojca Lorber	a2c1ed6994	fix constants	2017-03-31 13:53:18 +02:00
Mojca Lorber	503ee5b62e	change place of data-hook	2017-03-30 17:21:29 +02:00
Oleksii Kriuchykhin	42ccefe2ce	Remove logs table and old unused logging code [SCI-1127]	2017-03-30 11:47:57 +02:00
Mojca Lorber	9458f391e5	add data-hook and yadcf-filter plug-in	2017-03-29 15:59:51 +02:00
Zmago Devetak	2b35b34eb8	Merge pull request #529 from ZmagoD/zd_SCI_1135 ... fixes alert messages in samples [fixes SCI-1135]	2017-03-29 14:57:11 +02:00
Zmago Devetak	0019fd19ea	Merge pull request #525 from ZmagoD/zd_SCI_765 ... Export large files - utility class	2017-03-29 11:55:51 +02:00
zmagod	0096f9dc14	refactor	2017-03-29 09:32:23 +02:00
okriuchykhin	05a49e5a82	Merge pull request #528 from okriuchykhin/ok_SCI_1133 ... Fix secondary navigation on Mac [SCI-1133]	2017-03-29 09:30:34 +02:00
zmagod	9ce95470b3	fixes alert messages in samples [fixes SCI-1135]	2017-03-28 15:14:05 +02:00
Oleksii Kriuchykhin	391c5af267	Fix secondary navigation on Mac [SCI-1133]	2017-03-28 14:36:52 +02:00
zmagod	7039420f99	add hook to canvas module actions	2017-03-28 10:43:39 +02:00