Oleksii Kriuchykhin
|
2edebb282a
|
Add team_id field to assets and tables [SCI-1046]
|
2017-03-23 10:36:55 +01:00 |
|
zmagod
|
1220466035
|
fixing hound
|
2017-01-25 15:00:14 +01:00 |
|
zmagod
|
a6285f0431
|
renamed utilities
|
2017-01-25 10:24:50 +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
|
2434c73a0c
|
Remove unneeded HTML scrabber in protocol importer [SCI-921]
|
2017-01-24 09:52:38 +01:00 |
|
zmagod
|
65fa631b1c
|
adding tinyMce first run
|
2017-01-18 22:40:08 +01:00 |
|
Mojca Lorber
|
f656a1093d
|
fix hound
|
2017-01-18 14:40:24 +01:00 |
|
Mojca Lorber
|
dde9854bf1
|
update protocol import/export and clone
|
2017-01-18 14:22:19 +01:00 |
|
Luka Murn
|
08c6210f7c
|
Also employ "no format" Nokogiri strategy when sanitizing
Closes SCI-691.
|
2016-11-17 16:43:14 +01:00 |
|
Luka Murn
|
fc32aa8606
|
Add custom scrubber for QuillJs
|
2016-11-17 16:43:14 +01:00 |
|
Luka Murn
|
29f0557d3c
|
Prevent CORS when importing protocols
|
2016-11-15 17:06:39 +01:00 |
|
Oleksii Kriuchykhin
|
28ab599373
|
Change double quotes to single [fixes SCI-314]
|
2016-09-22 16:36:37 +02:00 |
|
Oleksii Kriuchykhin
|
9b7360eebf
|
Fixes issue with import of empty protocol [fixes SCI-314]
|
2016-09-20 13:41:29 +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 |
|