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
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
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
application.js.erb	Fix activities button misbehaviour with turbolinks [SCI-1412]	2017-06-30 16:33:52 +02:00
assets.js
comments.js.erb
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
sidebar.js.erb