danielmaya
|
87e2f4f3f9
|
Fixed filter in gis maps
|
2017-12-04 11:41:52 +01:00 |
|
daniel
|
ee7521e417
|
Add news token server conf
|
2017-12-04 11:37:08 +01:00 |
|
artica
|
4d4cee2251
|
Auto-updated build strings.
|
2017-12-04 00:01:08 +01:00 |
|
artica
|
3d5e8760cd
|
Auto-updated build strings.
|
2017-12-03 00:01:09 +01:00 |
|
artica
|
dc8c5c54e6
|
Auto-updated build strings.
|
2017-12-02 00:01:38 +01:00 |
|
fermin831
|
1e5eec6e31
|
End to change chrome extension styles
|
2017-12-01 14:36:11 +01:00 |
|
danielmaya
|
dab2525355
|
Fixed jquery error
|
2017-12-01 13:32:50 +01:00 |
|
vgilc
|
e7fd532aa3
|
Merge branch '1351-mala-ruta-en-icono-de-borrado-en-filtros-snmp-dev' into 'develop'
Added good relative path
See merge request artica/pandorafms!1149
|
2017-12-01 13:21:29 +01:00 |
|
enriquecd
|
236012bdd8
|
Db changes for clocks in visual console - #1403
|
2017-12-01 12:56:32 +01:00 |
|
Arturo Gonzalez
|
f96e8277a0
|
Added good relative path
|
2017-12-01 12:53:16 +01:00 |
|
daniel
|
9a976ae8c8
|
fixed minor error pandora_server.conf
|
2017-12-01 12:44:35 +01:00 |
|
danielmaya
|
8b9c59a3b0
|
Fixed Unkwon Icon in GIS
|
2017-12-01 12:44:07 +01:00 |
|
daniel
|
ea03a485c1
|
fixed error server WUX
|
2017-12-01 12:26:13 +01:00 |
|
enriquecd
|
521eb8f4cb
|
Add clocks to visual console - #1403
|
2017-12-01 12:14:56 +01:00 |
|
vgilc
|
1949ee653b
|
Merge branch '1540-ayuda-general-en-mapas-de-red-dev' into 'develop'
1540 ayuda general en mapas de red dev
See merge request artica/pandorafms!1144
|
2017-12-01 11:21:37 +01:00 |
|
Arturo Gonzalez
|
d1f198b80b
|
Added new networkmaps help section
|
2017-12-01 11:16:09 +01:00 |
|
vgilc
|
f84cfa2a86
|
Merge branch '1538-estilo-deshabilitado-en-nuevos-campos-de-graphviz-dev' into 'develop'
Added disabled style
See merge request artica/pandorafms!1143
|
2017-12-01 10:58:21 +01:00 |
|
vgilc
|
46737798ba
|
Merge branch '1351-filtros-snmp-fallo-en-texto-dev' into 'develop'
Changed text
See merge request artica/pandorafms!1142
|
2017-12-01 10:57:09 +01:00 |
|
Arturo Gonzalez
|
cd7b5b68b6
|
Added disabled style
|
2017-12-01 10:14:08 +01:00 |
|
vgilc
|
75c8b1ae8f
|
Merge branch '1537-errores-al-reiniciar-el-mapa-de-red-dev' into 'develop'
Added fix to reset map function
See merge request artica/pandorafms!1140
|
2017-12-01 09:31:21 +01:00 |
|
Arturo Gonzalez
|
edd648de29
|
Changed text
|
2017-12-01 09:10:20 +01:00 |
|
vgilc
|
35ba173b88
|
Merge branch '1664-al-editar-un-radial-dinamic-pierde-el-tipo-dev' into 'develop'
Fixed update map
See merge request artica/pandorafms!1141
|
2017-12-01 09:04:30 +01:00 |
|
vgilc
|
54f0f9130b
|
Merge branch '1622-mapas-dinamicos-radiales-errores-varios-dev' into 'develop'
Added more changes to improve radial dynamic maps
See merge request artica/pandorafms!1136
|
2017-12-01 09:00:27 +01:00 |
|
artica
|
4652980457
|
Auto-updated build strings.
|
2017-12-01 00:01:11 +01:00 |
|
fermin831
|
14db564be7
|
Second style fixing in chrome events extension
|
2017-11-30 18:15:59 +01:00 |
|
fbsanchez
|
c4f9723d0d
|
PluginTools: New methods
- Added extract_key_map
- Added read_configuration
|
2017-11-30 17:00:28 +01:00 |
|
Arturo Gonzalez
|
031196782b
|
Fixed update map
|
2017-11-30 16:50:10 +01:00 |
|
slerena
|
7ac6aefc2d
|
Merge branch '1483-Cuadro_de_umbrales' into 'develop'
fixed error d3 in firefox
See merge request artica/pandorafms!946
|
2017-11-30 16:40:58 +01:00 |
|
daniel
|
a0bdab9b83
|
Merge branch 'develop' into 1483-Cuadro_de_umbrales
Conflicts:
pandora_console/godmode/agentes/module_manager_editor_common.php
pandora_console/godmode/modules/manage_network_components_form_common.php
|
2017-11-30 16:29:00 +01:00 |
|
nramon
|
9809efd6f3
|
Merge branch '1630-Lentitud_en_vista_de_eventos_con_muchos_grupos' into 'develop'
optimization view events
See merge request artica/pandorafms!1139
|
2017-11-30 16:12:14 +01:00 |
|
Arturo Gonzalez
|
92d054695d
|
Added fix to reset map function
|
2017-11-30 16:00:32 +01:00 |
|
daniel
|
e0b90f2be0
|
optimization view events
|
2017-11-30 14:00:08 +01:00 |
|
fermin831
|
2b62700fb6
|
Fixed some in chrome events extension
|
2017-11-30 13:51:56 +01:00 |
|
nramon
|
ac06725d99
|
Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db' into 'develop'
Apply db changes to hide no data field event template reports - #1326
See merge request artica/pandorafms!941
|
2017-11-30 13:31:48 +01:00 |
|
nramon
|
34be6f88cd
|
Merge branch '1526-grep_syslog_module' into 'develop'
1526 grep syslog module
See merge request artica/pandorafms!1138
|
2017-11-30 13:24:36 +01:00 |
|
Ramon Novoa
|
c72f583f0a
|
Merge remote-tracking branch 'origin/develop' into 1526-grep_syslog_module
|
2017-11-30 13:20:51 +01:00 |
|
nramon
|
cf32b4163c
|
Merge branch '1326/1382-MR-db-changes' into 'develop'
1326 / 1382 - Mr 10 changes
See merge request artica/pandorafms!1137
|
2017-11-30 13:12:41 +01:00 |
|
nramon
|
3390dc7c24
|
Merge branch '1382-Ordenar-elementos-custom-graphs-4606-db' into 'develop'
Db changes for tgraph_source field order - #1382
See merge request artica/pandorafms!965
|
2017-11-30 13:12:31 +01:00 |
|
nramon
|
cf01084873
|
Merge branch '1382-Ordenar-elementos-custom-graphs-4606' into 'develop'
Add order items setting bar to graph editor - #1382
See merge request artica/pandorafms!961
|
2017-11-30 13:12:25 +01:00 |
|
nramon
|
c7676d7f4a
|
Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open' into 'develop'
Add hide no data item checkbox to report templates - open - #1326
See merge request artica/pandorafms!940
|
2017-11-30 12:57:59 +01:00 |
|
enriquecd
|
688736288c
|
Change treport_content_template fileds order - #1326
|
2017-11-30 12:46:29 +01:00 |
|
slerena
|
f820a1db94
|
Merge branch 'Ordenar-en-seccion-user-dev' into 'develop'
Fixed last contact in metaconsole users_setup
See merge request artica/pandorafms!1134
|
2017-11-30 12:37:19 +01:00 |
|
enriquecd
|
097bc39d74
|
Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
|
2017-11-30 12:28:21 +01:00 |
|
nramon
|
274fa38e23
|
Merge branch '1242-Unificar-ayudas-de-alertas' into 'develop'
Change alert macros help texts and translations - #1242
See merge request artica/pandorafms!981
|
2017-11-30 12:27:01 +01:00 |
|
enriquecd
|
628d5d2c62
|
Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open
|
2017-11-30 12:09:53 +01:00 |
|
enriquecd
|
6075c9b6b9
|
1326 / 1382 - Mr 10 changes
|
2017-11-30 11:55:11 +01:00 |
|
enriquecd
|
4f3f2525e1
|
Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas
Conflicts:
pandora_console/include/help/en/help_alert_config.php
pandora_console/include/help/en/help_alert_macros.php
pandora_console/include/help/es/help_alert_config.php
pandora_console/include/help/es/help_alert_macros.php
|
2017-11-30 11:47:47 +01:00 |
|
Arturo Gonzalez
|
30c879b600
|
Added more changes to improve radial dynamic maps
|
2017-11-30 10:45:28 +01:00 |
|
Arturo Gonzalez
|
fbab43b451
|
In progress
|
2017-11-30 08:04:56 +01:00 |
|
artica
|
d8ee188b95
|
Auto-updated build strings.
|
2017-11-30 00:01:12 +01:00 |
|