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
..
experiments	new experiment redirection	2017-04-20 17:55:28 +02:00
my_modules	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
projects	Add counters for users and comments on canvas [SCI-152]	2017-05-08 17:32:55 +02:00
protocols	Merge pull request #658 from ZmagoD/zd_SCI_1011	2017-06-09 10:03:33 +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-07-06 15:12:15 +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	fixes drag'n drop bug in results on safari [fixes SCI-1370]	2017-06-14 09:45:49 +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