Oleksii Kriuchykhin
|
deabd39a98
|
Fix protocol import button [SCI-1931]
|
2018-01-15 13:43:09 +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
|
d555ba7905
|
Add export to protocol management page and code style improvements [SCI-742]
|
2017-01-23 17:43:48 +01:00 |
|
Oleksii Kriuchykhin
|
14a6705b55
|
Implemented protocol export through Zip::OutputStream [SCI-742]
|
2017-01-23 17:43:48 +01:00 |
|
zmagod
|
89e8946a47
|
expand smart annotation
|
2017-01-10 14:14:21 +01:00 |
|
Oleksii Kriuchykhin
|
d2491a18a4
|
Tutorial Save Protocol step added [SCI-571]
|
2016-11-11 10:06:18 +01:00 |
|
Mojca Lorber
|
302a777615
|
fixes button collision
|
2016-09-08 12:37:06 +02:00 |
|
zmagod
|
2bbb439745
|
fixes cloned experiment protocol [fixes SCI-376]
|
2016-08-23 16:15:45 +02:00 |
|
zmagod
|
852fe499fb
|
clean up linked protocol
|
2016-08-12 16:31:40 +02:00 |
|
Luka Murn
|
076b67620f
|
Migration GitLab -> GitHub
|
2016-07-21 13:11:15 +02:00 |
|