scinote-web/app/controllers
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master'
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
2018-11-14 16:59:04 +01:00
..
api Merge branch 'core-api' into 'master' 2018-11-14 16:59:04 +01:00
client_api Partially fixed according to pull request review, added comments to code review 2018-08-31 12:11:51 +02:00
concerns
users Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
activities_controller.rb Fix error on activities page when user doesn't have any [SCI-2628] 2018-08-20 14:26:42 +02:00
application_controller.rb move FirstTimeDataGenerator helper from applictaion controller 2018-07-11 11:19:39 +02:00
assets_controller.rb
at_who_controller.rb
canvas_controller.rb
custom_fields_controller.rb
experiments_controller.rb Fix fetching all user projects [SCI-2787] 2018-10-24 00:29:30 +02:00
my_module_comments_controller.rb
my_module_tags_controller.rb
my_modules_controller.rb Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00
project_activities_controller.rb
project_comments_controller.rb
projects_controller.rb Fix root page bug introduced with merge features/core-api -> master 2018-11-13 21:24:20 +01:00
protocols_controller.rb Found a new, and more elegant fix inside controller with Luka 2018-08-28 14:48:23 +02:00
reports_controller.rb
repositories_controller.rb
repository_columns_controller.rb
repository_list_items_controller.rb
repository_rows_controller.rb Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
result_assets_controller.rb
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 Remove Samples from search controller [SCI-2739] 2018-09-18 15:03:19 +02:00
step_comments_controller.rb
steps_controller.rb Found the bug and fixed it 2018-08-21 13:26:16 +02:00
tags_controller.rb
teams_controller.rb Merge branch 'features/export-all' 2018-11-13 09:14:02 +01:00
tiny_mce_assets_controller.rb
user_my_modules_controller.rb
user_notifications_controller.rb
user_projects_controller.rb fix user_project manage permission 2018-11-09 11:36:44 +01:00
user_repositories_controller.rb
user_samples_controller.rb
wopi_controller.rb
zip_exports_controller.rb Refactor TeamZipExport code (move it into special file) 2018-09-16 20:28:26 +02:00