scinote-web/app/assets/javascripts/sitewide
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
..
.keep Initial commit. 2016-02-12 16:52:43 +01:00
atwho_res.js.erb fixes checklist item user popover bug [fixes SCI-907] 2017-01-23 09:47:04 +01:00
draw_components.js Added deleting of files on S3 server when editing/removing a file. Some refactoring. 2016-08-17 18:13:35 +02:00
form_cleanups.js Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step). 2016-08-25 22:26:53 +02:00
form_errors.js Some JS error refactoring and accordingly updated error rendering when experiment description is too long. 2016-09-08 12:43:31 +02:00
form_validators.js.erb fix some bugs 2017-01-19 11:37:59 +01:00
gestures.js Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step). 2016-08-25 22:26:53 +02:00
image_preview.js Enable image preview after editing protocol and disable preview modal animation [SCI-868] 2017-01-09 17:19:46 +01:00
invite_users_modal.js.erb Closes SCI-648 2016-11-10 16:18:17 +01:00
rough_size_of_object.js Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
sample_info_modal.js Add sample info modal popup to sample smart annotations 2017-01-16 15:52:02 +01:00
string_utils.js fixes long names in columns dropdown [fixes SCI-784] 2016-12-13 14:54:37 +01:00
textarea_autosize.js Add a smart_text_area tag & implement it throughout application 2016-11-16 17:57:01 +01:00
tiny_mce.js.erb remove functionalities from rich text formatting 2017-01-24 09:44:37 +01:00
url_handling.js Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring. 2016-08-17 18:11:13 +02:00
utils.js Remove unneeded function from utils.js [SCI-819] 2016-12-30 15:50:43 +01:00