Oleksii Kriuchykhin
|
cf8566df33
|
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-10 14:27:20 +01:00 |
|
Oleksii Kriuchykhin
|
c55f3cb99c
|
Add flag to disable simple_format in custom_auto_link [SCI-940]
|
2017-01-25 17:18:19 +01:00 |
|
Oleksii Kriuchykhin
|
310d8c1920
|
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
|
2017-01-25 17:18:19 +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 |
|
Mojca Lorber
|
8e02c2e025
|
add locale - fix
|
2017-01-20 13:37:07 +01:00 |
|
Mojca Lorber
|
4ea154410a
|
add to fields with rich text formatting
|
2017-01-19 15:27:24 +01:00 |
|
Mojca Lorber
|
44de927cf4
|
display smart annotations in reports - without rich text fields
|
2017-01-19 14:22:54 +01:00 |
|
Mojca Lorber
|
3b92ab9f36
|
add names to tables from protocol steps in reports
|
2017-01-18 14:22:19 +01:00 |
|
Oleksii Kriuchykhin
|
d05c16b0ba
|
Added auto_link wrapper with custom sanitization [SCI-102]
|
2017-01-11 17:02:17 +01:00 |
|
Oleksii Kriuchykhin
|
cd3924afd3
|
Sanitize .html_safe marked strings which contain tags [SCI-102]
|
2017-01-05 13:04:19 +01:00 |
|
Oleksii Kriuchykhin
|
9c4191a1e0
|
Initial code commit [SCI-102]
|
2017-01-05 13:04:19 +01:00 |
|
Luka Murn
|
a48eaf662e
|
Restyle step table display in reports so
Closes SCI-546.
|
2016-12-19 15:09:49 +01:00 |
|
zmagod
|
fafecce264
|
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]
|
2016-11-23 14:18:50 +01:00 |
|
Luka Murn
|
26d04b1f3c
|
Merge branch 'rich-text-formatting' into 'master'
Conflicts:
Gemfile.lock
app/assets/stylesheets/themes/scinote.scss
|
2016-11-17 16:39:33 +01:00 |
|
zmagod
|
b781db9667
|
fixed bullets
|
2016-11-16 15:30:14 +01:00 |
|
mlorb
|
1ca452db7b
|
Merge pull request #273 from mlorb/ml_sci_640
Add rich text formatting on results and remove markdown [SCI-640]
|
2016-11-11 12:06:13 +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 |
|
Mojca Lorber
|
fbaffbcaab
|
add formatted text in reports
|
2016-11-10 15:20:40 +01:00 |
|
Mojca Lorber
|
3e162b3a93
|
remove redcarpet gem - markdown
|
2016-11-10 14:11:32 +01:00 |
|
Matej Zrimšek
|
ece89da391
|
Removed ruby constants duplicates in JS, because of caching problems.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
0780bd2416
|
Ruby constants are now automatically available in JS. Refactoring was needed.
|
2016-10-17 11:57:37 +02:00 |
|
Matej Zrimšek
|
a3dfb59558
|
Added remaining constants.
|
2016-10-17 11:30:05 +02:00 |
|
zmagod
|
f356acb882
|
fixes reports file name [fixes SCI-294]
|
2016-08-30 11:36:39 +02:00 |
|
zmagod
|
ca0ba1403d
|
set flask icon to experiment [fixes SCI-330]
|
2016-08-17 14:17:29 +02:00 |
|
zmagod
|
7abc8f3a90
|
Merge branch 'master' into experiment-level
|
2016-08-17 09:28:35 +02:00 |
|
Jure Grabnar
|
9092dd6914
|
Replace all occurences of module_elements
|
2016-08-03 12:52:52 +02:00 |
|
Jure Grabnar
|
41e8c54aa5
|
Rename _module_element_controls to element_controls
|
2016-08-03 12:52:06 +02:00 |
|
Jure Grabnar
|
d82ba163ed
|
Add experiment to report screen
Only placeholder for now, JS still needs fixing.
|
2016-08-03 12:52:06 +02:00 |
|
zmagod
|
6e3ce92348
|
add checking for step content
|
2016-08-01 11:23:22 +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 |
|