Luka Murn
0baaf12de3
Re-display images & checkboxes in PDF reports
...
Closes SCI-953.
2017-01-26 10:46:58 +01:00
Luka Murn
8c5a52417c
Merge pull request #445 from okriuchykhin/ok_SCI_940
...
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:49:38 +01:00
okriuchykhin
648d256dff
Merge pull request #448 from okriuchykhin/ok_SCI_945
...
Fix openning of protocol preview with images [SCI-945]
2017-01-25 17:27:01 +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
Mojca Lorber
6905fc8c08
remove letter f
2017-01-25 13:20:11 +01:00
Oleksii Kriuchykhin
90e4b26c69
Fix openning of protocol preview with images [SCI-945]
2017-01-25 13:06:12 +01:00
Mojca Lorber
2277af534c
fix table titles
2017-01-25 11:01:35 +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
6e7fa21dd3
adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]
2017-01-24 10:51:12 +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
Mojca Lorber
8e02c2e025
add locale - fix
2017-01-20 13:37:07 +01:00
mlorb
9a3c56de97
Merge pull request #421 from mlorb/ml_sci_540
...
Protocol steps/results - adding titles for tables [SCI-540]
2017-01-20 11:41:49 +01:00
Mojca Lorber
6653f0d4c1
small fixes
2017-01-19 16:42:14 +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
zmagod
2cbb8ba41a
removed unneeded comments
2017-01-19 12:54:48 +01:00
zmagod
f2d5066dc7
fix some bugs
2017-01-19 11:37:59 +01:00
zmagod
27d3868f37
fix bugs
2017-01-19 09:40:39 +01:00
zmagod
65fa631b1c
adding tinyMce first run
2017-01-18 22:40:08 +01:00
Mojca Lorber
dde9854bf1
update protocol import/export and clone
2017-01-18 14:22:19 +01:00
Mojca Lorber
3b92ab9f36
add names to tables from protocol steps in reports
2017-01-18 14:22:19 +01:00
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +01:00
Oleksii Kriuchykhin
a490a12fb1
Add truncation of image description in the preview [SCI-873]
2017-01-18 13:28:56 +01:00
Luka Murn
cf72da5635
Merge branch 'improved-files-handling' into 'master'
...
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
2017-01-18 11:29:40 +01:00
Zmago Devetak
1b9f7db385
Merge pull request #405 from ZmagoD/zd_SCI_832
...
Visualization of User smart annotation after saving the field
2017-01-18 09:36:42 +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
okriuchykhin
02bfd19d1c
Merge pull request #385 from okriuchykhin/ok_SCI_102
...
Fix XSS on activites and throghout the rest of app [SCI-102]
2017-01-16 11:41:38 +01:00
Luka Murn
1acf258c70
Fix minor Zmagohound comment
2017-01-14 10:00:52 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin
75031e17b9
Remove double sanitization from views [SCI-102]
2017-01-12 16:54:15 +01:00
Luka Murn
bc03a26d4b
Also fix this new year issue on comments display
2017-01-12 15:06:12 +01:00
Luka Murn
8b01f912a0
Fix new year problems with activities
...
Closes SCI-876.
2017-01-12 14:47:15 +01:00
Oleksii Kriuchykhin
0350f2f792
Add html escaping to name filelds in the views [SCI-102]
2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin
d05c16b0ba
Added auto_link wrapper with custom sanitization [SCI-102]
2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin
0546716a0b
Improve user input sanitization, fix bugs [SCI-102]
2017-01-11 15:50:11 +01:00
zmagod
3a1ec0eb5e
refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824]
2017-01-11 14:56:47 +01:00
Matej Zrimšek
30a9c283fb
Added back bullets to images in protocol preview in protocol repository.
2017-01-11 14:15:07 +01:00
Matej Zrimšek
852dc2eb7e
Added file downloading to protocol preview in protocol repository. [SCI-878]
2017-01-11 14:14:12 +01:00
zmagod
a4aa933151
refactor smart annotation parser helper
2017-01-11 10:34:14 +01:00
zmagod
a903772de8
style dropdown
2017-01-10 17:05:32 +01:00
zmagod
fc76a4ae6d
Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834
2017-01-10 14:22:04 +01:00
zmagod
89e8946a47
expand smart annotation
2017-01-10 14:14:21 +01:00
zmagod
e0e998a0d8
add smart annotation parser helper
2017-01-10 14:14:21 +01:00
zmagod
94262b56ef
prepare data for atwho
2017-01-10 14:14:21 +01:00
Oleksii Kriuchykhin
4c9c9037ed
Enable image preview after editing protocol and disable preview modal animation [SCI-868]
2017-01-09 17:19:46 +01:00
okriuchykhin
3f930ccfce
Merge pull request #392 from okriuchykhin/ok_SCI_858
...
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
2017-01-09 12:49:38 +01:00
mz3944
ef431da2db
Merge pull request #389 from mz3944/mz-sci-848
...
Unable to delete samples [SCI-848]
2017-01-09 11:57:48 +01:00
mlorb
f14ad0f762
Merge pull request #387 from mlorb/ml_sci_732
...
Add protocol preview to search results [SCI-732]
2017-01-09 11:28:04 +01:00
