scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 18:21:04 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/assets/javascripts
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
..
experiments refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
my_modules Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
projects Added additional checks for tutorial steps [SCI-703] 2016-11-22 13:55:23 +01:00
protocols Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
reports Added additional checks for tutorial steps [SCI-703] 2016-11-22 13:55:23 +01:00
results Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
samples Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
sitewide Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
users Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
application.js.erb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
assets.js Enable image preview for newly uploaded images [SCI-694] 2017-01-06 16:41:24 +01:00
comments.js.erb adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
my_modules.js
navigation.js fixes padding on mobile, added separator on team switch dropdown, focus search input 2016-10-21 11:46:59 +02:00
notifications.js
sidebar.js.erb Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00