mlorb
|
bc8c4c3c6c
|
Merge pull request #463 from mlorb/ml_sci_965
Fix step does not save if table is without content [SCI-965]
|
2017-01-30 11:08:21 +01:00 |
|
Mojca Lorber
|
b291553d01
|
fix hound
|
2017-01-27 16:36:03 +01:00 |
|
Mojca Lorber
|
d5021fad2c
|
fix step does not save if table is without content
|
2017-01-27 16:25:11 +01:00 |
|
okriuchykhin
|
9909f9dcff
|
Merge pull request #456 from okriuchykhin/ok_SCI_951
Fix missing preview images in task and protocol management [SCI-951]
|
2017-01-27 14:42:41 +01:00 |
|
okriuchykhin
|
c6fe0003f4
|
Merge pull request #458 from okriuchykhin/ok_SCI_957
Fix protocol table filtering by keywords [SCI-957]
|
2017-01-27 14:19:53 +01:00 |
|
okriuchykhin
|
53e09bd50a
|
Merge pull request #457 from okriuchykhin/ok_SCI_955
Fix comments re-initialization after edit of the results [SCI-955]
|
2017-01-27 11:50:52 +01:00 |
|
mlorb
|
77236f161b
|
Merge pull request #461 from mlorb/ml_sci_952
Fix bug with avatar in smart annotations [SCI-952]
|
2017-01-27 10:08:53 +01:00 |
|
Luka Murn
|
2c3be391a8
|
Merge pull request #462 from ZmagoD/zd_SCI_962_vol2
fix edit action
|
2017-01-26 17:25:57 +01:00 |
|
Luka Murn
|
36f25e98f1
|
Merge pull request #459 from okriuchykhin/ok_SCI_943
Fix RTF toolbar init after eding new step [SCI-943]
|
2017-01-26 17:25:41 +01:00 |
|
zmagod
|
30912c514e
|
fix edit action
|
2017-01-26 17:24:24 +01:00 |
|
Mojca Lorber
|
5bed5f0f4a
|
fix bug with avatar in smart annotations
|
2017-01-26 17:15:00 +01:00 |
|
Luka Murn
|
b2d2f56bdd
|
Version bump to 1.7.1
|
2017-01-26 17:00:54 +01:00 |
|
Luka Murn
|
83ac1d624c
|
Merge pull request #460 from ZmagoD/zd_SCI_962
fixes RTF bug for new text results [fixes SCI-962]
|
2017-01-26 17:00:06 +01:00 |
|
zmagod
|
cec5f1333d
|
fixes RTE bug for new text results [fixes SCI-962]
|
2017-01-26 16:54:43 +01:00 |
|
Oleksii Kriuchykhin
|
100cc700c6
|
Fix RTF toolbar init after eding new step [SCI-943]
|
2017-01-26 16:37:44 +01:00 |
|
Luka Murn
|
49c01b0a3c
|
Update Gemfile.lock
|
2017-01-26 16:35:53 +01:00 |
|
Luka Murn
|
3bf447b0f4
|
Fix bug where reCaptcha form wasn't working
|
2017-01-26 16:06:29 +01:00 |
|
Oleksii Kriuchykhin
|
17a53cbd7f
|
Fix protocol table filtering by keywords [SCI-957]
|
2017-01-26 15:52:46 +01:00 |
|
Oleksii Kriuchykhin
|
ff86184b24
|
Fix comments re-initialization after edit of the results [SCI-955]
|
2017-01-26 15:24:37 +01:00 |
|
Oleksii Kriuchykhin
|
0f860496a7
|
Fix image preview after saving of report [SCI-951]
|
2017-01-26 14:42:14 +01:00 |
|
Luka Murn
|
3e6d11a087
|
Merge pull request #455 from mlorb/ml_sci_944
Fix entering new smart anotations [SCI-944]
|
2017-01-26 14:06:35 +01:00 |
|
Luka Murn
|
4deb472dc9
|
Merge pull request #454 from Ducz0r/lm-sci-953-fix
Re-display images & checkboxes in PDF reports [SCI-953]
|
2017-01-26 13:54:10 +01:00 |
|
Mojca Lorber
|
13d1cc5171
|
fix entering new smart anotations
|
2017-01-26 13:50:32 +01:00 |
|
Oleksii Kriuchykhin
|
08aa882155
|
Fix generation of image previews after protocol loading from repo [SCI-951]
|
2017-01-26 13:19:59 +01:00 |
|
Luka Murn
|
0baaf12de3
|
Re-display images & checkboxes in PDF reports
Closes SCI-953.
|
2017-01-26 10:46:58 +01:00 |
|
Luka Murn
|
042a85af45
|
Bump version to 1.7.0
|
2017-01-25 18:22:11 +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 |
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
90e4b26c69
|
Fix openning of protocol preview with images [SCI-945]
|
2017-01-25 13:06:12 +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 |
|