Luka Murn 8254153bb9 Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock app/models/connection.rb app/models/experiment.rb app/models/my_module.rb		2017-10-23 08:57:57 +02:00
..
experiments	new experiment redirection	2017-04-20 17:55:28 +02:00
my_modules	fix bug with tinyMCE text validaton	2017-09-07 14:54:12 +02:00
projects	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
protocols	fix bug with tinyMCE text validaton	2017-09-07 14:54:12 +02:00
reports	Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]	2017-06-20 16:10:50 +02:00
repositories	Merge branch 'master' into rails-5.1	2017-09-21 08:27:38 +02:00
results	Fixes error message [fixes SCI-1129]	2017-06-28 11:17:50 +02:00
samples	Merge branch 'master' into rails-5.1	2017-07-06 15:12:15 +02:00
sitewide	Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 11:38:23 +02:00
users	fix bug with changing user own role from admin to normal user	2017-04-12 16:56:10 +02:00
application.js.erb	Fix activities button misbehaviour with turbolinks [SCI-1412]	2017-06-30 16:33:52 +02:00
assets.js
comments.js.erb	Add counters for users and comments on canvas [SCI-152]	2017-05-08 17:32:55 +02:00
my_modules.js
navigation.js	Fix activities button misbehaviour with turbolinks [SCI-1412]	2017-06-30 16:33:52 +02:00
notifications.js
search.js	Improve code style [SCI-1158]	2017-05-08 18:00:14 +02:00
sidebar.js.erb