Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master' ... Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss		2016-11-17 16:39:33 +01:00
..
module_archive	Fix my_modules archive page	2016-08-08 15:04:02 +02:00
_clone_modal.html.erb	adds label to current project in clone experiment modal [fixes SCI-341]	2016-09-07 08:26:36 +02:00
_dropdown_actions.html.erb	Set actions/routes/view for move experiment	2016-08-12 11:26:18 +02:00
_edit_modal.html.erb	sets edit experiment validation	2016-09-06 11:46:28 +02:00
_form.html.erb	Add a smart_text_area tag & implement it throughout application	2016-11-16 17:57:01 +01:00
_move_modal.html.erb	sets front end validation for experiment move action [fixes SCI-400]	2016-09-02 16:31:17 +02:00
_new_modal.html.erb	sets front end validation for new experiment modal [fixes SCI-348]	2016-09-06 11:44:03 +02:00
canvas.html.erb	Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-11 10:07:34 +01:00
module_archive.html.erb	Fix my_modules archive page	2016-08-08 15:04:02 +02:00
samples.html.erb	fixes samples page for experiment level [fixes SCI-44]	2016-08-02 08:44:07 +02:00