Zanz2 812fa3f1d5 Hopefully this will resolve my merge problems		2017-11-09 17:42:17 +01:00
..
concerns	Hound is love, Hound is life #2	2017-06-07 18:26:32 +02:00
users
activities_controller.rb
application_controller.rb
assets_controller.rb
at_who_controller.rb
canvas_controller.rb	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
custom_fields_controller.rb
experiments_controller.rb	Further canvas optimizations [SCI-1642]	2017-10-06 12:43:27 +02:00
my_module_comments_controller.rb
my_module_tags_controller.rb
my_modules_controller.rb	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
project_activities_controller.rb
project_comments_controller.rb
projects_controller.rb
protocols_controller.rb	Hopefully this will resolve my merge problems	2017-11-09 17:42:17 +01:00
reports_controller.rb	Improve memory utulization in PDF report generator [SCI-1482]	2017-10-02 11:29:22 +02:00
repositories_controller.rb	Fix importing files with empty header cells and error messages improvements [SCI-1484]	2017-07-18 14:54:35 +02:00
repository_columns_controller.rb	fix permissions	2017-06-12 17:34:36 +02:00
repository_rows_controller.rb	Fix adding and editing repository items [SCI-1519]	2017-07-26 11:22:26 +02:00
result_assets_controller.rb	adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]	2017-06-07 13:29:39 +02:00
result_comments_controller.rb
result_tables_controller.rb
result_texts_controller.rb
results_controller.rb
sample_groups_controller.rb
sample_my_modules_controller.rb
sample_types_controller.rb
samples_controller.rb
search_controller.rb	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
step_comments_controller.rb
steps_controller.rb	Truncate activity taking smart annotations into account fixes [SCI-1249]	2017-08-02 15:51:32 +02:00
tags_controller.rb
teams_controller.rb	Fix importing files with empty header cells and error messages improvements [SCI-1484]	2017-07-18 14:54:35 +02:00
tiny_mce_assets_controller.rb
user_my_modules_controller.rb
user_notifications_controller.rb
user_projects_controller.rb
user_repositories_controller.rb	PR fixes [SCI-1274]	2017-06-07 15:23:25 +02:00
user_samples_controller.rb
wopi_controller.rb	Merge pull request #732 from biosistemika/business_users	2017-07-11 13:34:56 +02:00
zip_exports_controller.rb