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 |
fbsanchez
|
831e621c6a
|
PluginTools transfer_xml CDE
|
2017-11-29 19:48:15 +01:00 |
|
fbsanchez
|
7283390f12
|
PluginTools CDE
|
2017-11-29 18:27:31 +01:00 |
vgilc
|
13369ddab4
|
Merge branch 'redeclare-agents_get_agent_id_by_alias-dev' into 'develop'
Fixed redeclare function
See merge request artica/pandorafms!1135
|
2017-11-29 18:17:08 +01:00 |
danielmaya
|
3adb990970
|
Fixed redeclare function
|
2017-11-29 18:11:40 +01:00 |
|
danielmaya
|
aeb3e73221
|
Fixed last contact in metaconsole users_setup
|
2017-11-29 17:42:57 +01:00 |
|
fbsanchez
|
5f0bc277b6
|
PluginTools Added get_lib_version
|
2017-11-29 17:13:12 +01:00 |
|
vgilc
|
227eb2b9cb
|
Merge branch '1465-optimizacion-en-el-procesado-de-xml' into 'develop'
Performance improvements. Rewrote safe_input and safe_output.
See merge request artica/pandorafms!925
|
2017-11-29 17:08:03 +01:00 |
|
vgilc
|
2531e43d4a
|
Merge branch '1263-Mensajes-de-Visor-de-logs-del-sistema' into 'develop'
Change phrases in system logfile viewer - #1263
See merge request artica/pandorafms!968
|
2017-11-29 17:03:42 +01:00 |
|
vgilc
|
7947a1797c
|
Merge branch 'consola-visual-muestra-entities-en-el-textarea-donde-muestra-el-ultimo-evento-que-hace-saltar-la-consola' into 'develop'
Fixed the HTML entities problem of the sound events view
See merge request artica/pandorafms!953
|
2017-11-29 17:02:50 +01:00 |
|
vgilc
|
3a4ed1671b
|
Merge branch '1410-Traducción-en-filtro-de-Alertas' into 'develop'
Change manage alerts list enabled / disabled select text - #1410
See merge request artica/pandorafms!973
|
2017-11-29 16:59:57 +01:00 |
|
vgilc
|
0e4c17cf1e
|
Merge branch '1412-Filtro-por-más-campos-en-Manage-agents-2' into 'develop'
Add new fields to filter in search input text and operative selector filter - #1412
See merge request artica/pandorafms!972
|
2017-11-29 16:59:27 +01:00 |
|
vgilc
|
43308596c1
|
Merge branch '1490-Añadir-un-nuevo-campo-de-búsqueda-en-vista-de-agentes-dev' into 'develop'
added Search in custom fields
See merge request artica/pandorafms!969
|
2017-11-29 16:57:32 +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 |
|
vgilc
|
93c0ddfad4
|
Merge branch 'ent-1545-no-mostrar-valor-de-modulos-booleanos-en-static-graphs-carrefour' into 'develop'
Removed last value on visual console boolean static graphs
See merge request artica/pandorafms!1053
|
2017-11-29 16:56:36 +01:00 |
|
vgilc
|
dad457b4d6
|
Merge branch 'ent-621-automonitorizacion-del-servidor-usa-comandos-de-otro-sistema-operativo' into 'develop'
Fixed automonitoring on Windows
See merge request artica/pandorafms!971
|
2017-11-29 16:56:10 +01:00 |
|
vgilc
|
b0eb815e8e
|
Merge branch '1224-No_funciona_el_boton_de_restablecer_campos_por_defecto_en_el_configurador_de_columnas_del_visor_de_eventos' into 'develop'
fixed error in event fields
See merge request artica/pandorafms!935
|
2017-11-29 16:55:48 +01:00 |
|
vgilc
|
66d15f3e4f
|
Merge branch 'ent-1239-falta-texto-de-ayuda-definicion-de-modulos' into 'develop'
Added autodisable mode help
See merge request artica/pandorafms!976
|
2017-11-29 16:55:24 +01:00 |
|
vgilc
|
55e93d8fc9
|
Merge branch 'ent-1418-error-cuando-mysql-no-esta-levantado' into 'develop'
Fixed console error 500 when mysql is not running
See merge request artica/pandorafms!959
|
2017-11-29 16:54:58 +01:00 |
|
vgilc
|
5b506764fd
|
Merge branch '1467-Error-en-API-al-deshabilitar-alertas-dev' into 'develop'
Fixed function api_set_disable_alert
See merge request artica/pandorafms!989
|
2017-11-29 16:54:00 +01:00 |
|
vgilc
|
ef86663813
|
Merge branch 'no-cargan-los-modulos-en-cualquier-arbol-que-no-sea-el-de-grupos' into 'develop'
Resolve: No cargan los modulos en cualquier arbol que no sea el de grupos
See merge request artica/pandorafms!977
|
2017-11-29 16:48:38 +01:00 |
|
vgilc
|
9c32657220
|
Merge branch 'ent-1514-buscador-monitor-detail' into 'develop'
Added wux modules to monitor view
See merge request artica/pandorafms!1024
|
2017-11-29 16:48:11 +01:00 |
|
vgilc
|
53ac2d94bf
|
Merge branch '1527-Auto-refresco-no-permite-crear-nuevos-dashboards' into 'develop'
Disable autorefresh on new dashboard view - #1527
See merge request artica/pandorafms!1029
|
2017-11-29 16:47:45 +01:00 |
|
vgilc
|
f8695a2781
|
Merge branch 'ent-986-macros-para-comentarios-en-ipam-4113-vodat' into 'develop'
Added _event_cfX_ to macros help
See merge request artica/pandorafms!920
|
2017-11-29 16:47:09 +01:00 |
|
vgilc
|
2705737058
|
Merge branch '1652-se-eliminan-las-lineas-de-las-consolas-en-la-vista-a-pantalla-completa-dev' into 'develop'
Fixed error generated in issue pandora_enterprise#110
See merge request artica/pandorafms!1124
|
2017-11-29 16:42:48 +01:00 |
|
vgilc
|
57dbb0599d
|
Merge branch '1654-No-sale-el-nombre-del-mapa-en-pandora-open-dev' into 'develop'
Added lost map info
See merge request artica/pandorafms!1126
|
2017-11-29 16:20:34 +01:00 |
|
vgilc
|
7ce6535170
|
Merge branch '1658-permisos-para-manipular-archivos-en-colecciones-dev' into 'develop'
Added qw perms
See merge request artica/pandorafms!1127
|
2017-11-29 16:20:08 +01:00 |
|
vgilc
|
019829685c
|
Merge branch '1564-Error-al-crear-módulos-SNMPv3-desde-snmpwalk-dev' into 'develop'
Fixed creating network components by snmpwalk
See merge request artica/pandorafms!1065
|
2017-11-29 16:15:21 +01:00 |
|
vgilc
|
3a5b8928ac
|
Merge branch 'ent-1035-busqueda-libre-en-visor-de-datos' into 'develop'
Added free search values to data table
See merge request artica/pandorafms!992
|
2017-11-29 16:10:46 +01:00 |
|
vgilc
|
17f38dfa2f
|
Merge branch '1489-4737-agente-windows-difiere-en-instalacion-normal-y-silenciosa' into 'develop'
Modified windows configuration file to fit with nsis
See merge request artica/pandorafms!986
|
2017-11-29 16:07:22 +01:00 |
|
vgilc
|
659d16d372
|
Merge branch '1329-Visualizar-auditoria-de-cambios-de-contraseña-4225' into 'develop'
Audit password changes in system audit log - #1329
See merge request artica/pandorafms!932
|
2017-11-29 16:03:20 +01:00 |
fermin831
|
11fb91b5c0
|
Merge branch 'develop' into 1489-4737-agente-windows-difiere-en-instalacion-normal-y-silenciosa
Conflicts:
pandora_agents/win32/bin/pandora_agent.conf
|
2017-11-29 15:49:56 +01:00 |
|
vgilc
|
1895bf3fe9
|
Merge branch '1375-Que-se-muestre-la-unidad-en-las-custom-graphs-dev' into 'develop'
added unit in custom graphs
See merge request artica/pandorafms!979
|
2017-11-29 15:42:40 +01:00 |
|
vgilc
|
86051a861f
|
Merge branch '1458-Error-al-actualizar-custom-fields' into 'develop'
Not show error when only update custom fields in agents - #1458
See merge request artica/pandorafms!929
|
2017-11-29 15:42:03 +01:00 |
|
vgilc
|
55dd05c406
|
Merge branch 'buscar-un-grupo-en-el-tree-view-carrefour' into 'develop'
Resolve: Buscar un grupo en el tree view carrefour
See merge request artica/pandorafms!1003
|
2017-11-29 15:41:31 +01:00 |
|
vgilc
|
976fd7d315
|
Merge branch '1492-ACL-no-permiten-buscar-en-Monitor-View-dev' into 'develop'
Fixed search in status monitor with ACL enterprise
See merge request artica/pandorafms!949
|
2017-11-29 15:39:37 +01:00 |