tatiana.llorente@artica.es
|
f5c96b7e5d
|
New organization of CSS files - #3358
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
|
2019-01-24 11:10:49 +01:00 |
daniel
|
fb46197c1f
|
fixed minor error button
Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf
|
2019-01-23 15:30:46 +01:00 |
manuel.montes
|
fd2dcb3281
|
Changed radio buttons by toogle switch checkbox
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
|
2019-01-17 17:28:23 +01:00 |
vgilc
|
1b4cd37d5f
|
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
Add the Color Cloud item to the Visual Console
See merge request artica/pandorafms!2075
Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
|
2018-12-12 17:43:39 +01:00 |
tatiana.llorente@artica.es
|
f98b3e2ea5
|
Fixed error in submit - #3153
Former-commit-id: a1c21457db7a4d4d6297fd0935b8beada7cde63c
|
2018-12-10 15:18:53 +01:00 |
Alejandro Gallardo Escobar
|
b0998003a3
|
Added a new icon
Former-commit-id: b4eb7f9aaf16d9ea3b0bb0339c1a70ee162aa259
|
2018-12-10 09:19:26 +01:00 |
tatiana.llorente@artica.es
|
2cb494bfe7
|
Show popup before drop database - #3153
|
2018-12-04 15:41:36 +01:00 |
vgilc
|
d2c048b2dc
|
Merge branch '2890-Texto-en-Active-incident-on-this-agent' into 'develop'
Added css rule for links in the th tables with databox class- #2890
See merge request artica/pandorafms!1844
|
2018-11-30 13:11:45 +01:00 |
daniel
|
a5346a7ae3
|
fixed error login double
|
2018-11-21 17:38:11 +01:00 |
daniel
|
34ea7cfbcb
|
fixed position select autocomplete agent jqui
|
2018-11-15 15:19:43 +01:00 |
tatiana.llorente@artica.es
|
a6b8929a37
|
Added jquery-ui styles to css - #2784
|
2018-11-13 16:48:06 +01:00 |
tatiana.llorente@artica.es
|
719e502a27
|
Revert "Added jquery-ui styles to css - #2784"
This reverts commit fdda5793d2 .
|
2018-11-13 16:34:27 +01:00 |
tatiana.llorente@artica.es
|
fdda5793d2
|
Added jquery-ui styles to css - #2784
|
2018-11-13 16:27:57 +01:00 |
daniel
|
1c1df4b5f7
|
fixed errors css jqueryui
|
2018-11-07 17:09:42 +01:00 |
daniel
|
267f83cc4c
|
add datatabes
|
2018-11-07 13:25:02 +01:00 |
daniel
|
7d54858b45
|
delete files dont use
|
2018-11-07 13:24:07 +01:00 |
tatiana.llorente@artica.es
|
233b9c2c70
|
Well centered message modal window - #2768
|
2018-11-02 13:07:38 +01:00 |
vgilc
|
17286414c7
|
Merge branch '2619_Group_View' into 'develop'
Added warning and normal status agents in group view
See merge request artica/pandorafms!1799
|
2018-10-29 09:16:33 +01:00 |
vgilc
|
1973a5fe54
|
Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
WUX-UX integration
See merge request artica/pandorafms!1890
|
2018-10-26 14:42:23 +02:00 |
fbsanchez
|
172ac187a2
|
estilos popup
|
2018-10-25 15:58:06 +02:00 |
fbsanchez
|
85051924b7
|
estilos popup
|
2018-10-25 14:01:12 +02:00 |
vgilc
|
4dd2cd434c
|
Merge branch '2726-Botones-background-en-Visual-consoles' into 'develop'
Changed colors for buttons - #2726
See merge request artica/pandorafms!1797
|
2018-10-25 12:05:56 +02:00 |
vgilc
|
cf9bf2b4e2
|
Merge branch '2768-Mensajería-interna' into 'develop'
Fixed borders of tables with classes databox and data - #2768
See merge request artica/pandorafms!1786
|
2018-10-25 11:54:50 +02:00 |
tatiana.llorente@artica.es
|
8f2472dcf8
|
Added css rule for links in the th tables with databox class- #2890
|
2018-10-09 12:38:59 +02:00 |
vgilc
|
ca67f52fb4
|
Merge branch '2670-Nuevo-widget-dashboard-system-group-status' into 'develop'
2670 nuevo widget dashboard system group status
See merge request artica/pandorafms!1795
|
2018-10-02 17:25:19 +02:00 |
alejandro-campos
|
62548c7f94
|
Merge branch 'develop' into 2670-Nuevo-widget-dashboard-system-group-status
Conflicts:
pandora_console/include/styles/pandora.css
|
2018-10-02 17:11:02 +02:00 |
alejandro-campos
|
e5e81e55d7
|
edited css class ui-widget-content
|
2018-10-01 17:58:29 +02:00 |
vgilc
|
f73b4a55e6
|
Merge branch '2741-Refactorizar_vista_module_groups' into 'develop'
refactoriced view module_groups
See merge request artica/pandorafms!1788
|
2018-10-01 10:59:09 +02:00 |
vgilc
|
d933a966eb
|
Merge branch '2478-Logo-meta' into 'develop'
changed background of meta visual setup logo previews
See merge request artica/pandorafms!1641
|
2018-09-28 10:50:13 +02:00 |
samucarc
|
638c4f8bc7
|
Added warning and normal status agents in group view
|
2018-09-21 15:10:30 +02:00 |
tatiana.llorente@artica.es
|
028cca0d66
|
Changed colors for buttons - #2726
|
2018-09-21 12:59:15 +02:00 |
daniel
|
26c08d9309
|
refactoriced view module_groups
|
2018-09-20 15:51:36 +02:00 |
tatiana.llorente@artica.es
|
e49c0e3ae7
|
Fixed a minor mistake in thead - #2768
|
2018-09-20 12:18:31 +02:00 |
tatiana.llorente@artica.es
|
bc38468e6c
|
Fixed borders of tables with classes databox and data - #2768
|
2018-09-20 11:50:47 +02:00 |
alejandro-campos
|
6d28b386d1
|
changed styles for system group status widget
|
2018-09-17 18:56:38 +02:00 |
alejandro-campos
|
89a4e3667f
|
Added styles for new widget system group status
|
2018-09-13 19:08:45 +02:00 |
danielmaya
|
39673ed93a
|
Added class modaldeletebutton in pandora.css
|
2018-09-07 14:15:21 +02:00 |
Alejandro Gallardo Escobar
|
dd6b9aed81
|
Refactored the layer configuration of the GIS maps to fix some bugs
|
2018-08-13 12:42:30 +02:00 |
danielmaya
|
cd26042fa9
|
Fixed event graph in cluster view
|
2018-07-31 15:41:15 +02:00 |
alejandro-campos
|
cca29b2f85
|
changed background of meta visual setup logo previews
|
2018-07-26 18:14:43 +02:00 |
slerena
|
082e9c6185
|
Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop'
Add visual animation to popup modal windows - #1781
See merge request artica/pandorafms!1284
|
2018-06-25 18:59:34 +02:00 |
daniel
|
05d8d0ccf5
|
fixed errors graph
|
2018-06-13 19:13:42 +02:00 |
daniel
|
dd57ddbd3c
|
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
pandora_console/include/functions.php
pandora_console/include/styles/pandora.css
|
2018-05-28 17:54:53 +02:00 |
fermin831
|
88e060893a
|
Merge branch 'develop' into 2106-intracom-rebranding
Conflicts resolved:
pandora_console/operation/events/events_rss.php
|
2018-05-28 12:12:16 +02:00 |
manuel.montes
|
b68948307b
|
Fixed white-space / pre-wrap
|
2018-05-23 17:55:07 +02:00 |
Fermin
|
8f2302630c
|
[Rebranding] Docs and Support login icons are configurables
|
2018-05-21 14:29:11 +02:00 |
daniel
|
123d49d604
|
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
pandora_console/include/functions_graph.php
pandora_console/include/styles/pandora.css
|
2018-05-10 08:52:45 +02:00 |
fermin831
|
33abfa7f9d
|
[Rebranding] Other general source files. Removed unreached code oon general/logon_ok.php
|
2018-05-09 18:50:45 +02:00 |
vgilc
|
d746af9c28
|
Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop'
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso
See merge request artica/pandorafms!1442
|
2018-05-09 10:24:19 +02:00 |
fbsanchez
|
3dd4dd51cb
|
Specified more accurate class for label styling
|
2018-05-04 12:26:18 +02:00 |
fermin831
|
675e8deb47
|
Added function display_confirm_dialog with custom dialog
|
2018-04-25 12:32:58 +02:00 |
daniel
|
3fbd9adc38
|
fixed graph
|
2018-04-24 13:19:24 +02:00 |
fbsanchez
|
dcaae924fc
|
Decreased limit to reduceText call in some graphs
|
2018-04-03 16:41:21 +02:00 |
fbsanchez
|
526bd5f8c5
|
Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars
|
2018-03-23 11:08:48 +01:00 |
fbsanchez
|
835e791ef1
|
Fixed label shortener in hbar
|
2018-03-21 13:40:15 +01:00 |
fermin831
|
1001240cf4
|
[SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details
|
2018-03-15 16:03:46 +01:00 |
enriquecd
|
b51dc73cd6
|
Change cluster view design - #1877
|
2018-02-14 18:37:27 +01:00 |
enriquecd
|
c889776f44
|
Add visual animation to popup modal windows - #1781
|
2018-02-08 16:51:58 +01:00 |
enriquecd
|
a04f941a55
|
Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1
Conflicts:
pandora_console/include/styles/pandora.css
|
2018-02-07 17:02:15 +01:00 |
enriquecd
|
ae471bb9f2
|
Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters
|
2018-02-07 13:52:44 +01:00 |
enriquecd
|
ab24c3bf80
|
Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1
Conflicts:
pandora_console/include/functions.php
pandora_console/include/styles/pandora.css
|
2018-02-06 10:46:59 +01:00 |
danielmaya
|
aea9d6ae36
|
resolved conflicts with containers and added mr12
|
2018-02-06 09:21:07 +01:00 |
enriquecd
|
d59289db62
|
Change builder style - #1748
|
2018-02-02 14:56:33 +01:00 |
enriquecd
|
768e6e605f
|
Fix bugs - #1748
|
2018-02-02 13:05:36 +01:00 |
enriquecd
|
2b446a681d
|
Popup when click modules in cluster view, new images, filter modules - #1748
|
2018-01-30 17:38:29 +01:00 |
enriquecd
|
74b4f2a5f3
|
Add optional token animation and vissual effects in visual styles configuration view - #1724
|
2018-01-08 13:01:29 +01:00 |
vgilc
|
78899cc1c7
|
Merge branch '1708-CARREFOUR_Cambio_de_comportamiento_en_Consolas_Visuales_favoritas' into 'develop'
add new funtionality view favourite console visual
See merge request artica/pandorafms!1211
|
2018-01-02 10:31:31 +01:00 |
daniel
|
0b5678fba6
|
add new funtionality view favourite console visual
|
2017-12-28 15:13:06 +01:00 |
enriquecd
|
5747299d8e
|
Add visual effect to login page - #1724
|
2017-12-21 13:45:57 +01:00 |
enriquecd
|
521eb8f4cb
|
Add clocks to visual console - #1403
|
2017-12-01 12:14:56 +01:00 |
vgilc
|
df5722e499
|
Merge branch '1500-Fuente-erronea-en-el-boton-del-wizar-de-instalación-de-Pandora' into 'develop'
Change font family to install wizard button - #1500
See merge request artica/pandorafms!964
|
2017-11-29 16:57:03 +01:00 |
enriquecd
|
afd84ce74d
|
Change system audit log extended info to table format with change info - #1571
|
2017-11-24 10:59:44 +01:00 |
danielmaya
|
897d7bf258
|
Added type graph selection in container graph
|
2017-11-23 18:01:32 +01:00 |
enriquecd
|
1e138f240f
|
Change pandora black styles - #1394
|
2017-11-03 10:27:01 +01:00 |
Arturo Gonzalez
|
5a59f9e2a5
|
Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev
|
2017-10-26 14:20:35 +02:00 |
vgilc
|
86b4fc433c
|
Merge branch '1388-Meter-un-par-de-saltos-de-tamaño-de-fuente-mas-elementos-consola-visual' into 'develop'
Add new font sizes for visual console - #1388
See merge request artica/pandorafms!874
|
2017-10-26 13:39:59 +02:00 |
vgilc
|
e8a14b6981
|
Merge branch '1416-new-h-and-v-bar-charts-in-visual-console-dev' into 'develop'
1416 new h and v bar charts in visual console dev
See merge request artica/pandorafms!956
|
2017-10-26 13:30:52 +02:00 |
enriquecd
|
4f62a02ca1
|
Change font family to install wizard button - #1500
|
2017-10-24 18:16:32 +02:00 |
Arturo Gonzalez
|
5fa51ceb6b
|
Fixed element in meta
|
2017-10-24 09:24:07 +02:00 |
Arturo Gonzalez
|
1d3a082e5c
|
Added item to editor
|
2017-10-19 12:22:01 +02:00 |
Arturo Gonzalez
|
20cccbc87f
|
Added item to editor palette
|
2017-10-19 10:03:53 +02:00 |
Arturo Gonzalez
|
f6fca4e46d
|
Added donut to node visual consoles
|
2017-10-18 11:40:40 +02:00 |
enriquecd
|
bb4ddc38dd
|
Change styles for pandora black theme - #1394
|
2017-10-10 12:16:19 +02:00 |
vgilc
|
83488e517e
|
Merge branch '1349-Boton-muy-feo-en-el-wizard-de-instalacion-de-pandora' into 'develop'
Change installer next button style - #1349
See merge request !833
|
2017-10-04 14:01:54 +02:00 |
Arturo Gonzalez
|
09f73929aa
|
Changed route analyzer styles
|
2017-10-03 16:40:01 +02:00 |
Arturo Gonzalez
|
7cd5d9c3a9
|
Added new styles to route analyzer
|
2017-10-03 15:20:35 +02:00 |
enriquecd
|
76ae95ead4
|
Add new font sizes for visual console - #1388
|
2017-10-03 11:52:26 +02:00 |
enriquecd
|
be0655334d
|
Change installer next button style - #1349
|
2017-09-20 13:04:36 +02:00 |
vgilc
|
4096a0f5ff
|
Merge branch '1122-Revision-del-estilo-CSS-de-las-paginas-de-ayuda' into 'develop'
Change pandora help window style - #1122
See merge request !741
|
2017-09-11 09:43:39 +02:00 |
vgilc
|
b4f0cf12ae
|
Merge branch '1060-Letras-blancas-en-fondo-blanco-con-Black-theme-7' into 'develop'
Change pandorin dialog font color with black theme - #1060
See merge request !635
|
2017-09-08 10:02:45 +02:00 |
daniel
|
fe2a2a36e8
|
fixed minor errors in WUX
|
2017-08-30 16:09:11 +02:00 |
daniel
|
c29d8a4fdb
|
Revert "merge develop"
This reverts commit 8232911713 , reversing
changes made to f5da86ac0a .
|
2017-08-23 09:35:17 +02:00 |
daniel
|
8232911713
|
merge develop
|
2017-08-22 18:39:34 +02:00 |
enriquecd
|
2f5127d517
|
Change pandora help window style - #1122
|
2017-08-21 15:58:19 +02:00 |
daniel
|
86125a3c40
|
changes visual console wux
|
2017-08-18 13:29:07 +02:00 |
vgilc
|
7fdfbde6ff
|
Merge branch '133-Bug-en-pop-up-de-activacion-de-licencia-theme-black' into 'develop'
Change license activation popup color text - #133
See merge request !393
|
2017-08-18 13:17:02 +02:00 |
daniel
|
f0efe69ad4
|
fixed error in wux
|
2017-08-18 12:02:47 +02:00 |
daniel
|
ab3cd7dcc0
|
wux console view
|
2017-08-17 18:38:12 +02:00 |
daniel
|
7e649b78b3
|
wux new form
|
2017-08-09 11:29:16 +02:00 |
artu30
|
14a439faab
|
Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev'
# Conflicts:
# pandora_console/godmode/reporting/visual_console_builder.editor.js
# pandora_console/include/functions_visual_map_editor.php
# pandora_console/include/graphs/flot/pandora.flot.js
|
2017-07-28 10:30:17 +02:00 |
daniel
|
741cc05268
|
fixed errors in graph container
|
2017-07-24 10:53:04 +02:00 |
Arturo Gonzalez
|
e9e10d3a79
|
Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev
pandora_console/include/functions_visual_map.php
pandora_console/include/functions_visual_map_editor.php
|
2017-07-18 11:57:13 +02:00 |
vgilc
|
38b42a26a2
|
Merge branch '845-Mejoras-en-SNMP-Browser-dev' into 'develop'
845 mejoras en snmp browser dev
See merge request !602
|
2017-07-13 12:07:46 +02:00 |
Arturo Gonzalez
|
9db5669f16
|
Added item in button palette with default fields
|
2017-07-12 11:51:00 +02:00 |
enriquecd
|
95184cab21
|
Change pandorin dialog font color with black theme - #1060
|
2017-06-29 18:19:58 +02:00 |
Daniel Maya
|
b7f4ecbe69
|
update css and added gif
|
2017-06-20 15:46:35 +02:00 |
Daniel Maya
|
b38b41b942
|
updated files
|
2017-06-20 15:32:24 +02:00 |
Daniel Maya
|
4398b47d92
|
updated
|
2017-06-20 10:31:14 +02:00 |
daniel
|
80a38cbd9f
|
add checkbox for show all events in view agent detail
|
2017-06-14 12:45:40 +02:00 |
Arturo Gonzalez
|
2e71af2568
|
Added new visual styles to event sound console
|
2017-05-25 17:11:35 +02:00 |
vgilc
|
56fd0f85ba
|
Merge branch 'ent-565-pintado-del-menu-lateral-con-acl-enterprise-activado' into 'develop'
Modified menu position to fit it with ACL enterprise
See merge request !304
|
2017-05-17 17:10:11 +02:00 |
enriquecd
|
01a50a76af
|
Change license activation popup color text - #133
|
2017-04-20 19:04:22 +02:00 |
Arturo Gonzalez
|
629439f271
|
Added some modifications to adapt um and rr in meta
|
2017-04-05 10:26:12 +02:00 |
fermin831
|
2b74fbe57e
|
Modified menu position to fit it with ACL enterprise
|
2017-03-27 15:32:05 +02:00 |
daniel
|
07e5274d0d
|
fixed error in login page errors and change icon pdf report
|
2017-03-22 15:26:54 +01:00 |
daniel
|
8365afbe76
|
fixed errors in helps pandora and visual styles
|
2017-03-21 11:44:46 +01:00 |
daniel
|
aec7df9137
|
fixed minor error
|
2017-03-17 13:40:17 +01:00 |
daniel
|
4277661cc4
|
fixed minor errors in login page
|
2017-03-17 13:29:26 +01:00 |
daniel
|
8d4b730b6c
|
fixed minor errors
|
2017-03-17 11:37:43 +01:00 |
daniel
|
3b54116147
|
fixed errors in css
|
2017-03-17 09:20:38 +01:00 |
daniel
|
1325601082
|
fixed errors
|
2017-03-16 18:41:53 +01:00 |
daniel
|
e252135979
|
merge develop
|
2017-03-15 17:09:40 +01:00 |
daniel
|
aec0d91109
|
login page new
|
2017-03-15 15:23:28 +01:00 |
daniel
|
a87839bd07
|
login page
|
2017-03-15 10:12:18 +01:00 |
Daniel Maya
|
f4350aed6b
|
Ticket 477. Fixed some bug in the visual console
|
2017-03-14 15:54:46 +01:00 |
Arturo Gonzalez
|
73c31012d9
|
Added new visual styles to um and rr systems. Ticket #486
|
2017-03-14 10:36:10 +01:00 |
artu30
|
2c8af1d54a
|
Merge branch 'new_jquery_dialog_view' into 'develop'
New styles to jquery dialog. (Header done)
See merge request !250
|
2017-03-13 17:06:00 +01:00 |
enriquecd
|
0094cfa9bf
|
Center alert modal window when is opened - #93
|
2017-03-13 13:25:16 +01:00 |
Arturo Gonzalez
|
dfa7552fcd
|
New styles to jquery dialog. (Header done)
|
2017-03-10 09:41:07 +01:00 |
daniel
|
07a58aa944
|
changes css for widget
|
2017-03-08 10:56:25 +01:00 |
daniel
|
a7a7a27225
|
fixed widgets groups status
|
2017-03-07 15:31:24 +01:00 |
Arturo Gonzalez
|
15bcd0add8
|
Changed visual styls of install page. Ticket #448
|
2017-03-07 10:59:22 +01:00 |
fermin831
|
4ae8963e2e
|
Added events active filter view (open side)
|
2017-02-28 15:41:03 +01:00 |
enriquecd
|
983d00535a
|
Change background color when mouse over rows in agent and module managers - #81
|
2017-02-27 14:28:09 +01:00 |
m-lopez-f
|
45316cdd0f
|
Fixed visual in welcome view. Gitlab: #359
|
2017-02-23 12:26:48 +01:00 |
daniel
|
7609e85d3e
|
fixed errors in tab menu
|
2017-02-23 09:23:27 +01:00 |
daniel
|
f351a95993
|
fixed errors in tabs reports
|
2017-02-22 09:21:35 +01:00 |
enriquecd
|
36aa73bdd8
|
Make alert messages window draggable, zindex 3, change disable logo in graph - #52
|
2017-02-10 10:18:53 +01:00 |
daniel
|
543fd0c7ea
|
delete shortcut bar
|
2017-02-03 12:23:58 +01:00 |
enriquecd
|
f14f0d923f
|
Add transition to hover change color in alert windows and left menu bar buttons - #30
|
2017-01-26 12:10:28 +01:00 |
enriquecd
|
e6dd14fcb6
|
Improve_visual_console_fix_pandoracss - #15
|
2017-01-20 16:02:34 +01:00 |
daniel
|
1b26423867
|
Merge branch 'develop' into 135-informe-de-eventos-sale-agrupado-int-4330-open
|
2017-01-18 17:39:04 +01:00 |
enriquecd
|
6447189606
|
Improve visual console - #110
|
2017-01-16 13:31:56 +01:00 |
daniel
|
99aa41b32a
|
fixed reports events
|
2017-01-13 14:09:56 +01:00 |
enriquecd
|
356944f8f2
|
Create and update buttons in CONFIGURE EVENT RULE positioned wrong #130
|
2017-01-05 16:27:45 +01:00 |
daniel
|
b28fe4cef4
|
Merge branch 'develop' into feature/report_SLA_new
|
2016-12-14 15:42:18 +01:00 |
daniel
|
fb942ab6cf
|
fixed error and visual erros pdf, xml, csv, json
|
2016-12-14 14:02:00 +01:00 |
daniel
|
2b0820d70e
|
add new reports sla_hourly , weekly and availability graph
|
2016-12-12 16:48:25 +01:00 |
Arturo Gonzalez
|
e9eb60a718
|
Changed events sound styles and added new filters. Ticket #109 Gitlab
|
2016-12-05 15:23:17 +01:00 |
daniel
|
9fc797ae9e
|
reports availability and SLA change new function
(cherry picked from commit 7faa1eff1e )
|
2016-11-30 08:57:17 +01:00 |