okriuchykhin
|
6610c75bfc
|
Merge pull request #452 from okriuchykhin/ok_SCI_949
Fix error when referencing deleted sample in SA [SCI-949]
|
2017-01-25 17:26:48 +01:00 |
|
mlorb
|
dd46ba6b71
|
Merge pull request #451 from mlorb/ml_sci_946
Fix tables in reports [SCI-946]
|
2017-01-25 17:26:32 +01:00 |
|
|
mlorb
|
bedef297c4
|
Merge pull request #453 from mlorb/ml_sci_950
Fix problem with protocol export [SCI-950]
|
2017-01-25 17:15:21 +01:00 |
|
|
okriuchykhin
|
4c0f68ffbd
|
Merge pull request #410 from okriuchykhin/ok_SCI_855
Improved tooltip handling in samples datatable V2 [SCI-855]
|
2017-01-25 16:19:52 +01:00 |
|
Mojca Lorber
|
99a40961fa
|
fix problem with protocol export
|
2017-01-25 16:12:48 +01:00 |
|
|
Oleksii Kriuchykhin
|
5fe9261595
|
Fix error when referencing deleted sample in SA [SCI-949]
|
2017-01-25 15:54:12 +01:00 |
|
|
mlorb
|
e8a0dfbb04
|
Merge pull request #449 from mlorb/ml_sci_942
Remove letter f [SCI-942]
|
2017-01-25 15:23:51 +01:00 |
|
|
Mojca Lorber
|
d669f006b1
|
fix tables in reports
|
2017-01-25 15:15:26 +01:00 |
|
|
Oleksii Kriuchykhin
|
ddd8bcf7b0
|
Prevent double initialization of popup [SCI-855]
|
2017-01-25 13:47:01 +01:00 |
|
|
Oleksii Kriuchykhin
|
96a9857dec
|
Add handling of popups in the end of the table [SCI-855]
|
2017-01-25 13:47:01 +01:00 |
|
|
Oleksii Kriuchykhin
|
fb49ce8be2
|
Improved tooltip handling in samples datatable [SCI-855]
|
2017-01-25 13:47:01 +01:00 |
|
|
Mojca Lorber
|
6905fc8c08
|
remove letter f
|
2017-01-25 13:20:11 +01:00 |
|
|
okriuchykhin
|
35b8638598
|
Merge pull request #446 from okriuchykhin/ok_SCI_902_v2
Add sanitization of group/type to sample edit [SCI-902]
|
2017-01-25 12:05:30 +01:00 |
|
|
mlorb
|
7eb69109c2
|
Merge pull request #447 from mlorb/ml_sci_941
Fix table titles [SCI-941]
|
2017-01-25 11:18:46 +01:00 |
|
|
Mojca Lorber
|
2277af534c
|
fix table titles
|
2017-01-25 11:01:35 +01:00 |
|
|
Oleksii Kriuchykhin
|
fe6d6842c2
|
Add sanitization of group/type to sample edit [SCI-902]
|
2017-01-24 16:58:03 +01:00 |
|
|
Oleksii Kriuchykhin
|
365eef506c
|
Fixes merge conflicts with smart-annotations branch
|
2017-01-24 15:20:50 +01:00 |
|
|
okriuchykhin
|
f1483e4cad
|
Merge pull request #444 from okriuchykhin/ok_SCI_902_v2
Add sanitization to sample groups/types [SCI-902]
|
2017-01-24 14:44:55 +01:00 |
|
|
Oleksii Kriuchykhin
|
a04f05eeb3
|
Add sanitization to sample groups/types [SCI-902]
|
2017-01-24 14:39:54 +01:00 |
|
|
mlorb
|
02f314ce60
|
Merge pull request #443 from mlorb/ml_sci_919_v2
Remove table of content and customize link target [SCI-919]
|
2017-01-24 14:39:47 +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
|
4dc7998fdd
|
Remove table of content and customize link target
|
2017-01-24 13:10:01 +01:00 |
|
Zmago Devetak
|
40bf293ec7
|
Merge pull request #441 from ZmagoD/zd_SCI_924
adds smart annotation in task comments, refactor smart_annotation_par…
|
2017-01-24 11:18:41 +01:00 |
|
|
mlorb
|
4253e3de2b
|
Merge pull request #439 from mlorb/ml_sci_919
Remove functionalities from rich text formatting [SCI-919]
|
2017-01-24 11:03:34 +01:00 |
|
mz3944
|
34f832d123
|
Merge pull request #437 from mz3944/mz-sci-913
Added smart annotations when adding new sample in samples table [SCI-913]
|
2017-01-24 11:03:00 +01:00 |
|
|
okriuchykhin
|
7fa1f3d966
|
Merge pull request #438 from okriuchykhin/ok_SCI_921
Remove unneeded HTML scrubber in protocol importer [SCI-921]
|
2017-01-24 11:02:43 +01:00 |
|
Matej Zrimšek
|
b48e48e100
|
Prevent sample row in samples datatable from toggling when clicking on smart annotation link. [SCI-913]
|
2017-01-24 10:56:10 +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 |
|
|
Matej Zrimšek
|
2e041d9e81
|
Added smart annotations when adding new sample in samples table. [SCI-913]
|
2017-01-24 10:23:26 +01:00 |
|
|
Oleksii Kriuchykhin
|
2434c73a0c
|
Remove unneeded HTML scrabber in protocol importer [SCI-921]
|
2017-01-24 09:52:38 +01:00 |
|
|
Mojca Lorber
|
eb40513ada
|
remove functionalities from rich text formatting
|
2017-01-24 09:44:37 +01:00 |
|
|
okriuchykhin
|
fe329d09cc
|
Merge pull request #350 from okriuchykhin/ok_SCI_742_v1
Implemented protocol export through Zip::OutputStream [SCI-742]
|
2017-01-23 17:49:05 +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 |
|
|
Oleksii Kriuchykhin
|
14a6705b55
|
Implemented protocol export through Zip::OutputStream [SCI-742]
|
2017-01-23 17:43:48 +01:00 |
|
|
Oleksii Kriuchykhin
|
1abd7fc574
|
Added xml schemas and zip gem [SCI-742]
|
2017-01-23 17:34:02 +01:00 |
|
|
Oleksii Kriuchykhin
|
69f31a62e7
|
Initial code commit [SCI-742]
|
2017-01-23 17:33:10 +01:00 |
|
|
Zmago Devetak
|
674999f987
|
Merge pull request #436 from ZmagoD/zd_SCI_922
fixed user without permissions bug [fixes SCI-922]
|
2017-01-23 17:25:07 +01:00 |
|
|
Zmago Devetak
|
386c379602
|
Merge pull request #435 from ZmagoD/zd_SCI_907
fixes checklist item user popover bug [fixes SCI-907]
|
2017-01-23 17:07:44 +01:00 |
|
|
zmagod
|
20cde2654b
|
fixed user without permissions bug [fixes SCI-922]
|
2017-01-23 10:53:42 +01:00 |
|
|
zmagod
|
9c3bc8dac7
|
fixes checklist item user popover bug [fixes SCI-907]
|
2017-01-23 09:47:04 +01:00 |
|
|
mz3944
|
fd63a1de12
|
Merge pull request #432 from mlorb/ml-sci-fix-847
Add dynamic length for sample type/group field when adding new sample [SCI-847]
|
2017-01-20 15:46:34 +01:00 |
|
|
mlorb
|
2d073c8c04
|
Merge pull request #430 from mlorb/ml_sci_826
Display smart annotations in reports [SCi-826]
|
2017-01-20 13:49:40 +01:00 |
|
|
Mojca Lorber
|
8e02c2e025
|
add locale - fix
|
2017-01-20 13:37:07 +01:00 |
|
|
mz3944
|
18a2e4c423
|
Merge pull request #433 from mz3944/mz-sci-914
Edit of a sample in sample table does not work
|
2017-01-20 13:02:05 +01:00 |
|
|
Zmago Devetak
|
c1e7cc83a7
|
Merge pull request #434 from ZmagoD/zd_SCI_915
Text is deleted when entering smart annotation in rich text editor
|
2017-01-20 13:01:29 +01:00 |
|
|
Zmago Devetak
|
7bd368e002
|
Merge pull request #431 from ZmagoD/zd_add_code_highlight
Fixes code highlight and smart annotations experiments bug
|
2017-01-20 12:59:21 +01:00 |
|
|
mz3944
|
209189cd9b
|
Merge pull request #429 from mz3944/mz-sci-894
Smart annotations - no hits notification
|
2017-01-20 11:50:00 +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 |
|
|
zmagod
|
71453398b1
|
bugfix
|
2017-01-20 11:33:49 +01:00 |
|