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
..
_element_controls.html.erb
_experiment_element.html.erb	set flask icon to experiment [fixes SCI-330]	2016-08-17 14:17:29 +02:00
_my_module_activity_element.html.erb
_my_module_element.html.erb
_my_module_samples_element.html.erb
_new_element.html.erb	Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-11 10:07:34 +01:00
_project_header_element.html.erb
_result_asset_element.html.erb	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
_result_comments_element.html.erb
_result_table_element.html.erb
_result_text_element.html.erb	fixed bullets	2016-11-16 15:30:14 +01:00
_step_asset_element.html.erb	Removed ruby constants duplicates in JS, because of caching problems.	2016-10-17 11:57:47 +02:00
_step_checklist_element.html.erb	Merge branch 'master' into experiment-level	2016-08-17 09:28:35 +02:00
_step_comments_element.html.erb
_step_element.html.erb	fixed bullets	2016-11-16 15:30:14 +01:00
_step_table_element.html.erb	Merge branch 'master' into experiment-level	2016-08-17 09:28:35 +02:00