Luka Murn 9d3685f872 Merge branch 'gamification' into 'master' ... Conflicts: app/controllers/users/invitations_controller.rb app/controllers/users/settings_controller.rb		2016-11-17 16:30:18 +01:00
..
experiments
my_modules	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
projects	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
protocols	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
reports	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
results	Removed unneeded ERB tags, which caused error. Minor refactoring.	2016-10-17 11:57:47 +02:00
samples	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
sitewide	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
users	Reload whole page after user is invited from team invite users modal	2016-11-15 16:21:32 +01:00
application.js.erb	hide flash after 5 sec [fixes SCI-660]	2016-11-11 12:30:48 +01:00
assets.js
comments.js.erb	Fixes issue with new comments and date separator SCI-557	2016-10-20 22:33:15 +02:00
custom_fields.js
direct-upload.js
my_modules.js
navigation.js	fixes padding on mobile, added separator on team switch dropdown, focus search input	2016-10-21 11:46:59 +02:00
notifications.js	JS code improvement [SCI-442]	2016-10-05 15:51:11 +02:00
organizations.js
project_activities.js
sidebar.js.erb	Removed unneeded ERB tags, which caused error. Minor refactoring.	2016-10-17 11:57:47 +02:00
user_my_modules.js