Commit graph

11 commits

Author SHA1 Message Date
Luka Murn 3e80f761b8 Add "about" modal, prepare hooks, VERSION system for addons
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
2017-07-10 15:27:50 +02:00
zmagod 72e13beee3 renamed organizations in views 2017-01-25 12:01:23 +01:00
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
zmagod a903772de8 style dropdown 2017-01-10 17:05:32 +01:00
Luka Murn 7835753d3c Add atwho-users URL to <body> 2017-01-06 12:48:37 +01:00
Oleksii Kriuchykhin cd3924afd3 Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +01:00
Mojca Lorber beae54e278 remove already_authenticated alert flash 2016-11-23 14:55:41 +01:00
zmagod 01b27e9e6d added getting started hoot to layout/application.html 2016-10-28 10:36:15 +02:00
zmagod 32f03ec94c Add Deface hooks 2016-10-06 16:47:36 +02:00
Luka Murn 076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn 055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00