zmagod
8c035a1981
renames organization in assets
2017-01-25 12:12:27 +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
Oleksii Kriuchykhin
401b37956b
Simplify protocol export start [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
d555ba7905
Add export to protocol management page and code style improvements [SCI-742]
2017-01-23 17:43:48 +01:00
Luka Murn
a2935c6620
Add sample info modal popup to sample smart annotations
...
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').
Closes SCI-892.
2017-01-16 15:52:02 +01:00
Mojca Lorber
4e7e261225
fix protocol preview
2017-01-06 10:10:33 +01:00
Mojca Lorber
356edba1b3
add protocol preview to search results
2017-01-05 18:08:59 +01:00
Mojca Lorber
a0704cd873
remove duplicated includes of css and js
2017-01-03 17:33:01 +01:00
Mojca Lorber
c476faca30
fix hound
2017-01-03 11:04:09 +01:00
Mojca Lorber
e555535dfb
add edit button to protocol preview modal
2017-01-03 10:04:14 +01:00
Mojca Lorber
40e3240a99
add content to preview modal
2016-12-22 11:43:11 +01:00
Mojca Lorber
2cfcba0ceb
add protocol preview modal
2016-12-13 10:39:18 +01:00
zmagod
ef2471d3f7
fixes inport eln error message and spinner [fixes SCI-752]
2016-12-05 10:44:58 +01:00
Oleksii Kriuchykhin
be59b85d3b
Added additional checks for tutorial steps [SCI-703]
2016-11-22 13:55:23 +01:00
Matej Zrimšek
f13cc5be0e
Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).
2016-11-17 18:03:49 +01:00
Matej Zrimšek
c8eb82cc85
Fixed tutorial step numbers and changed getting next page reference on protocols page.
2016-11-17 14:46:04 +01:00
Oleksii Kriuchykhin
b9f982ead7
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
2016-11-11 10:07:34 +01:00
Matej Zrimšek
ccdccc5cf1
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
Luka Murn
076b67620f
Migration GitLab -> GitHub
2016-07-21 13:11:15 +02:00
