Luka Murn ae5bccf709 Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile.lock app/datatables/repository_datatable.rb app/models/repository_cell.rb		2017-08-07 08:45:53 +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-08-07 08:45:53 +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	Merge pull request #738 from ZmagoD/zd_SCI_1452	2017-07-12 14:50:29 +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	adds file link	2017-03-17 16:40:57 +01:00
comments.js.erb	Add counters for users and comments on canvas [SCI-152]	2017-05-08 17:32:55 +02:00
my_modules.js	Also make button icons work when rendering them via JS	2017-03-08 13:55:10 +01:00
navigation.js	Fix activities button misbehaviour with turbolinks [SCI-1412]	2017-06-30 16:33:52 +02:00
notifications.js	JS code improvement [SCI-442]	2016-10-05 15:51:11 +02:00
search.js	Improve code style [SCI-1158]	2017-05-08 18:00:14 +02:00
sidebar.js.erb	Removed unneeded ERB tags, which caused error. Minor refactoring.	2016-10-17 11:57:47 +02:00