Luka Murn 82f982e983 Merge branch 'rails-5.1' into decoupling-settings-page ... Conflicts: Gemfile Gemfile.lock		2017-10-23 10:59:10 +02:00
..
client_api/users	added pagination and sorting to team tables	2017-08-28 17:05:09 +02:00
activity_helper.rb	Variable name changes, added comments to code [fixes SCI-1249]	2017-10-06 17:12:15 +02:00
addons_helper.rb	Add "about" modal, prepare hooks, VERSION system for addons	2017-07-10 15:27:50 +02:00
application_helper.rb	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
bootstrap_form_helper.rb
database_helper.rb	Improve speed of search [SCI-1157]	2017-04-11 14:55:44 +02:00
file_icons_helper.rb
form_tag_helper.rb
input_sanitize_helper.rb	replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]	2017-05-11 11:36:47 +02:00
mailer_helper.rb
my_modules_helper.rb
notifications_helper.rb	Finish the user settings jsonb, also fix references throughout app	2017-08-10 14:29:01 +02:00
permission_helper.rb	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
projects_helper.rb
protocol_status_helper.rb
reports_helper.rb	fixes smart annotations bug in reports [fixes SCI-1328]	2017-06-27 11:26:32 +02:00
results_helper.rb
samples_helper.rb
search_helper.rb	Disable turbolinks on search links to fix JS errors [SCI-452]	2017-05-12 13:23:29 +02:00
secondary_navigation_helper.rb
sidebar_helper.rb	Fix case statement	2017-06-13 09:09:07 +02:00
teams_helper.rb
tiny_mce_helper.rb	Code beautification per @zmagod's request	2017-06-06 07:58:46 +02:00
user_settings_helper.rb	Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"	2017-10-17 13:10:02 +02:00
wopi_helper.rb