enriquecd
|
26d115a84e
|
Merge branch 'develop' into 1470-Editar-modulo-web-analysis
Conflicts:
pandora_console/include/functions_ui.php
|
2017-12-21 14:37:55 +01:00 |
|
enriquecd
|
5747299d8e
|
Add visual effect to login page - #1724
|
2017-12-21 13:45:57 +01:00 |
vgilc
|
dafa8202f5
|
Merge branch 'ent-1536-macro-para-id-extra' into 'develop'
Added help documentation to _event_extra_id_
See merge request artica/pandorafms!1098
|
2017-12-21 13:16:00 +01:00 |
fermin831
|
5b3408bae5
|
Added some lost help macros
|
2017-12-21 13:11:45 +01:00 |
|
fermin831
|
8e2616e642
|
Merge branch 'develop' into ent-1536-macro-para-id-extra
|
2017-12-21 12:18:58 +01:00 |
danielmaya
|
9c764dcf94
|
Autenticación LDAP
|
2017-12-21 11:35:02 +01:00 |
|
fermin831
|
9a43f1fa7d
|
Merge branch 'develop' into ent-1536-macro-para-id-extra
Conflicts resolved:
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
pandora_console/include/help/ja/help_alert_config.php
pandora_console/include/help/ja/help_alert_macros.php
|
2017-12-21 11:10:38 +01:00 |
|
vgilc
|
6ac8571b2d
|
Merge branch '979-CLI/API-Para-sincronizar-la-metaconsola' into 'develop'
Metaconsole synchronization for api - #979
See merge request artica/pandorafms!1057
|
2017-12-21 11:00:09 +01:00 |
|
vgilc
|
db55901bf5
|
Merge branch '1437-Mejorar-pantalla-de-introducción-de-licencia-open' into 'develop'
Change license windows style - #1437
See merge request artica/pandorafms!1048
|
2017-12-21 10:58:46 +01:00 |
|
vgilc
|
5332236a10
|
Merge branch 'ent-1445-ficheros-orig' into 'develop'
Delete orig repo files
See merge request artica/pandorafms!1069
|
2017-12-21 10:58:09 +01:00 |
|
vgilc
|
d9884fd431
|
Merge branch 'actualizar-el-cliente-de-ehorus' into 'develop'
Resolve: "Actualizar el cliente de eHorus"
See merge request artica/pandorafms!1055
|
2017-12-21 10:57:15 +01:00 |
|
vgilc
|
6325e336c5
|
Merge branch 'ent-1580-flecha-de-interface-information-casi-no-se-ve' into 'develop'
Fixed dark arrow in Interface information (SNMP)
See merge request artica/pandorafms!1087
|
2017-12-21 10:55:40 +01:00 |
|
vgilc
|
e6d7cc1632
|
Merge branch '1253-Error-en-icono-grupo-Consola-Visual-metaconsola' into 'develop'
Change group items url links in metaconsole - #1253
See merge request artica/pandorafms!1066
|
2017-12-21 10:53:03 +01:00 |
|
vgilc
|
e5c4dc4778
|
Merge branch '1319-Unsuccessfull-action-open' into 'develop'
Check empty SLA fields on SLA wizar create form - #1319
See merge request artica/pandorafms!1096
|
2017-12-21 10:52:35 +01:00 |
|
vgilc
|
8ea951a4bb
|
Merge branch 'ent-1520-error-en-grafica-de-agente-no-dinamica' into 'develop'
Fixed non interactive status graphs
See merge request artica/pandorafms!1063
|
2017-12-21 10:48:17 +01:00 |
|
vgilc
|
97fc2dc4d1
|
Merge branch '1532-edición-de-módulos-a-través-de-operaciones-masivas-dev' into 'develop'
Hide and show fields in edit modules bulk
See merge request artica/pandorafms!1102
|
2017-12-21 10:47:53 +01:00 |
|
vgilc
|
c8b8f147e9
|
Merge branch '1572-Descripción-de-interfaces-en-switch-dell-powerconnect-Wizard-SNMP-interfaces-dev' into 'develop'
Fixed snmp interface wizard for switch dell powerconnect
See merge request artica/pandorafms!1094
|
2017-12-21 10:47:31 +01:00 |
|
vgilc
|
b8615d8a29
|
Merge branch '1574-Fallo-JS-con-cabeceras-POST' into 'develop'
Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574
See merge request artica/pandorafms!1084
|
2017-12-21 10:47:08 +01:00 |
|
vgilc
|
097bc3df32
|
Merge branch 'ent-1577-vista-general-descuadrada-en-graph-containers' into 'develop'
Added resize functionality to flot graphs and fix overview in container graphs
See merge request artica/pandorafms!1068
|
2017-12-21 10:46:42 +01:00 |
|
vgilc
|
0c8315ec9f
|
Merge branch 'ent-1581-graficas-de-interfaces-se-abren-mal' into 'develop'
Fixed first click on interface graphs
See merge request artica/pandorafms!1070
|
2017-12-21 10:46:02 +01:00 |
|
vgilc
|
7938f6e65e
|
Merge branch '1617-Consola-visual-Previsualización-background-no-carga-imagen' into 'develop'
Fix preload background image in visual console builder - #1617
See merge request artica/pandorafms!1090
|
2017-12-21 10:44:03 +01:00 |
|
vgilc
|
477d3c3d0f
|
Merge branch '1621-Imagen-rota-en-barra-de-consola-visual-publica' into 'develop'
Fix qr button image in public viusal console - #1621
See merge request artica/pandorafms!1093
|
2017-12-21 10:43:42 +01:00 |
|
vgilc
|
3dad6d1837
|
Merge branch '1460-4706-No-funciona-token-Mostrar-solo-la-media-en-Visual-Styles' into 'develop'
Only average token for graphs fix - #1460
See merge request artica/pandorafms!1040
|
2017-12-21 10:42:12 +01:00 |
|
vgilc
|
733564dcb1
|
Merge branch 'default-mobile-page' into 'develop'
[Pandora Console > Mobile] Added support to the user's default page
See merge request artica/pandorafms!1091
|
2017-12-21 10:41:24 +01:00 |
|
vgilc
|
9971b2648d
|
Merge branch 'hacer-filtro-agentes-persistente' into 'develop'
Resolve: "[Mobile console] Now the agents filter persists between the list and detail view"
See merge request artica/pandorafms!1101
|
2017-12-21 10:41:00 +01:00 |
|
vgilc
|
ea1ae1fa6b
|
Merge branch 'missing-id-module-macro' into 'develop'
Recovered a reverted change
See merge request artica/pandorafms!1088
|
2017-12-21 10:39:02 +01:00 |
|
vgilc
|
60486c8a1e
|
Merge branch '1659-Informe-de-eventos-de-módulos-en-plantillas-de-informes-de-la-metaconsola--Carrefour]-dev' into 'develop'
Fixed reporting_event_report_module in metaconsole
See merge request artica/pandorafms!1128
|
2017-12-21 09:53:47 +01:00 |
|
vgilc
|
45c642a6a0
|
Merge branch 'ent-1435-incluir-macros-en-event-responses' into 'develop'
Ent 1435 incluir macros en event responses
See merge request artica/pandorafms!1100
|
2017-12-21 09:46:55 +01:00 |
|
vgilc
|
d9b3703aad
|
Merge branch '1582-Auto-disable-mode-en-operaciones-masivas-dev' into 'develop'
Added Autodisable mode in bulk operation
See merge request artica/pandorafms!1060
|
2017-12-21 09:07:49 +01:00 |
|
vgilc
|
e89363582a
|
Merge branch '1596-4876-Dropdown-menus-por-orden-de-ID' into 'develop'
Order by name group select in manage agent view - #1596
See merge request artica/pandorafms!1078
|
2017-12-21 09:06:21 +01:00 |
|
vgilc
|
349a9bbd35
|
Merge branch '1613-4894-No-aparece-fecha-final-en-las-graficas-24h-de-los-agentes' into 'develop'
Change time format in agent events 24h bar view and show the last start time - #1613
See merge request artica/pandorafms!1089
|
2017-12-21 09:04:55 +01:00 |
|
vgilc
|
4f0a451ba1
|
Merge branch '1576-Permisos-sobre-gráficas-no-permite-ver-graph-containers-4863-media-open' into 'develop'
1576 permisos sobre gráficas no permite ver graph containers 4863 media open
See merge request artica/pandorafms!1072
|
2017-12-21 08:59:36 +01:00 |
|
vgilc
|
c98e94e59e
|
Merge branch '1626-Fallo-al-clonar-item-de-la-consola-visual-dev' into 'develop'
Fixed copy item in visual console
See merge request artica/pandorafms!1106
|
2017-12-21 08:56:17 +01:00 |
artica
|
9b40ee6422
|
Auto-updated build strings.
|
2017-12-21 00:01:25 +01:00 |
|
artica
|
6db5ced911
|
Auto-updated build strings.
|
2017-12-20 00:01:11 +01:00 |
|
vgilc
|
2d314dad1c
|
Merge branch '1531-performance' into 'develop'
Added -g option to pandora_perf_report
See merge request artica/pandorafms!1199
|
2017-12-19 16:36:49 +01:00 |
|
vgilc
|
f72b5257ba
|
Merge branch '1257-Traducciones-consola-2' into 'develop'
Translations - #1257
See merge request artica/pandorafms!1200
|
2017-12-19 16:18:43 +01:00 |
|
enriquecd
|
ff462e7b44
|
Translations - #1257
|
2017-12-19 16:11:35 +01:00 |
fbsanchez
|
67f76cadfc
|
Added -g option to pandora_perf_report
MySQL optimization
|
2017-12-19 16:08:27 +01:00 |
|
vgilc
|
7033746c49
|
Merge branch '1632-Pandora_FMS_charts_3' into 'develop'
fixed errors in graphs webproc and keep alive
See merge request artica/pandorafms!1198
|
2017-12-19 15:47:03 +01:00 |
daniel
|
a335732267
|
fixed errors in graphs webproc and keep alive
|
2017-12-19 13:13:42 +01:00 |
|
vgilc
|
32b81ae7aa
|
Merge branch '1632-Pandora_FMS_charts_2' into 'develop'
fixed minor errors
See merge request artica/pandorafms!1196
|
2017-12-19 10:04:02 +01:00 |
|
daniel
|
fd66f84d0b
|
fixed minor errors
|
2017-12-19 09:57:52 +01:00 |
|
vgilc
|
9fce865099
|
Merge branch '1531-herramientas-de-linea-de-comando-para-medir-el-rendimiento-de-pandora' into 'develop'
Perf. Meassurement updated
See merge request artica/pandorafms!1195
|
2017-12-19 09:13:37 +01:00 |
|
artica
|
b4d643f08f
|
Auto-updated build strings.
|
2017-12-19 00:01:46 +01:00 |
|
fbsanchez
|
23e205d158
|
1532 end
|
2017-12-18 19:43:08 +01:00 |
|
fbsanchez
|
f61f291490
|
1532 Minor fix
|
2017-12-18 19:41:23 +01:00 |
|
fbsanchez
|
9861c89495
|
Perf. Meassurement updated
|
2017-12-18 19:20:03 +01:00 |
|
vgilc
|
6d3a9efe01
|
Merge branch '1531-herramientas-de-linea-de-comando-para-medir-el-rendimiento-de-pandora' into 'develop'
pandora_perf_report v1
See merge request artica/pandorafms!1194
|
2017-12-18 18:56:20 +01:00 |
|
fbsanchez
|
fbee7205e5
|
pandora_perf_report v1
|
2017-12-18 18:50:26 +01:00 |