okriuchykhin fd805f4072 Merge pull request #259 from okriuchykhin/ok_SCI_605 ... Added additional activities [SCI-605]		2016-11-07 10:01:16 +01:00
..
assets	merging	2016-11-02 14:06:20 +01:00
controllers	Futher improvement of samples assign/unassign logging [SCI-605]	2016-11-07 09:29:56 +01:00
datatables	Fix bug with linked tasks	2016-08-24 17:22:16 +02:00
helpers	fixed typos and added truncation to org name	2016-10-17 15:21:19 +02:00
mailers	Bugfix for notification emails	2016-10-13 12:12:28 +02:00
models	Added additional activities [SCI-605]	2016-11-02 10:43:36 +01:00
utilities	fixed typos and added truncation to org name	2016-10-17 15:21:19 +02:00
views	fix merge conflict problem with avatar on profile page	2016-11-03 15:23:09 +01:00