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 |
|
Oleksii Kriuchykhin
|
365eef506c
|
Fixes merge conflicts with smart-annotations branch
|
2017-01-24 15:20:50 +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 |
|
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 |
|
Mojca Lorber
|
eb40513ada
|
remove functionalities from rich text formatting
|
2017-01-24 09:44:37 +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 |
|
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 |
|
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 |
|
zmagod
|
71453398b1
|
bugfix
|
2017-01-20 11:33:49 +01:00 |
|
zmagod
|
4f7d62e79d
|
removes unneeded annotations [fixes SCI-915]
|
2017-01-20 11:33:10 +01:00 |
|
Matej Zrimšek
|
5d65627808
|
Fixed sample editing in samples table. [SCI-914]
|
2017-01-20 11:10:17 +01:00 |
|
Mojca Lorber
|
3789769af3
|
add dynamic length for sample type/group field when adding new sample
|
2017-01-20 09:53:44 +01:00 |
|
zmagod
|
9550c6dd35
|
fixes highlight.js
|
2017-01-19 17:09:25 +01:00 |
|
Mojca Lorber
|
6653f0d4c1
|
small fixes
|
2017-01-19 16:42:14 +01:00 |
|
Mojca Lorber
|
6de83ff53b
|
fix hound
|
2017-01-19 15:58:40 +01:00 |
|
Matej Zrimšek
|
54f8b01341
|
Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894]
|
2017-01-19 15:26:28 +01:00 |
|
Mojca Lorber
|
44de927cf4
|
display smart annotations in reports - without rich text fields
|
2017-01-19 14:22:54 +01:00 |
|
Oleksii Kriuchykhin
|
890c5e3c3d
|
Add “no results found” message in smart annotation [SCI-886]
|
2017-01-19 13:42:58 +01:00 |
|
Zmago Devetak
|
039a8d7da6
|
Merge pull request #426 from ZmagoD/zd_add_tinyMCE
Add tiny mce
|
2017-01-19 12:57:55 +01:00 |
|
zmagod
|
2cbb8ba41a
|
removed unneeded comments
|
2017-01-19 12:54:48 +01:00 |
|
mz3944
|
da604d2619
|
Merge pull request #427 from mz3944/mz-sci-908
Some smart annotations refactoring [SCI-908]
|
2017-01-19 12:15:20 +01:00 |
|
zmagod
|
f2d5066dc7
|
fix some bugs
|
2017-01-19 11:37:59 +01:00 |
|
Matej Zrimšek
|
5d86bbb812
|
Smart annotations improved documentation. [SCI-908]
|
2017-01-19 10:56:02 +01:00 |
|
Matej Zrimšek
|
fec83e8c45
|
Smart annotations refactoring. [SCI-908]
|
2017-01-19 10:55:43 +01:00 |
|
zmagod
|
2ccafdd670
|
bug fix
|
2017-01-19 10:12:01 +01:00 |
|
zmagod
|
27d3868f37
|
fix bugs
|
2017-01-19 09:40:39 +01:00 |
|
zmagod
|
88d7cb200e
|
removed quill
|
2017-01-18 23:06:14 +01:00 |
|
zmagod
|
65fa631b1c
|
adding tinyMce first run
|
2017-01-18 22:40:08 +01:00 |
|
okriuchykhin
|
18d329fb42
|
Merge pull request #423 from okriuchykhin/ok_SCI_896
Make search work for full names in smart annotations [SCI-896]
|
2017-01-18 17:58:52 +01:00 |
|
Oleksii Kriuchykhin
|
6555fd02b6
|
Make search work for full names in smart annotations [SCI-896]
|
2017-01-18 16:57:51 +01:00 |
|
mz3944
|
b5e38afb64
|
Merge pull request #416 from mz3944/mz-sci-884
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
|
2017-01-18 16:13:19 +01:00 |
|
Matej Zrimšek
|
dbbb709bf2
|
Smart annotations minor refactoring. [SCI-884, SCI-889]
|
2017-01-18 16:04:39 +01:00 |
|
Matej Zrimšek
|
24458fe590
|
Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889]
|
2017-01-18 15:29:48 +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 |
|
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 |
|