Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1 ... Conflicts: app/assets/javascripts/repositories/index.js		2018-04-26 11:38:54 +02:00
..
header
import_export	removed byebug :D	2018-04-04 15:19:00 +02:00
index	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
_header.html.erb	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
_steps.html.erb	refactor buttons	2018-03-29 13:58:14 +02:00
edit.html.erb	remove breadcrumbs throughout application	2018-04-17 17:00:04 +02:00
index.html.erb	Merge branch 'master' into ux-release-1	2018-04-26 11:38:54 +02:00
protocolsio_import_create.js.erb	found a hackish fix by doing a manual ajax call and some other things with jquery	2018-04-02 19:56:25 +02:00
protocolsio_import_save.js.erb	Reviewed pull request	2017-11-20 23:19:34 +01:00