Luka Murn 53699193a2 Merge branch 'smart-annotations' ... Conflicts: app/assets/javascripts/comments.js.erb app/assets/javascripts/protocols/index.js app/assets/javascripts/protocols/steps.js.erb app/assets/javascripts/samples/sample_datatable.js.erb app/controllers/my_module_comments_controller.rb app/controllers/project_comments_controller.rb app/controllers/result_comments_controller.rb app/controllers/step_comments_controller.rb app/datatables/sample_datatable.rb app/views/my_module_comments/_comment.html.erb app/views/project_comments/_comment.html.erb app/views/projects/show/_experiment.html.erb app/views/reports/elements/_experiment_element.html.erb app/views/reports/elements/_result_comments_element.html.erb app/views/reports/elements/_result_text_element.html.erb app/views/reports/elements/_step_checklist_element.html.erb app/views/reports/elements/_step_comments_element.html.erb app/views/reports/elements/_step_element.html.erb app/views/result_comments/_comment.html.erb app/views/results/_result_text.html.erb app/views/step_comments/_comment.html.erb app/views/steps/_step.html.erb db/schema.rb		2017-01-24 14:33:23 +01:00
..
extend	fix hound	2017-01-13 11:18:44 +01:00
partials
themes	Merge branch 'smart-annotations'	2017-01-24 14:33:23 +01:00
application.scss	fix some bugs	2017-01-19 11:37:59 +01:00
constants.scss	Restyle atwho dropdown	2017-01-05 14:06:48 +01:00
mixins.scss
my_modules.scss	Merge branch 'improved-files-handling' into 'master'	2017-01-18 11:29:40 +01:00
notifications.scss
projects.scss	adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]	2016-11-23 14:18:50 +01:00
reports.scss	small fixes	2017-01-19 16:42:14 +01:00
reports_pdf.scss
reports_print.scss	add names to tables from protocol steps in reports	2017-01-18 14:22:19 +01:00
sample_types_groups.scss	changes create/edit mode buttons [fixes SCI-777]	2016-12-12 14:42:06 +01:00
samples.scss
search.scss
steps.scss