Zmago Devetak 40bf293ec7 Merge pull request #441 from ZmagoD/zd_SCI_924 ... adds smart annotation in task comments, refactor smart_annotation_par…		2017-01-24 11:18:41 +01:00
..
assets	Merge pull request #441 from ZmagoD/zd_SCI_924	2017-01-24 11:18:41 +01:00
controllers	display smart annotations in reports - without rich text fields	2017-01-19 14:22:54 +01:00
datatables	Fixed sample editing in samples table. [SCI-914]	2017-01-20 11:10:17 +01:00
helpers	Merge pull request #441 from ZmagoD/zd_SCI_924	2017-01-24 11:18:41 +01:00
mailers	Bugfix for notification emails	2016-10-13 12:12:28 +02:00
models	fixed user without permissions bug [fixes SCI-922]	2017-01-23 10:53:42 +01:00
utilities	Remove unneeded HTML scrabber in protocol importer [SCI-921]	2017-01-24 09:52:38 +01:00
views	adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]	2017-01-24 10:51:12 +01:00