Luka Murn 070450f813 Merge branch 'release-1.12.11' ... Conflicts: config/initializers/extends.rb		2018-03-01 14:04:57 +01:00
..
activities
assets
canvas	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
client_api	Update notification settings accessor names and update Rubocop config [SCI-1968]	2018-01-29 16:15:12 +01:00
comments
experiments	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
layouts
my_module_comments
my_module_tags	Project level permissions refactoring (mostly names).	2018-02-14 13:16:32 +01:00
my_modules	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
project_activities
project_comments	Project level permissions refactoring (mostly names).	2018-02-14 13:16:32 +01:00
projects	Grouped permissions for experiment with canaid gem (WIP).	2018-02-14 14:19:00 +01:00
protocols	Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom	2018-02-16 14:14:51 +01:00
reports	Project level permissions refactoring (mostly names).	2018-02-14 13:16:32 +01:00
repositories
result_assets
result_comments
result_tables
result_texts
results	Add extendable file types mappings for icons [PIP-46]	2018-02-26 14:23:02 +01:00
sample_groups
sample_my_modules
sample_types
samples
search	Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]	2018-02-14 14:19:22 +01:00
shared	Minor code style changes.	2018-02-14 14:19:22 +01:00
step_comments
steps	Merge branch 'release-1.12.11'	2018-03-01 14:04:57 +01:00
teams
user_my_modules
user_notifications
user_projects	Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.	2018-02-14 13:16:32 +01:00
users	Merge pull request #993 from ZmagoD/zd_SCI_2039	2018-02-15 11:10:43 +01:00
zip_exports