mz3944 bb21f6543c Merge pull request #1004 from mz3944/mz-SCI-2011 ... Wrapping up the permissions [SCI-2011]		2018-03-06 07:10:40 +01:00
..
header
import_export	Merge branch 'master' into null_step_crash_sci2043	2018-03-05 16:37:24 +01:00
index	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
_breadcrumbs.html.erb
_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	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
edit.html.erb
index.html.erb	Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button)	2018-01-25 13:45:35 +01:00
protocolsio_import_create.js.erb	re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches	2018-02-07 11:17:53 +01:00
protocolsio_import_save.js.erb