scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 23:15:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/views/my_modules
History
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
..
activities Initial code commit [SCI-102] 2017-01-05 13:04:19 +01:00
archive
modals Fix issue with long tags in dropdown list [fixes SCI-470] 2016-09-23 11:05:17 +02:00
protocols Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
_activities.html.erb Added remaining constants. 2016-10-17 11:30:05 +02:00
_description.html.erb Add a smart_text_area tag & implement it throughout application 2016-11-16 17:57:01 +01:00
_description_label.html.erb Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
_due_date.html.erb
_due_date_label.html.erb
_module_header.html.erb 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
_module_header_due_date_label.html.erb
_result.html.erb Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
_result_user_generated.html.erb remove redcarpet gem - markdown 2016-11-10 14:11:32 +01:00
_show.html.erb
_tags.html.erb
activities.html.erb Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
archive.html.erb Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
protocols.html.erb Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
results.html.erb Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
samples.html.erb Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00