Commit Graph

7056 Commits

Author SHA1 Message Date
Arturo Gonzalez 00ac431216 Added code to manage timestamps in fullscale mode 2017-06-12 13:33:41 +02:00
artica ff30396595 Auto-updated build strings. 2017-06-12 00:01:16 +02:00
artica 0d458763b9 Auto-updated build strings. 2017-06-11 00:01:13 +02:00
artica 97bf8f1fda Auto-updated build strings. 2017-06-10 00:01:13 +02:00
artica 1f94295c0c Auto-updated build strings. 2017-06-09 00:01:17 +02:00
daniel 2d441437a8 fixed errors in login page 2017-06-08 11:26:16 +02:00
Arturo Gonzalez 4e02e31c8b Trace removed 2017-06-08 09:01:36 +02:00
artica bb17348087 Auto-updated build strings. 2017-06-08 00:01:15 +02:00
Arturo Gonzalez 7782b08b59 Added lost value 2017-06-07 15:10:51 +02:00
artu30 01f6f6ef5b Merge branch 'develop' into '851-new-report-type-max+min+avg-dev'
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.item_editor.php
#   pandora_console/include/functions_reporting_html.php
2017-06-07 14:56:44 +02:00
vgilc 149a77a559 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7_rev' into 'develop'"
This reverts merge request !558
2017-06-07 09:32:35 +02:00
vgilc c674892709 Revert "Merge branch 'fixed-errors-in-login' into 'develop'"
This reverts merge request !559
2017-06-07 09:31:46 +02:00
artica a19b321f9a Auto-updated build strings. 2017-06-07 00:01:14 +02:00
daniel c25c5acfeb fixed errors instalation 2017-06-06 15:22:58 +02:00
daniel 5d3a0c4ab7 fixed errors in login page 2017-06-06 13:57:10 +02:00
vgilc aedb440ea2 Merge branch '757-full-scale-graph-dev' into 'develop'
757 full scale graph dev

See merge request !552
2017-06-06 09:51:04 +02:00
vgilc 164f70cb7d Merge branch '959-Masivas-de-plugins-no-funcionan' into 'develop'
Decode html entities in module plugin selector for edit bulk operation - #959

See merge request !553
2017-06-06 09:50:14 +02:00
artica a90906f2c9 Auto-updated build strings. 2017-06-06 00:01:16 +02:00
enriquecd ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev'
# Conflicts:
#   pandora_console/include/functions_graph.php
2017-06-05 09:38:06 +02:00
artica 291ae3a192 Auto-updated build strings. 2017-06-05 00:01:13 +02:00
artica f9da9b404b Auto-updated build strings. 2017-06-04 00:01:14 +02:00
artica 9f041fb76b Auto-updated build strings. 2017-06-03 00:01:19 +02:00
vgilc a4ecc9374d Merge branch '949-node-events-with-event-replication-dev' into 'develop'
Fixed readonly validation in nodes

See merge request !542
2017-06-02 11:04:22 +02:00
vgilc eab92ce1c8 Merge branch '925-UM-Offline-y-current_package_enterprise-dev' into 'develop'
Changed current_package_enterprise

See merge request !516
2017-06-02 11:00:51 +02:00
vgilc 1c4f64ac2a Merge branch '936-weird-general-item-in-reports-dev' into 'develop'
Fixed general item in reports

See merge request !526
2017-06-02 10:59:02 +02:00
vgilc db43f909fd Merge branch '920-Wrong-visualization-with-custom-graphs-items-in-visual-console-dev' into 'develop'
Changed custom graph size specs in visual console

See merge request !517
2017-06-02 10:32:58 +02:00
vgilc 12008fee56 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop'"
This reverts merge request !547
2017-06-02 10:31:48 +02:00
vgilc 6ad0dde2b7 Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop'
fixed errors in errors login

See merge request !547
2017-06-02 09:19:35 +02:00
artica 475a56f6bd Auto-updated build strings. 2017-06-02 00:01:19 +02:00
daniel 00f5c2027c fixed errors in errors login 2017-06-01 18:23:06 +02:00
Arturo Gonzalez 5d2a3fc094 Fixed readonly validation in nodes 2017-06-01 12:17:30 +02:00
Arturo Gonzalez 77b5e74343 Added new condition to dashboard and non avg only in simple graphs 2017-06-01 11:24:59 +02:00
vgilc b9db37f663 Merge branch '523-deteccion-de-cambios-en-inventario-modulo-software-y-otros-con-varias-lineas-open' into 'develop'
Format module inventary to show only changes on events - #523

See merge request !508
2017-06-01 09:47:48 +02:00
vgilc 3aa4fc7315 Merge branch '943-header-refresh-no-stops-in-events-view-dev' into 'develop'
Removed old code that breaks the autorefresh pause

See merge request !538
2017-06-01 09:32:42 +02:00
artica 40cc85ab43 Auto-updated build strings. 2017-06-01 00:01:17 +02:00
vgilc 87f3cb46f6 Merge branch '923-New-sound-events-console-view-dev' into 'develop'
Added new visual styles to event sound console

See merge request !513
2017-05-31 17:46:11 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop'
807 module massive operations with tag filter dev

See merge request !476
2017-05-31 17:42:09 +02:00
vgilc e085a8a006 Merge branch '843-Error-Perfil-en-copia-masiva-de-modulos' into 'develop'
fixed errors in massive copy modules

See merge request !451
2017-05-31 17:40:27 +02:00
vgilc 4e4415a102 Merge branch '826-Error-en-paginación-de-usuarios-despues-de-borrar-crear-un-usuario' into 'develop'
Pagination links include delete, create and other params, now not use these para…

See merge request !442
2017-05-31 17:38:54 +02:00
vgilc 61a9d923a4 Merge branch '889-Remove-babel-auth-in-pandora-dev' into 'develop'
Removed babel

See merge request !502
2017-05-31 17:34:47 +02:00
vgilc 18a2ff1701 Merge branch '937-Gráficas-de-servicios-muestran-datos-en-desconocido-entre-las-muestras-de-datos-correctos-almacenados-2' into 'develop'
Fill empty data in graphs with last known data, no with nodata point - #937

See merge request !535
2017-05-31 17:26:11 +02:00
vgilc 8eb4300e1a Merge branch '888-Last-contact-en-rojo-en-Agent-detail-Ext-4032' into 'develop'
Ignore 0 value modules interval when check last contact in agent details - #888

See merge request !480
2017-05-31 16:58:18 +02:00
Arturo Gonzalez 4ba94f065e Removed old code that breaks the autorefresh pause 2017-05-31 16:40:10 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
Arturo Gonzalez bca10d7b5a Changed text to fix it 2017-05-31 12:16:18 +02:00
vgilc bad1a72c69 Merge branch 'update-japanese-help' into 'develop'
japanese help for cascade protection.

See merge request !474
2017-05-31 11:30:30 +02:00
vgilc 55d94f386e Merge branch 'update-japanese-help-alert_macros' into 'develop'
Update japanese help for alert macros.

See merge request !483
2017-05-31 11:30:19 +02:00
vgilc d4a448e2db Merge branch 'update-japanese-translation' into 'develop'
Update Japanese translations.

See merge request !515
2017-05-31 11:29:41 +02:00
artica 619014733b Auto-updated build strings. 2017-05-31 00:01:19 +02:00