Zmago Devetak 0583979cf9 Merge pull request #993 from ZmagoD/zd_SCI_2039 ... fixes errors with form id duplicates [fixes SCI-2039]		2018-02-15 11:10:43 +01:00
..
assets	fixes bug with assets upload on task result page,	2018-02-06 15:39:19 +01:00
controllers	Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places.	2018-02-14 14:19:22 +01:00
datatables	Merge pull request #911 from mlorb/ml-sci-1797	2018-01-05 16:03:55 +01:00
helpers	Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]	2018-02-14 14:19:22 +01:00
javascript	Comment react-hijack code	2018-02-06 08:00:29 +01:00
mailers
models	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
permissions	Minor experiment level permissions refactoring.	2018-02-14 14:19:22 +01:00
serializers	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
services	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
utilities	Merge pull request #951 from okriuchykhin/ok_SCI_1949	2018-01-23 14:02:54 +01:00
views	Merge pull request #993 from ZmagoD/zd_SCI_2039	2018-02-15 11:10:43 +01:00