scinote-web/app/controllers
Luka Murn 9f60ece25f Merge branch 'master' into rails-5.1
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
..
concerns Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
users first run fixing addons 2017-06-30 10:23:28 +02:00
activities_controller.rb Fix activities [SCI-1412] 2017-06-28 16:49:50 +02:00
application_controller.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
assets_controller.rb refactor 2017-03-17 16:47:58 +01:00
at_who_controller.rb fix hound 2017-04-14 11:13:58 +02:00
canvas_controller.rb Fixed permission error while cloning workflows. [fixes SCI-1291] 2017-05-26 11:14:50 +02:00
custom_fields_controller.rb refactoring 2017-03-17 17:52:15 +01:00
experiments_controller.rb Fixes error when clonning experiments with long names [SCI-617] 2017-05-12 11:07:11 +02:00
my_module_comments_controller.rb Add comments to the code [SCI-152] 2017-05-09 10:22:01 +02:00
my_module_tags_controller.rb Re-add tags index controller action to render tags 2017-01-03 09:39:41 +01:00
my_modules_controller.rb fix no repository name in activity bug 2017-06-15 09:43:10 +02:00
project_activities_controller.rb Remove uneccesary project_activities HTML pages 2016-07-29 16:06:35 +02:00
project_comments_controller.rb Add comments to the code [SCI-152] 2017-05-09 10:22:01 +02:00
projects_controller.rb adds persistence to experiments order in project overview [fixes SCI-974] 2017-05-15 09:54:37 +02:00
protocols_controller.rb add experiment to activities 2017-04-20 13:16:11 +02:00
reports_controller.rb Allow saving & editing of reports with repository elements 2017-06-07 16:55:00 +02:00
repositories_controller.rb Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402] 2017-06-26 16:50:40 +02:00
repository_columns_controller.rb fix permissions 2017-06-12 17:34:36 +02:00
repository_rows_controller.rb refactor 2017-06-22 17:32:12 +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 add experiment level to user smart annotation notification 2017-04-20 13:21:02 +02:00
result_tables_controller.rb add experiment to activities 2017-04-20 13:16:11 +02:00
result_texts_controller.rb Add missing include [SCI-1306] 2017-05-25 08:57:50 +02:00
results_controller.rb add experiment to activities 2017-04-20 13:16:11 +02:00
sample_groups_controller.rb rename Organization to Team in controllers 2017-01-24 17:06:51 +01:00
sample_my_modules_controller.rb rename Organization to Team in controllers 2017-01-24 17:06:51 +01:00
sample_types_controller.rb rename Organization to Team in controllers 2017-01-24 17:06:51 +01:00
samples_controller.rb fix samples_controller 2017-04-06 15:26:24 +02:00
search_controller.rb Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
step_comments_controller.rb add experiment level to user smart annotation notification 2017-04-20 13:21:02 +02:00
steps_controller.rb adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +02:00
tags_controller.rb Remove tags 2016-11-19 16:57:08 +01:00
teams_controller.rb rename method 2017-06-07 13:51:16 +02:00
tiny_mce_assets_controller.rb adds team space related methods 2017-04-25 13:44:31 +02:00
user_my_modules_controller.rb Add comments to the code [SCI-152] 2017-05-09 10:22:01 +02:00
user_notifications_controller.rb Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
user_projects_controller.rb fixes remove user action on project [fixes SCI-1261] 2017-05-12 16:18:53 +02:00
user_repositories_controller.rb PR fixes [SCI-1274] 2017-06-07 15:23:25 +02:00
user_samples_controller.rb rename controllers where org/organization 2017-01-24 16:57:14 +01:00
wopi_controller.rb fixes breadcrumbs in office file [fixes SCI-1111] 2017-03-20 13:48:45 +01:00
zip_exports_controller.rb Fix dowloand of export zip files from local storage [SCI-1128] 2017-04-26 13:23:30 +02:00