scinote-web/app/views/steps
Luka Murn cf72da5635 Merge branch 'improved-files-handling' into 'master'
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
2017-01-18 11:29:40 +01:00
..
_edit.html.erb cleanup direct upload 2016-12-08 11:26:13 +01:00
_empty_step.html.erb Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
_form_assets.html.erb Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
_form_checklists.html.erb Add a smart_text_area tag & implement it throughout application 2016-11-16 17:57:01 +01:00
_form_tables.html.erb Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
_new.html.erb cleanup direct upload 2016-12-08 11:26:13 +01:00
_step.html.erb Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00