f14684b22d
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup.php
Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
2019-02-07 07:58:33 +01:00
1f3fe51f69
Auto-updated build strings.
...
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
2019-02-07 00:01:40 +01:00
9ea3980b26
wip supervisor
...
Former-commit-id: 991922a7dd18ace8fd831d02ada2cf20e81d27c2
2019-02-06 20:22:22 +01:00
9c623148f5
Fixed conflict
...
Former-commit-id: 02b3e0656041e5bdadf295177f0c29a81abf8c3f
2019-02-06 19:14:46 +01:00
fcb9275d11
Fixed conflict
...
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
2019-02-06 19:09:09 +01:00
f098b72fe4
Merge branch 'ent-3274-Retoque-visual-vista-SNMP-interfaces' into 'develop'
...
Fixed height in slicesbar graph of table interface snmp - #3274
See merge request artica/pandorafms!2144
Former-commit-id: c4e83cd7a6525aae2a567a90b3fb7d4d1ebb70bf
2019-02-06 18:56:47 +01:00
986dfcb74d
Added basic and dummy user edit notifications
...
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
2019-02-06 18:20:26 +01:00
37d02ddf59
Added disabled status to switches
...
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
2019-02-06 18:18:48 +01:00
9568cc9aba
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/include/functions_config.php
Former-commit-id: 19f087050477dcc099bd31d7de62ac893de5d686
2019-02-06 18:06:49 +01:00
f1f929bfe4
Merge branch 'develop' into 'ent-3392-7367-estado-de-elemento-incorrecto-en-consola-visual'
...
# Conflicts:
# pandora_console/include/functions_visual_map.php
Former-commit-id: 07e2add1d1e20f292d7bae05bcaa6452c92e4543
2019-02-06 17:37:23 +01:00
d113bfbeb8
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 57658aa74a36e6ca9bc53af58e3732e895cf977c
2019-02-06 17:02:58 +01:00
9f7ab61766
Merge branch '3358-Mejora-en-la-aplicación-de-estilos' into 'develop'
...
3358 mejora en la aplicación de estilos
See merge request artica/pandorafms!2161
Former-commit-id: ef392bbd62ec9df99964d2057e23e35e334cb6c7
2019-02-06 16:34:00 +01:00
dee7c769f2
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup_auth.php
pandora_console/godmode/setup/setup_ehorus.php
pandora_console/godmode/setup/setup_general.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/styles/pandora.css
modificado: pandora_console/include/functions_html.php
Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
2019-02-06 16:11:46 +01:00
19c5a1c844
fixed error pdf
...
Former-commit-id: 2a81a654df0c216951c61f36ff31a05ce5f7e29a
2019-02-06 15:58:36 +01:00
b805fe594e
Merge remote-tracking branch 'origin/develop' into ent-3274-Retoque-visual-vista-SNMP-interfaces
...
Conflicts:
pandora_console/include/functions_reporting_html.php
Former-commit-id: d096025f7a166160598f9fb26fe17c60809c9c3e
2019-02-06 15:34:06 +01:00
a3aca91765
Fixed WMI passwords when encrypted
...
Former-commit-id: 7cadbe954ddd7c6878a58a7fbae13ab984ddb736
2019-02-06 15:26:43 +01:00
cc17cbf60f
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
...
Conflicts:
pandora_console/include/functions_config.php
Former-commit-id: 3456fcc7a45639055010e67440601ac4fba547ec
2019-02-06 15:22:05 +01:00
b8aab972c9
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/godmode/groups/group_list.php
Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
2019-02-06 15:14:22 +01:00
27495845ba
Merge remote-tracking branch 'origin/ent-3371-sistema-de-notificaciones-pandora' into ent-1959-cron-supervisor-de-estado
...
Former-commit-id: 500d7bb0d6e05093cfa3d7557fb8af6f22c410c7
2019-02-06 12:53:02 +01:00
6ddcfcbb19
Fixed code style lintern
...
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
77c92ba5ab
Merge remote-tracking branch 'origin/ent-3371-sistema-de-notificaciones-pandora' into ent-1959-cron-supervisor-de-estado
...
Former-commit-id: 982b806890f05118d71c6424a8879168c3a00028
2019-02-06 11:49:20 +01:00
c0a23889ab
Auto-updated build strings.
...
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
2019-02-06 00:01:29 +01:00
6f87b436d0
minor fix
...
Former-commit-id: 3fabf2561773365932c5d33e8bf9e42b7ed4e7f0
2019-02-05 18:47:41 +01:00
ddcf0bbd16
Added deletion on global notification config
...
Former-commit-id: 2356bbe374e5decf929cfaaf2fc4776611b0652d
2019-02-05 18:14:10 +01:00
7df3fe2dac
Added functionallity to Add element on notification global config
...
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
2019-02-05 17:40:44 +01:00
8811257762
Popup to add groups and sources to global notification configuration
...
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
2019-02-05 13:36:16 +01:00
0b72571c7c
Added NOT IN in format mysql filter
...
Former-commit-id: f3a8cdd6923834443ed7223d1e6ad7776b861184
2019-02-05 12:53:57 +01:00
418d497291
fixed errors pdf
...
Former-commit-id: f7ad69f6b5e0910e5f31464ddfe94593529ef6a7
2019-02-05 10:40:24 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
97259bc285
Auto-updated build strings.
...
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
2019-02-05 00:01:28 +01:00
89af077b52
Servers get server string name
...
Former-commit-id: e67755e9a86872ba65c5768191cba80fbd879322
2019-02-04 19:16:50 +01:00
53947de42a
minor changes - constants style
...
Former-commit-id: 3482cb88dc0884ea3c1742eb8fef4ac7c603a849
2019-02-04 19:14:02 +01:00
20e0508e01
fixed pdf report
...
Former-commit-id: 515b8f06f3584c6aaa1a32ea29a2f555e7afccad
2019-02-04 12:10:52 +01:00
54f0bc1a03
Disable selec boxes when click notify all users on notifications global config
...
Former-commit-id: 93a3a0007a3a8dfabfec5d0b9ead7d185aeee81b
2019-02-04 11:02:52 +01:00
d2a3d3bbbc
Added all users in global notifications config
...
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
2019-02-04 10:41:35 +01:00
4c735762dc
Merge branch 'develop' into cursed-format-change
...
Former-commit-id: a986a0245f7f0cce5ea7fc3c33503bc53e85242a
2019-02-04 09:11:39 +01:00
af1f081e5c
Auto-updated build strings.
...
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
2019-02-04 00:01:33 +01:00
934533141e
Auto-updated build strings.
...
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
2019-02-03 00:01:26 +01:00
24e799f18e
Auto-updated build strings.
...
Former-commit-id: 0e390ddd2b2294dbd043bc7c94dd9a82c228c80f
2019-02-02 00:01:29 +01:00
50030b6933
Added notify all users and disable on first load
...
Former-commit-id: d193a8375ce00f3f2cf2c1fc181d4eef47c92eb2
2019-02-01 14:48:52 +01:00
a8b85d2593
Added missing docs
...
Former-commit-id: 807c7466b60e4c8ecb77fb8d94102300e9bcd780
2019-02-01 13:53:22 +01:00
315a51c5e7
Added only read selector global notification setup
...
Former-commit-id: bd6262cda30c0bb5a63b106e6c3832efbcfc63b9
2019-02-01 13:46:58 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
62461525e8
Auto-updated build strings.
...
Former-commit-id: 899c65040831974e16b76b37348dea7d428a7af3
2019-02-01 00:01:36 +01:00
1c0a5ca247
Added pospone select (fixme)
...
Former-commit-id: 428b4424a15ef54c4d95a2eb4af07a334366577a
2019-01-31 20:11:43 +01:00
75eaa875c9
Added checkboxes to notifications global configuration
...
Former-commit-id: 79df159f003292dfef697773fe8daa25b77f04c2
2019-01-31 19:43:13 +01:00
01bc0775bc
Added notification global configuration (only enable and disable)
...
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
2019-01-31 19:13:51 +01:00
b589826c86
Added HTML switch element
...
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
2019-01-31 19:11:59 +01:00
397f2964da
Added messages notification ball
...
Former-commit-id: c44a99cf63bc7451890389e4d234fd8aa7b62cbc
2019-01-31 15:16:56 +01:00
229c60c5cc
Merge branch 'develop' into cursed-format-change
...
Former-commit-id: a3dfd193c81af0ebe0549dc2a9c953aac98b5f68
2019-01-31 09:42:10 +01:00
d6667354fc
Auto-updated build strings.
...
Former-commit-id: 166da74dd65e72a242b58cf10f4c564496b76fe9
2019-01-31 00:01:24 +01:00
3f81e60df2
wip messages
...
Former-commit-id: 7852ce90b3f2681a0134a651812341f7fac00c53
2019-01-30 17:33:31 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
406c062a3c
WIP messages, usable
...
Former-commit-id: 79e0b38fe7499642480505aac088ef8b45b04714
2019-01-30 13:29:46 +01:00
2626605030
Validate alerts at the time agents/modules are modified.
...
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
7a9684f23c
Changed the format of the .css files
...
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
fa6c4d5bc9
notifications, WIP: new lib defined
...
Former-commit-id: 430ac2e090f91403fc074d2a9b37ab36de10d5a9
2019-01-30 11:56:47 +01:00
6485de04fd
Auto-updated build strings.
...
Former-commit-id: b5071a47e475e0aa13a62e9e76066cfd10d99ec1
2019-01-30 00:01:26 +01:00
edd96e75ab
Merge branch 'ent-3450-Error-informe-dinámico-al-marcar-una-gráfica-por-cada-agente' into 'develop'
...
Fixed auto combined graph in metaconsole
See merge request artica/pandorafms!2146
Former-commit-id: c25a50e5176dcb2996df04ebcee3907cc444b56e
2019-01-29 19:14:15 +01:00
11456bcfbb
Merge branch '2519_Listart_y_crear_comandos_de_alerta' into 'develop'
...
Add commands alert
See merge request artica/pandorafms!2025
Former-commit-id: 340201221d0219a0c67e1e34eb6421b7c6d1782d
2019-01-29 18:26:56 +01:00
cc27f0451a
Fixed auto combined graph in metaconsole 2
...
Former-commit-id: 672531931421175354f2a877ac295c1763107756
2019-01-29 17:12:24 +01:00
ae190ef058
Merge branch 'ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into 'develop'
...
Ent 2523 api listar, crear, borrar y modificar usuarios desde la api #6167 eu comm
See merge request artica/pandorafms!2149
Former-commit-id: a5a1e6aadf4efe43160eebe883a27ce58ac09bc2
2019-01-29 16:23:35 +01:00
fad670f322
Fixed agent status in visual map 2
...
Former-commit-id: 3294be4d9d8f66edd477486a50130920144d40f7
2019-01-29 14:44:56 +01:00
a3c71f4bca
Merge remote-tracking branch 'origin/2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
...
Former-commit-id: b8eba6ae5a4efa338199efbc35b50b1b6bea8824
2019-01-29 11:57:19 +01:00
2fc1e9715c
Fixed agent status in visual map
...
Former-commit-id: b321113da85364845ddbf31e55bd0c4442eb488c
2019-01-29 11:55:08 +01:00
cec6aedaf5
Updated version and build strings.
...
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
2019-01-29 11:08:54 +01:00
354834a872
Auto-updated build strings.
...
Former-commit-id: b59b540696e6f36d82e154a9aefea75519e9adac
2019-01-29 00:01:27 +01:00
e03b62d168
Fixed auto combined graph in metaconsole
...
Former-commit-id: c0e819e35fbb5952fa8ce2806e9cddff521a5131
2019-01-28 18:05:46 +01:00
cf2b9c5798
Fixed conflicts
...
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
2019-01-28 15:35:37 +01:00
042bf1c6e7
Merge branch '2526_Listar_acciones_de_alerta_desde_la_API' into 'develop'
...
List alert actions in nodes with CLI and API
See merge request artica/pandorafms!2085
Former-commit-id: 9732161ea417a1518e508cb9e2d20438d34ec3b2
2019-01-28 12:56:28 +01:00
ad368ed09b
Fixed height in slicesbar graph of table interface snmp - #3274
...
Former-commit-id: ebfb44b1bfe9c6d2cfb9e95a982ae169f0c631a4
2019-01-28 12:15:05 +01:00
550abc6634
Auto-updated build strings.
...
Former-commit-id: b2b65befe5f01bb047fe48f25c4f33eacc277d41
2019-01-28 00:01:23 +01:00
dd9f6e5f21
Auto-updated build strings.
...
Former-commit-id: 92bbfc8b4c06e1873fe92c9f3b31ddc43d070a1d
2019-01-27 00:01:29 +01:00
50036f2120
Auto-updated build strings.
...
Former-commit-id: 18dc882c6097c97f606ffc45e592f2118b4890cc
2019-01-26 00:01:25 +01:00
4d4569cadb
Fixed error with slashes - #3426
...
Former-commit-id: 8dbead7acd73faa66e406cccf1fe81ed775eb933
2019-01-25 13:52:49 +01:00
7d4fc056ca
fixed errors Qa
...
Former-commit-id: 9eea2ee2a3ec6bd51d0e7ef88b560e0475fe7504
2019-01-25 11:18:15 +01:00
61c9603ae8
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
2019-01-25 09:55:09 +01:00
335abb9abc
fixed error css
...
Former-commit-id: d2be8c4cf4306cb51c9b3854cbe06d4c80119d8b
2019-01-25 09:54:53 +01:00
d191cdef17
Auto-updated build strings.
...
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
2019-01-25 00:01:33 +01:00
3cd9d22f1e
Merge branch 'ent-3441-no-se-esta-comprobando-bien-el-modo-centralizado-en-el-nodo' into ent-2516-api-listar-y-crear-modulos-de-inventario-6170-eucomm
...
Former-commit-id: 577301035cbde2dee5e7a001e48aab50a482a0ec
2019-01-24 14:56:23 +01:00
072ad0a1ea
Add return value to generate_hash_to_api function
...
Former-commit-id: b6420e14ab59c08c661a11763edaaa52ad612af8
2019-01-24 13:38:13 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
f9113fa2e5
Auto-updated build strings.
...
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
2019-01-24 00:01:27 +01:00
48eea4ab87
Added centralized error code to API
...
Former-commit-id: 0400f0047276d08182477b4d4c59d42c665189c7
2019-01-23 19:21:02 +01:00
687358d70c
add new token treshold IPAM
...
Former-commit-id: cc7858af6a83b0773fec3249e13cfbfb274f2fba
2019-01-23 17:33:06 +01:00
5d8360860d
fixed error include in API not necessary
...
Former-commit-id: a1520c5b4438d559fd98bba4daafd80fb854a406
2019-01-23 17:06:31 +01:00
25d4239ef9
Merge branch '2521_Crear_grupos_de_modulo_desde_la_API' into 'develop'
...
Create module group API
See merge request artica/pandorafms!2053
Former-commit-id: 55819d89a59549ebec28d32840667e37d34a1f79
2019-01-23 17:02:34 +01:00
fb46197c1f
fixed minor error button
...
Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf
2019-01-23 15:30:46 +01:00
841a9cf60b
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: a23fffb984a6edd4ef7eefe871814ea0120c615a
2019-01-23 11:08:48 +01:00
1e4a288f53
Auto-updated build strings.
...
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
2019-01-23 00:01:23 +01:00
2e2774f256
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 5729e346de91ebf8897bc5d0dbc9f3f451711e86
2019-01-22 17:42:47 +01:00
65fce762df
Merge branch 'Informes_Event_report_group_no_se_visualizan_exportan_2' into 'develop'
...
Fixed Event reports pie graphs in metaconsole
See merge request artica/pandorafms!2128
Former-commit-id: d134417a05ddb7fd323d8ed4cba93e21e2551f7f
2019-01-22 14:30:45 +01:00
d8ca12bd63
Merge branch 'ent-3296-Descarga-informe-CSV-con-Graficas-no-funcionan' into 'develop'
...
Fixed bug in export to csv report
See merge request artica/pandorafms!2135
Former-commit-id: 04d0af4a61212057c7e539fc4513e2b45a2bc31a
2019-01-22 14:06:59 +01:00
4236b55694
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 87b7d3a7591ed181be022b786deba8f090e43d49
2019-01-22 09:00:47 +01:00
0f29d6461e
Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: b7873c08910f08827387db6d92d8a656d8ca4bf2
2019-01-22 08:57:59 +01:00
2c208b5e29
fixed errors php7 mysqli and warning include
...
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
2019-01-22 08:57:48 +01:00
c586b68cb3
Auto-updated build strings.
...
Former-commit-id: 84dcfe707e9a70754b4ee72365bd549c8d1c09ef
2019-01-22 00:01:24 +01:00
da7e8e5487
Fixed conflict
...
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
2019-01-21 19:03:32 +01:00
4c6cd847bd
Fixed bug in export to csv report
...
Former-commit-id: 4bb84abbbb42945974643207f4976131753ab257
2019-01-21 16:19:22 +01:00
bd48c96de4
Fixed duplicated function module group synch in API
...
Former-commit-id: 03b23a85223add6d8f730dbfebaf58fbf7839e2a
2019-01-21 15:03:02 +01:00
bd0aa4ea8a
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: 6545ada5fba710e8399e01f84d7503b289317abd
2019-01-21 12:26:46 +01:00
367c9fc6fc
Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d
2019-01-21 11:41:57 +01:00
1dbbc820ad
Merge branch 'develop' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: c8ce459cee080644b5184d74bdea56f34ab82eaf
2019-01-21 11:31:36 +01:00
f8ac525281
Merge branch '2527-listar-ycrear-filtros-de-eventos-desde-la-api' into 'develop'
...
implemented api functions to create/update/delete/list event filters
See merge request artica/pandorafms!2093
Former-commit-id: 03b530b0a118972a6af7b17fba9919b0fc45d611
2019-01-21 10:31:17 +01:00
dc2b738776
IPAM supernet
...
Former-commit-id: f34430ee824f4221b2922b02b844bd6c7d97614c
2019-01-21 09:24:00 +01:00
dc24599f18
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: f89cf021526d5e7f9fcaad080d0f8721c20c82cb
2019-01-21 09:22:42 +01:00
e2471b376c
Auto-updated build strings.
...
Former-commit-id: 6c89b359049f06338695df7e9cabd3293885df10
2019-01-21 00:01:23 +01:00
14c5e9d48b
Auto-updated build strings.
...
Former-commit-id: 1eb9179a088600ca4e68930cf9e903997d8f20c7
2019-01-20 00:01:23 +01:00
5a75662b99
Auto-updated build strings.
...
Former-commit-id: 8eff24974e5b3cfbeb57d408c2d4817fe0cb7156
2019-01-19 00:01:25 +01:00
344589494a
Fixed minor error
...
Former-commit-id: 56aafe5689d627ac515c80b0158fc998992bd457
2019-01-18 17:33:29 +01:00
0c9446fceb
Added new functionality in CLI and API to update module counts and alert counts
...
Former-commit-id: aca543eb33de0dc231d18a4776676a4700b37120
2019-01-18 17:24:32 +01:00
b3011e419a
Merge branch '3156-Translate-string-no-funciona' into 'develop'
...
fixed bug in function __()
See merge request artica/pandorafms!2023
Former-commit-id: 5fbbb662fdb7a044a3c616521158bcfa24e50413
2019-01-18 13:37:11 +01:00
979a87762e
Auto-updated build strings.
...
Former-commit-id: 56c567b92e7aad5a2aabd6551b3aa2f07517fb0b
2019-01-18 00:01:26 +01:00
fd2dcb3281
Changed radio buttons by toogle switch checkbox
...
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
2019-01-17 17:28:23 +01:00
3e25008c9f
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: b12bfcf0f580e011d1fa9ac9fab18d108b403b0a
2019-01-17 15:50:00 +01:00
1c8d846574
WIP IPAM Supernet
...
Former-commit-id: 9da8df381292bc79a49c1416fc6d2820f4b814ac
2019-01-17 15:49:41 +01:00
92aafb5953
Merge branch '2978-INTRACOM-Funciones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado-2' into 'develop'
...
Add traps, and other intracom API functions - #2978
See merge request artica/pandorafms!2119
Former-commit-id: 42bf67414f74d373ece3f83b4eecf2e4fd17f049
2019-01-17 12:08:03 +01:00
6bf6fd19d6
Auto-updated build strings.
...
Former-commit-id: f9fe79ec45febec900d21f62269f4352cc1a97a2
2019-01-17 00:01:26 +01:00
6e8e5d0dd6
Fixed Event reports pie graphs in metaconsole
...
Former-commit-id: 6fe0eb4035200dc4e22736098b810f31194e1a45
2019-01-16 19:44:29 +01:00
e316977d4b
Refactorize and add two new fields to api_get_groups api function
...
Former-commit-id: 2d59091279c284d549c09744ee61c8fee1e33564
2019-01-16 12:23:19 +01:00
b2434229db
Merge branch '1851-Grafica_de_widget_de_WUX_se_descoloca_si_falla_la_primera_fase' into 'develop'
...
fixed error widgets wux
See merge request artica/pandorafms!2102
Former-commit-id: c47bc3fc71f671b9ae4d668a6f81711683bb43a2
2019-01-16 11:03:02 +01:00
c0398dfa5b
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: 8cfa910f14527759459b667c2d9b1303472c30ca
2019-01-16 08:41:50 +01:00
fe13a117aa
Auto-updated build strings.
...
Former-commit-id: 04682af4f07a1cb2bae17db88c4a4f4e17ad5600
2019-01-16 00:01:27 +01:00
aabcf73210
Fixed bug in functions_api
...
Former-commit-id: 28e5d9cf323dd04432ca5cabcd447e8cbf748706
2019-01-15 16:33:52 +01:00
797b49c03d
Merge branch '313-Respuestas-de-evento-masivas' into 'develop'
...
ent-313-Respuestas-de-evento-masivas
See merge request artica/pandorafms!2121
Former-commit-id: c4cf56f0b2526158d8f7f67ab3417e46b6e0f003
2019-01-15 16:17:53 +01:00
6ba8b9ab9a
Merge branch '2299_Añadir_nueva_funcionalidad_en_el_CLI_remove_agent_from_policy' into 'develop'
...
2299 añadir nueva funcionalidad en el cli remove agent from policy
See merge request artica/pandorafms!2092
Former-commit-id: d9ef39c8571ab3558e76883e1afc9cbb00225c79
2019-01-15 14:37:08 +01:00
b38dc64ad8
Merge branch '3134-Tardanza_a_la_hora_de_aplicar_cambios_masivamente' into 'develop'
...
fixed errors in massive operation edit modules
See merge request artica/pandorafms!2101
Former-commit-id: 5c3a995d57b344ec860679b07b3624aec73cf4b8
2019-01-15 12:35:11 +01:00
1ed90180c9
disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
...
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
6894623429
Auto-updated build strings.
...
Former-commit-id: 582bbf87e0972212cf48dc220871981f80974321
2019-01-15 00:01:25 +01:00
0d48b4573a
Fixed Label in the Console Menu
...
Former-commit-id: eb73f14fa5631dd481b36711ea0bb62943ec43e5
2019-01-14 18:54:43 +01:00
24260cea34
Merge branch 'ent-2753-meter-profiler-en-el-docker' into 'develop'
...
Added profiller to docker
See merge request artica/pandorafms!1966
Former-commit-id: 24ade418bbc05cc6a40ee6f988b53eb648fffec5
2019-01-14 14:59:50 +01:00
5a8e46d608
modify the way event responses are executed in event list
...
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
98c0bbec9a
Merge branch 'ent-2570-6239-ldap-grupos-secundarios' into 'develop'
...
Ent 2570 6239 ldap grupos secundarios
See merge request artica/pandorafms!2110
Former-commit-id: f710fa17c372e5dde1401d5cafa47a3e4ac56711
2019-01-14 10:53:45 +01:00
ad9a316a47
Auto-updated build strings.
...
Former-commit-id: 3426e636c31a7a9dcea09e442811310a4956d6ce
2019-01-14 00:01:23 +01:00
20a0aefe84
Auto-updated build strings.
...
Former-commit-id: aab4a872f690f104fe10dbdf7ef8ba86e02daef8
2019-01-13 00:01:23 +01:00
5abf8e14ff
Auto-updated build strings.
...
Former-commit-id: f78ab7f528f841aeda3dd7e28b1a2fcb34c9a05e
2019-01-12 00:01:24 +01:00
16ecc4efa3
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: 069f3fb28862a06eba76132c5e31da24ecf54b05
2019-01-11 13:12:35 +01:00
5ead23014d
Add traps, and other intracom API functions - #2978
...
Former-commit-id: 6f4029434a36030206def701df0d6e66995c6ca3
2019-01-11 12:33:22 +01:00
1865cc954c
Revert "Merge branch…"
...
This reverts merge request !1899
Former-commit-id: e19c3f43ff8a1a416e339f874d73299406d7e57a
2019-01-11 12:12:51 +01:00
ae9b595edd
Merge branch 'develop' into 2978-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado
...
Conflicts:
pandora_console/include/functions_api.php
Former-commit-id: 5a5debe1ed66000fb8569ec589c84cad8e8dfe63
2019-01-11 12:04:50 +01:00
4e6cf0182a
fixed error create modules network
...
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +01:00
b963395d01
fixed errors
...
Former-commit-id: 813a875e0f3d0dc3c1097ced987a5a45e8051046
2019-01-11 08:45:12 +01:00
ea34cc3b16
Auto-updated build strings.
...
Former-commit-id: 0d164597ba66950d16573ad8b618164c24b578d1
2019-01-11 00:01:25 +01:00
cc7e9e5537
Visuals changes in the data of general type reports
...
Former-commit-id: 15d0c6f67d2b1cafddd372c96807e8c4201c4f7f
2019-01-10 17:33:24 +01:00
f14acf12d2
Merge branch '1931_Cambiar_el_cuerpo_del_email_al_enviar_reportes' into 'develop'
...
Be able to change the subject and body of the report message when necessary
See merge request artica/pandorafms!1925
Former-commit-id: 18ef1606525fd0cf1ecd692fd156e3fd72f7ca43
2019-01-10 14:49:18 +01:00
00523128cf
Auto-updated build strings.
...
Former-commit-id: ea896e01eeba9faf882c98c4dbaa788b58d46f7b
2019-01-10 00:01:25 +01:00
6f65c9876f
Added option in setup for unique main IP in agents - #1744
...
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
2019-01-09 16:20:24 +01:00
9212e6a892
Visual change in the data of general type reports
...
Former-commit-id: fda11ae1c7233653728da7855fd010983a35d4fe
2019-01-09 16:06:08 +01:00
4f7733d8e8
Merge branch '2923-unit-y-post-process-no-se-guardan' into 'develop'
...
fixed bug: failing load of post process and unit fields in plugin component in module creation
See merge request artica/pandorafms!1912
Former-commit-id: 659495290305079e9932ab60b5fef924ef6089ed
2019-01-09 10:31:44 +01:00
471c01a4c5
fixed bad link to node in metaconsole's custom graph item editor
...
Former-commit-id: 22fb4302de980d8b3e16fb90d087b71c218598a1
2019-01-09 10:20:17 +01:00
344e5f1a6f
Auto-updated build strings.
...
Former-commit-id: a2919ff8afe0b64b756cc60b01a3145a02c8606a
2019-01-09 00:01:23 +01:00
f0c0a86533
LDAP no hierarchy groups on node functionallity
...
Former-commit-id: a9fe31be70e178e190c0d0bacf1dd6e27e71f03b
2019-01-08 16:42:23 +01:00
6e90172b59
Merge branch '2919-Bug-en-la-ayuda-de-plugin-en-la-creacion-de-un-modulo-de-tipo-plugin' into 'develop'
...
fixed english and spanish version of plugin-in macros help dialog
See merge request artica/pandorafms!1895
Former-commit-id: daf5cfd2aabda3284139069d403a6c327eeb682e
2019-01-08 15:38:07 +01:00
0445e212fe
Added default_no_hierarchy to config global variable
...
Former-commit-id: 0daba928d7adc7a848bca04b04168d05a82ea609
2019-01-08 12:54:32 +01:00
669c74c3dd
Merge branch '2838-Vista-detalle-módulo-en-tree-view' into 'develop'
...
Removed text for modules with images - #2838
See merge request artica/pandorafms!1945
Former-commit-id: f9e95e0bf3262b8783c6b48927522d12d1edc2bf
2019-01-08 12:18:36 +01:00
7300f83552
Merge branch '2955-Group-view-cuenta-módulos-de-agentes-deshabilitados' into 'develop'
...
Added disabled field in sql query - #2955
See merge request artica/pandorafms!1893
Former-commit-id: 2eaba1884722b5294698620f9ca0464b12c7bd33
2019-01-08 12:17:09 +01:00
0cb7aa3d0e
Merge branch '3047-Error-en-etiqueta-en-gráficas-horizontales' into 'develop'
...
Changed the font styles of the labels - #3047
See merge request artica/pandorafms!1982
Former-commit-id: 48a5230053344368f5858192e6eb3a4d7c42c830
2019-01-08 12:15:05 +01:00
02b497c250
Auto-updated build strings.
...
Former-commit-id: 32c035216be628177ecd430d3c875e3dd504dccc
2019-01-08 00:01:27 +01:00
dd922c41fc
Auto-updated build strings.
...
Former-commit-id: bb71b724086140b69a1314f914508cdbd2fc7776
2019-01-07 00:01:28 +01:00
48f1196400
Auto-updated build strings.
...
Former-commit-id: 17e276d76c3ee7afa9866f8268d6dcb120485a0b
2019-01-06 00:02:00 +01:00
cf1d28cf8b
Auto-updated build strings.
...
Former-commit-id: ed5de54f4a19cf94fad2d6978c0229928edcec6e
2019-01-05 00:01:24 +01:00
cfdde23d96
Auto-updated build strings.
...
Former-commit-id: 051d9c9f6f96c740c40cf8afc900125ab5ec80e9
2019-01-04 00:01:27 +01:00
5ecc9276e0
Merge branch 'develop' into 2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
...
# Conflicts:
# pandora_console/include/functions_api.php
Former-commit-id: 6ba5a8f0fd2d02daca0d05e08b27981c7137f0bc
2019-01-03 16:25:40 +01:00
361b85efb8
Merge branch 'ent-3332-fallo-al-filtrar-por-grupos-en-prediction-module' into 'develop'
...
Fixed agents_get_group_agents while trying to get agent list from target group
See merge request artica/pandorafms!2107
Former-commit-id: 5c036aa603fbd341617b065dfa6bb870f652775e
2019-01-03 14:34:26 +01:00
d114a77151
Auto-updated build strings.
...
Former-commit-id: c0c7f09435de019d1dc0057f48f4e5fd964fb3da
2019-01-03 00:01:25 +01:00
5c16c08d59
Auto-updated build strings.
...
Former-commit-id: 1ce399660dc1fddf4ac163fdd4b7657cef8b6594
2019-01-02 00:01:25 +01:00
ff9f6549d4
Auto-updated build strings.
...
Former-commit-id: 9cd8d22d6cab6e4edaad7c4b184ec4bb4995b54f
2019-01-01 00:01:24 +01:00
5139308723
Auto-updated build strings.
...
Former-commit-id: c78a0fd88b9100d3865413eb017d4dc0d8816b4c
2018-12-31 11:24:46 +01:00
4356a8ce8e
Auto-updated build strings.
...
Former-commit-id: 2971785cc199543f9d8e0e7fed646ec7aabd29d9
2018-12-31 00:01:23 +01:00
5e8b4b4500
Auto-updated build strings.
...
Former-commit-id: f8005483f902558687e92a128c3c138d1323b141
2018-12-30 00:01:22 +01:00
60617def24
Auto-updated build strings.
...
Former-commit-id: 5f0ff76fb4c03a0177dd9bb4b66609229cfec0b6
2018-12-29 00:01:35 +01:00
0686982055
Fixed agents_get_group_agents while trying to get agent list from target group
...
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
2018-12-28 13:09:37 +01:00
ac228a7fad
fixed error in massive operation
...
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
2260e8d82a
Merge branch 'ent-3326-7195-no-se-pueden-eliminar-elementos-de-modulo-sintetico-aritmetico' into 'develop'
...
minor fix in control messages format and processing
See merge request artica/pandorafms!2105
Former-commit-id: cc9453bfcf71cf47c8571ba338c84a5f87f0e70b
2018-12-28 11:48:56 +01:00
fcfd68f102
Auto-updated build strings.
...
Former-commit-id: 9885d1113e1e998bdb8c1d93d636c33f3dcc43c1
2018-12-28 00:01:26 +01:00
c6b9122cfc
minor fix in control messages format and processing
...
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
a789b3350e
fixed minor error pie chart
...
Former-commit-id: e335f96e7538f939c2fd20137c19c354125f0edb
2018-12-27 10:35:31 +01:00
2043546c52
Auto-updated build strings.
...
Former-commit-id: 58052cc9973e0315e5a3b470d0514a2fcff3d418
2018-12-27 00:01:25 +01:00
5377cf6039
Auto-updated build strings.
...
Former-commit-id: fec5c338a7ebb5e8c86ba8cab22102dde9945978
2018-12-26 00:01:25 +01:00
34502da313
Auto-updated build strings.
...
Former-commit-id: 4bd0f17766d00bdbc9761346e7f13d1959df61e8
2018-12-25 00:01:28 +01:00
ee7ff52a04
fixed error widgets wux
...
Former-commit-id: 149cfea6dc0d427b57f05594214374d220111031
2018-12-24 14:25:19 +01:00
7de36e1631
Merge branch '3257-No_se_ven_graficas_en_plantillas_de_informes_de_availability_SLA' into 'develop'
...
fixed error template availability
See merge request artica/pandorafms!2086
Former-commit-id: 94d91ceb98a78fc09a3d6af4e26baeba12343901
2018-12-24 09:23:35 +01:00
86b1a3e424
Auto-updated build strings.
...
Former-commit-id: ea35f14b67818e50e90f81c0f4daea2c77fdaeae
2018-12-24 00:01:23 +01:00
c5d4f395f2
Auto-updated build strings.
...
Former-commit-id: ab48062df957894db4ac37d0bc209c75eb12512a
2018-12-23 00:01:25 +01:00
cba18381bd
Auto-updated build strings.
...
Former-commit-id: 32fc309340e7c464585f9ab5a459e40938176ce5
2018-12-22 00:01:28 +01:00
b0b7e812f3
Merge branch '2315_Redireccion_consola_visual_Meta' into 'develop'
...
Fixed link in static graph
See merge request artica/pandorafms!1957
Former-commit-id: 5e68fabf271505484c336300cb5bffe8fb01fc9c
2018-12-21 11:36:50 +01:00
dd0165fe89
Merge branch '3042-Punto-de-inyeccion-sql' into 'develop'
...
avoid sql injection in visual_map_get_user_layouts function
See merge request artica/pandorafms!1951
Former-commit-id: cd680e3a3df45f6f54c6c2f25d118f97f30b8b81
2018-12-21 10:29:31 +01:00
2d00336682
Merge branch '3114_Error_en_reportes_de_tipo_ITIL_y_tipo_Modulo' into 'develop'
...
Fixed function report_value in reports
See merge request artica/pandorafms!1998
Former-commit-id: 6456c469f1e94ccaf49a0272f0f76e30b0ee6f0f
2018-12-21 10:28:52 +01:00
33f014695d
Merge branch '3057-Agregar-token-barras-desplazamiento-en-vista-datos-de-modulo' into 'develop'
...
Fixed overflow in module data view
See merge request artica/pandorafms!1967
Former-commit-id: bfcf0c9c08953e1fa49e8731db808bc78ecc826b
2018-12-21 10:23:29 +01:00
411c815f19
Merge branch '3096-Error-exportar-a-CSV-en-Graph-Container' into 'develop'
...
Removed unnecessary loop - #3096
See merge request artica/pandorafms!1992
Former-commit-id: 0708e60e64cd10bc27e3841f718fa64d8513b97c
2018-12-21 10:23:09 +01:00
4f43396d81
Merge branch '3151-Fallo-jquery-en-consola-mobile' into 'develop'
...
fixed bug: pie graph not showing in mobile's tactical view dashboard widget
See merge request artica/pandorafms!2027
Former-commit-id: d3a814853a43ea8c6c5c621893a4eaaac3e7d401
2018-12-21 10:22:41 +01:00
2a407bb494
Merge branch '3253-Error_en_automatic_combined_graph_en_meta_con_varios_nodos' into 'develop'
...
fixed autocombined report metaconsole
See merge request artica/pandorafms!2077
Former-commit-id: 130262742f8bac0441b4b8285dc62bb0d3aa998a
2018-12-21 10:22:21 +01:00
8c38ab63da
Merge branch '3269-Errores_informe_availability_graph' into 'develop'
...
fixed errors in availability reports
See merge request artica/pandorafms!2088
Former-commit-id: 9497860a73fe05a656cc19423af8d9dce3f60d53
2018-12-21 10:18:24 +01:00
2d08c75bae
Auto-updated build strings.
...
Former-commit-id: c0f17d266dcf7dc801aa210e5a90cd16b6090145
2018-12-21 00:01:27 +01:00
9531065dbe
Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker
...
Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0
2018-12-20 18:17:57 +01:00
8c20c93806
Auto-updated build strings.
...
Former-commit-id: e8875f49f492708eca311bb984fe05fc9e766ea7
2018-12-20 00:01:29 +01:00
5c4ad3e845
Merge branch 'develop' into 3114_Error_en_reportes_de_tipo_ITIL_y_tipo_Modulo
...
Conflicts:
pandora_console/include/functions_reporting.php
Former-commit-id: b379a4c9d87c3dc7404ccde8ee9a279138f73e3b
2018-12-19 19:45:11 +01:00
8a6033e002
Auto-updated build strings.
...
Former-commit-id: deb6afebc4c6aa5a75442e984da3f173283f21e1
2018-12-19 00:02:06 +01:00
e6049870f7
Fixed validations and changed alert by dialog
...
Former-commit-id: 4c38c7f665cd328708bca48f997794b9a8586840
2018-12-18 12:52:01 +01:00
ccb4778217
implemented api functions to create/update/delete/list event filters
...
Former-commit-id: f6b5c092622d74dee4fd587f259e6c286cd9c180
2018-12-17 18:18:17 +01:00
a9d3d81757
Fixed api function
...
Former-commit-id: 9b376941609b04ac13da551e8253d5ed5a8085dc
2018-12-17 17:56:01 +01:00
58289e73bc
Added new functionality for CLI to delete policy agents.
...
Former-commit-id: 753f9c47d2a4ffe8e5eb599dbd41d5b851500164
2018-12-17 17:51:30 +01:00
225635a774
fixed errors in availability reports
...
Former-commit-id: 0783d9b68bf5f3373579db9f0b09e7506d95ea84
2018-12-17 13:20:57 +01:00
b530447474
Added token metaconsole_deploy_inventory_plugin in functions_config
...
Former-commit-id: 9d819bb43ba4ce7869480411ae6f6cb9f1edbcce
2018-12-17 12:09:05 +01:00
84a0f227b9
fixed error template availability
...
Former-commit-id: 249e476d8fa4394fda0cf5df01b7b14dca8d2bea
2018-12-17 11:24:44 +01:00
7f9ee21b4b
Auto-updated build strings.
...
Former-commit-id: 95dbb73cfdfe00b7123c380c2ce5803bdd2aa754
2018-12-17 00:01:27 +01:00
e1bce89923
Auto-updated build strings.
...
Former-commit-id: a06da6638acbded07658431115057953bdcf417c
2018-12-16 00:01:25 +01:00
7af8f01b59
Auto-updated build strings.
...
Former-commit-id: 67927d3968e9d40047b1a55468ea138c768abc3d
2018-12-15 00:01:28 +01:00
632d67095b
List alert actions in nodes with CLI and API
...
Former-commit-id: 11e9a8137a2a37b081fcbac2ee50cac27c2c208b
2018-12-14 17:20:46 +01:00
f2f88579fa
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
...
Added a pending translation
See merge request artica/pandorafms!2083
Former-commit-id: 2ea6499b990e08750210593f2b4882044da392ed
2018-12-14 10:21:40 +01:00
b26d13db54
Auto-updated build strings.
...
Former-commit-id: d07fdc3ff61ce6a947f38d250f6714124fe127d1
2018-12-14 00:01:32 +01:00
b06790cc1a
Merge remote-tracking branch 'origin/develop' into 3177-Send_custom_report
...
Former-commit-id: 3bb953eb2b06d3c827093a0648c722c5281d73d5
2018-12-13 17:24:10 +01:00
807f7a0b74
fixed minor error
...
Former-commit-id: e855d814160365c0b6f53d15ea40b3c1bed16890
2018-12-13 17:24:01 +01:00
d8285c0ca2
Added a pending translation
...
Former-commit-id: 6272217de4eb47fe70eac214bf50b34da6aa20bb
2018-12-13 16:49:31 +01:00
6839559eb5
Merge branch 'ent-2997-color-cloud-vc-items' into 'develop'
...
Error fixes and metaconsole support for the color cloud item of the VC
See merge request artica/pandorafms!2082
Former-commit-id: 445dbc16ce84f22ffb1d379c8539b7ec35c9e478
2018-12-13 15:42:48 +01:00
06a68d01be
Error fixes and metaconsole support for the color cloud item of the VC
...
Former-commit-id: 01b0045b76c41dc2c0f3145631fbd0beae3b16df
2018-12-13 15:36:01 +01:00
a76895f20e
fixed error metaconsole template send template
...
Former-commit-id: 2b92b353a4811d6aec22e2a61c128cc24b01ba14
2018-12-13 12:47:22 +01:00
3d24bc264e
Updated version and build strings.
...
Former-commit-id: 2b99b30300329eb7f0a172f811fcfda8df1ab799
2018-12-13 11:14:24 +01:00
0648bf169c
Auto-updated build strings.
...
Former-commit-id: 77ac42e4d60650cc3fad6bc95333ac37f011aec3
2018-12-13 00:01:36 +01:00
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
358532c4a8
fixed autocombined report metaconsole
...
Former-commit-id: f277a1302c0b84ca0417693673ca3da0a4956f6c
2018-12-12 16:13:31 +01:00
07f5455e28
fixed errors in cron jobs
...
Former-commit-id: 6926e6cca21cb43d4c08ed0c4c48ae344abe8fab
2018-12-12 10:46:28 +01:00
ead4c71f1c
Merge branch '3056-Error-en-templates-wizard-de-informes-en-meta-return-dev' into 'develop'
...
Fixed custom graph
See merge request artica/pandorafms!2073
Former-commit-id: ec91783c18c5dc5d6c41476fb55d8e7909efb51a
2018-12-12 09:28:50 +01:00
739f0d2690
Minor change
...
Former-commit-id: c16c3356b38cf933403c5fe09c2d11a8d44cd53a
2018-12-12 09:25:09 +01:00
266b12f40a
Auto-updated build strings.
...
Former-commit-id: 7fa7204ba6df07db86506062742d09fb14fe3b22
2018-12-12 00:01:31 +01:00
f6858e2681
Fixed custom graph
...
Former-commit-id: a04d267f990d4628e8b0fc263066c44c3dc4febb
2018-12-11 19:21:43 +01:00
47a547367d
Added a new item to the visual console
...
Former-commit-id: 6dcb8c9500e12932775d929646f7fdc676ee94fa
2018-12-11 19:14:14 +01:00
dd6c8ca870
Fixed bug in metaconsole custom fields2
...
Former-commit-id: f96e08279f779d5d64d1ce88f23787f15ac3d144
2018-12-11 16:43:52 +01:00
7f99a8f9f4
List and synchronize group of modules of the meta console with CLI
...
Former-commit-id: 2fc699ee17ac08fe2d60746c0a3d8859a5083f7a
2018-12-11 14:43:27 +01:00
0fd61cb31e
Merge remote-tracking branch 'origin/develop' into 3170-Cambios_custom_fields_view
...
Former-commit-id: eeb7679e966ce7ed9e1dfe925d64dbbe21a2a752
2018-12-11 10:00:23 +01:00
c72d0dd0d4
fixed error status agent in custom field view
...
Former-commit-id: 3516b02e27b28c856b665bc896d076867827f85a
2018-12-11 10:00:05 +01:00
663c140b2b
Auto-updated build strings.
...
Former-commit-id: 19c220a8e630e3f5f50e04862cc696be6f278f02
2018-12-11 00:01:27 +01:00
50b1685e61
Added tagent_secondary_group in functions_reporting
...
Former-commit-id: ba4ac6e64e34810ae1f695840ba1af34bbcdc6c4
2018-12-10 17:34:18 +01:00
484d79d974
Fixed synch error
...
Former-commit-id: 9b370b64fd24302f76733ca84792d0a57418d688
2018-12-10 16:06:25 +01:00
3a80a0467b
synchronize group of modules from the meta console
...
Former-commit-id: 172cd23a0f0f2fa12ad4d37893cae6d22951ee54
2018-12-10 15:55:09 +01:00
fe749b31ed
Merge branch '3153-Modificar-instalador-de-consola_2' into 'develop'
...
Fixed error in submit - #3153
See merge request artica/pandorafms!2061
Former-commit-id: e0c4d401748beba3ec8afc571e0f35c05c862638
2018-12-10 15:45:44 +01:00
f98b3e2ea5
Fixed error in submit - #3153
...
Former-commit-id: a1c21457db7a4d4d6297fd0935b8beada7cde63c
2018-12-10 15:18:53 +01:00
b9aa474eb3
Fixed sql error with empty array in agent view
...
Former-commit-id: 5a7655d97d28179793a9c029460837568f926128
2018-12-10 15:14:56 +01:00
7667c73a38
Deleted constatn
...
Former-commit-id: 880a81ca75686569b16fd362a102364343bc15af
2018-12-10 14:23:23 +01:00
49ce00860f
Deleted constant2
...
Former-commit-id: 7984c71e2f0ae82ade917d19c16788e037b176de
2018-12-10 14:18:56 +01:00
24c42734a2
Merge branch 'develop' into 2234-Los-titulos-de-los-dashboards-publicos-no-se-muestran5
...
Former-commit-id: 5a05c4c70812e51258b1cad9ec716fb5c734c23b
2018-12-10 14:16:21 +01:00
33065a3bdb
Deleted constant
...
Former-commit-id: ce3130ce63d9aa75986fc56161aff6964232e49d
2018-12-10 13:49:18 +01:00
c669d35720
Merge branch '2234-Los-titulos-de-los-dashboards-publicos-no-se-muestran5' into 'develop'
...
Deleted constant
See merge request artica/pandorafms!2057
Former-commit-id: 905cb2f761a8d93d7c2bf59cefb5a8b8a783b521
2018-12-10 13:45:11 +01:00
22cc41dc90
Deleted constant
...
Former-commit-id: a2145df22e136ac546f0368954bbc7b667033162
2018-12-10 13:39:44 +01:00
ffb6b47106
fixed minor error custom field view
...
Former-commit-id: deaa026e2f44273657ff8d76c4f4e212b46c04fe
2018-12-10 13:22:51 +01:00
9ca56c40ea
Added a new color input and a debug function
...
Former-commit-id: 657724102e35c49465119d2ef75e3363d4d0d878
2018-12-10 09:20:06 +01:00
b0998003a3
Added a new icon
...
Former-commit-id: b4eb7f9aaf16d9ea3b0bb0339c1a70ee162aa259
2018-12-10 09:19:26 +01:00
1fdba79162
Merge remote-tracking branch 'origin/develop' into 3170-Cambios_custom_fields_view
...
Former-commit-id: 858d273478e7e6fb985be64bd6041586207e1ac4
2018-12-10 09:18:34 +01:00
b6a673fb7a
fixed error in customs fields view
2018-12-10 09:18:04 +01:00
7e40392740
Auto-updated build strings.
...
Former-commit-id: b0e915bad1ff00a9c5c75276dd1234c97ea3319f
2018-12-10 00:01:25 +01:00
52520f151d
Auto-updated build strings.
...
Former-commit-id: 77fc145ae77c789a925853444723f45c6f43136a
2018-12-09 00:01:27 +01:00
9d65e6b27e
Auto-updated build strings.
...
Former-commit-id: 880eb1f55439b6ab5c4f0f86329377ff80bc2822
2018-12-08 00:01:28 +01:00
2bde6ac6ce
Create module group API
...
Former-commit-id: a2da223ae925935bcc449ee151597fd035b453e2
2018-12-07 15:36:13 +01:00
c05b4c53e8
fix bug when updating path of ssl certificate in general setup
...
Former-commit-id: dfe466e64e18c7e3ea949f7786e0ef6343334260
2018-12-07 15:12:09 +01:00
f42cda1a41
Merge branch '2568-Succesful-action' into 'develop'
...
update translation strings
See merge request artica/pandorafms!2051
Former-commit-id: de7e68c1f587a4c708d3a0ae64c6643d66b756b4
2018-12-07 13:52:26 +01:00
aae40d03a7
update translation strings
...
Former-commit-id: cd4ef67b08fea6bc20551b26aaa6a852869541f4
2018-12-07 13:44:48 +01:00
05a06146ef
Fixed sql error with secondary groups in agent view
...
Former-commit-id: 45ddc8329c0ca417c8499cf54d3526acd28eae0a
2018-12-07 11:37:23 +01:00
e472612597
Auto-updated build strings.
...
Former-commit-id: 8c3920b9c6a9f85574a5a3ad243b0a459c2a81ab
2018-12-07 00:01:28 +01:00
7d3b5664df
Auto-updated build strings.
...
Former-commit-id: 9536a5de43f0a3c635f058aa493d8bec3bf5d073
2018-12-06 00:01:34 +01:00
a49d3bbe0e
Merge branch '2722-Labels-en-Visual-Console-2' into 'develop'
...
fix visual console's percentile item: label color not showing and removed label from view menu
See merge request artica/pandorafms!2048
Former-commit-id: f062ddec704f9f1a3b7c356d748f68efa4703a4e
2018-12-05 17:48:07 +01:00
0af861f5b9
fix visual console's percentile item: label color not showing and removed label from view menu
...
Former-commit-id: a19e1307b326a60bfef6441a7af0c7be2520ac6a
2018-12-05 16:25:46 +01:00
5599c3bd85
Ordered titles in dashboard2
...
Former-commit-id: c0074389cfc8835a1b9596705640abafb363ca9a
2018-12-05 14:09:10 +01:00
1526aa6eee
Merge branch '2501-Crear-SO-con-la-API-2' into 'develop'
...
added success and error messages to api functions api_set_create_os and api_set_update_os
See merge request artica/pandorafms!2043
Former-commit-id: aaa52d060a7e61f1ed3bb3530c5b452db1c0def6
2018-12-05 08:34:56 +01:00
ceeb90b3ac
Merge branch 'ent-2583-open-networkmaps-zoom-and-lines' into 'develop'
...
Correcciones en los mapas de red
See merge request artica/pandorafms!2044
Former-commit-id: 75d6fd9576486344e30a7168068014cd739eb26c
2018-12-05 08:34:33 +01:00
ea1eea5446
Merge branch '3153-Modificar-instalador-de-consola' into 'develop'
...
Show popup before drop database - #3153
See merge request artica/pandorafms!2042
2018-12-05 08:33:12 +01:00
fe47a9c07e
Auto-updated build strings.
2018-12-05 00:01:38 +01:00
3c317c182d
Default value given to a textPath's startOffet attribute to fix an error
2018-12-04 16:42:19 +01:00
f81cbed374
Fixed an error which caused the networkmap elements to not have lines
2018-12-04 16:22:35 +01:00
795620f90f
added success and error messages to api functions api_set_create_os and api_set_update_os
2018-12-04 15:55:39 +01:00
2cb494bfe7
Show popup before drop database - #3153
2018-12-04 15:41:36 +01:00
df3d142baf
fixed minor error availability graph print to pdf
2018-12-04 13:00:51 +01:00
daa928adb4
Merge branch '2029-Error-en-el-sumatorio-de-informes' into 'develop'
...
fixed bug in custom report's summatory
See merge request artica/pandorafms!2038
2018-12-04 12:21:47 +01:00
6f7ab8b435
fixed custom report's summatory in case module is uncompressed
2018-12-04 12:15:42 +01:00
ef28abc460
fixed bug in custom report's summatory
2018-12-04 11:55:52 +01:00
4aa21a86d8
Fixed profile_delete_profile_and_clean_users to not fail when a profile is not assigned to an user
2018-12-04 11:36:18 +01:00
973bd5f98c
Merge branch '3190-Bugarro_en_informe_servicios_SLA' into 'develop'
...
3190 bugarro en informe servicios sla
See merge request artica/pandorafms!2036
2018-12-04 11:07:26 +01:00
05e94ece90
Merge remote-tracking branch 'origin/develop' into 3190-Bugarro_en_informe_servicios_SLA
2018-12-04 10:20:09 +01:00
c63be5b4cc
fixed error print pdf chart slice bars
2018-12-04 10:19:26 +01:00
1e9be8d161
Merge branch '3170-Cambios_custom_fields_view' into 'develop'
...
new fields form custom field view
See merge request artica/pandorafms!2030
2018-12-04 10:17:03 +01:00
67bd22fed3
Merge remote-tracking branch 'origin/develop' into 3170-Cambios_custom_fields_view
2018-12-04 09:39:08 +01:00
222da4ee40
group filter custom field view
2018-12-04 09:36:48 +01:00
d9749aad03
Fixed bug in agent detail filter
2018-12-04 09:17:34 +01:00
500601c67f
Auto-updated build strings.
2018-12-04 00:01:28 +01:00
a03adb1762
add field group filter
2018-12-03 18:00:41 +01:00
517cb85547
Added new features in CLI to create and view alert commands
2018-12-03 17:38:57 +01:00
a4f2a65e3a
Fixed the initial zoom and center of the networkmaps
2018-12-03 16:12:43 +01:00
0c27534ca3
fixed refresh status agents
2018-12-03 12:53:41 +01:00
749f443e9e
Changed url for widgets in public dashboard Part2 - #2888
2018-12-03 12:08:39 +01:00
01a9621eb5
Custom fields view add new filters
2018-12-03 11:36:34 +01:00
eafdb87dc0
Merge branch '2756-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-2' into 'develop'
...
Add get_group_id_by_name and get_timezone to api functions - #2756
See merge request artica/pandorafms!1836
2018-12-03 09:10:14 +01:00
76db57a8b6
Auto-updated build strings.
2018-12-03 00:01:26 +01:00
b5ac333dd4
Auto-updated build strings.
2018-12-02 00:01:27 +01:00
f18c7cfc08
Auto-updated build strings.
2018-12-01 00:01:45 +01:00
15c03217db
Merge branch 'develop' into 2756-Functiones-API-traps-y-control-de-acceso-de-aplicacion-externa-2
...
Conflicts:
pandora_console/include/functions_api.php
2018-11-30 15:04:27 +01:00
c128f750e1
new fields form custom field view
2018-11-30 13:46:29 +01:00
f53dbea234
Merge branch '1804-Imagen-para-no-data' into 'develop'
...
Added text for nodata in graph and resized image - #1804
See merge request artica/pandorafms!1838
2018-11-30 13:38:07 +01:00
111ae09928
Merge branch '2722-Labels-en-visual-console' into 'develop'
...
fixed labels not showing for percentile item in visual console builder
See merge request artica/pandorafms!2019
2018-11-30 13:27:15 +01:00
71a4a6bf77
Merge branch '2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail' into 'develop'
...
Fixed bug in agent status filter
See merge request artica/pandorafms!1829
2018-11-30 13:21:48 +01:00
3f02447271
Merge branch 'ent-2886-consolas-visuales-static-graphs-en-metaconsola-carrefour' into 'develop'
...
Removed unused code (meta static graphs)
See merge request artica/pandorafms!1953
2018-11-30 13:13:58 +01:00
01cf7d8081
Merge branch '2888-Error-links-en-Show-link-to-public-dashboard' into 'develop'
...
Changed url for widgets in public dashboard - #2888
See merge request artica/pandorafms!1859
2018-11-30 13:12:30 +01:00
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
29e288301d
Merge branch '2904-Tip-en-Consola-Visual-Show-on-top' into 'develop'
...
Tip added - #2904
See merge request artica/pandorafms!1883
2018-11-30 13:10:01 +01:00
b97a9e2989
Merge branch '2927-Error-en-vista-de-alertas-lanzadas' into 'develop'
...
Fixed bug in alert details
See merge request artica/pandorafms!1887
2018-11-30 13:07:41 +01:00
b88e584e85
Merge branch '2938-Problema-con-tags-en-el-wizard-y-la-vista-de-informes-dev' into 'develop'
...
Added check of tags in report wizard
See merge request artica/pandorafms!2007
2018-11-30 13:07:22 +01:00
5a3911d185
Merge branch '2939-Bug-en-la-vista-de-graficas-de-un-agente' into 'develop'
...
Fixed bug in agent graph view
See merge request artica/pandorafms!1955
2018-11-30 13:07:03 +01:00
196a37ce05
Merge branch 'ent-2995-graficas' into 'develop'
...
Fixed no data to show in not init modules with TIP graphs
See merge request artica/pandorafms!1963
2018-11-30 13:06:17 +01:00
ed615a11d0
Merge branch '3056-Error-en-templates-wizard-de-informes-en-meta-dev' into 'develop'
...
Fixed Automatic combined Graph in metaconsole
See merge request artica/pandorafms!2021
2018-11-30 13:05:30 +01:00
48c83430ec
Merge branch '3071_Fallo_en_mapa_GIS' into 'develop'
...
Fixed error in agent table in GIS map
See merge request artica/pandorafms!1970
2018-11-30 13:05:10 +01:00
4bdc7d5303
Merge branch '3077-Fallos_en_las_consolas_visuales' into 'develop'
...
fixed errors in visual console
See merge request artica/pandorafms!2026
2018-11-30 13:04:31 +01:00
1d4dbbdcc8
Merge branch '3100-Error_500_si_descargamos_un_archivo_teniendo_configurado_LDAP' into 'develop'
...
fixed error ldap
See merge request artica/pandorafms!1994
2018-11-30 12:52:20 +01:00
dcacd53d5b
Merge branch 'fix/graphs_in_alerts' into 'develop'
...
fixed related changes in phantomjs interface
See merge request artica/pandorafms!2029
2018-11-30 12:47:24 +01:00
f463c44e9c
Merge branch '3190-Bugarro_en_informe_servicios_SLA' into 'develop'
...
fixed minor error slicebar
See merge request artica/pandorafms!2028
2018-11-30 12:46:54 +01:00
ce8e33ba29
Merge branch '2517-api-listar-y-crear-perfiles-de-usuario-en-meta-6168-eucomm' into 'develop'
...
2517 api listar y crear perfiles de usuario en meta 6168 eucomm
See merge request artica/pandorafms!1905
2018-11-30 12:22:37 +01:00
3cbb75b551
Merge branch '3044-Visualización-rara-en-agent-view' into 'develop'
...
Changed ORDER BY in SQL query - #3044
See merge request artica/pandorafms!1938
2018-11-30 11:02:14 +01:00
b8b43b33d7
Merge branch 'ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm' into 'develop'
...
Ent 2520 api listar y crear repuestas de eventos 6165 eucomm
See merge request artica/pandorafms!1896
2018-11-30 10:50:59 +01:00
2249ac4d8e
Auto-updated build strings.
2018-11-30 00:01:26 +01:00
c728cb1412
fixed related changes in phantomjs interface
2018-11-29 17:26:41 +01:00
3bf215782e
fixed minor error slicebar
2018-11-29 17:00:55 +01:00
dc7176585e
new API get_all_alerts_command
2018-11-29 16:57:17 +01:00
8d2daf3948
fixed bug: pie graph not showing in mobile's tactical view dashboard widget
2018-11-29 16:08:41 +01:00
9bdd1af488
fixed errors in visual console
2018-11-29 13:24:12 +01:00
4b1649d5f8
Auto-updated build strings.
2018-11-29 00:01:26 +01:00
f0ff20fda1
Add commands alert
2018-11-28 21:38:02 +01:00
9006a47650
fixed bug in function __()
2018-11-28 12:32:19 +01:00
590cef50f4
Fixed Automatic combined Graph in metaconsole
2018-11-28 09:48:58 +01:00
c48a0ffc49
Auto-updated build strings.
2018-11-28 00:01:25 +01:00
1cdc9c0d7f
fixed label not showing on reload in visual console builder's percentile item for types bubble, circular progress bar interior and percentile
2018-11-27 18:23:18 +01:00
0460b465f0
fixed warnings and font chart for pdf report
2018-11-27 17:43:59 +01:00
89d2f831ba
fixed labels not showing for percentile item in visual console builder
2018-11-27 11:35:59 +01:00
ad743d332e
Auto-updated build strings.
2018-11-27 00:01:24 +01:00
b7546a5019
Auto-updated build strings.
2018-11-26 00:01:25 +01:00
6bfe880dc8
Auto-updated build strings.
2018-11-25 00:01:24 +01:00
53401e1f4d
Auto-updated build strings.
2018-11-24 00:01:28 +01:00
bc70922acf
Merge branch 'ent-2221-saml-php7-issues' into 'develop'
...
Patch to SAML login. It wont pass for pandora session handlers
See merge request artica/pandorafms!2015
2018-11-23 15:04:50 +01:00
8f988dfb16
Merge branch 'ent-3144-mobile-console-event-detail-bugfix' into 'develop'
...
Fixed the event detail view on the mobile console
See merge request artica/pandorafms!2016
2018-11-23 12:42:27 +01:00
de08451c84
Bugfix
2018-11-23 12:21:35 +01:00
cb9c6e35ba
Patch to SAML login. It wont pass for pandora session handlers
2018-11-23 11:37:05 +01:00
cfeaea57ff
Merge branch '3132-No_aparecen_campos_recon_task' into 'develop'
...
fixed minor error jquery
See merge request artica/pandorafms!2014
2018-11-23 11:11:39 +01:00
726cabb578
fixed minor error jquery
2018-11-23 10:47:57 +01:00
557002d7fd
fixed error events graphs
2018-11-23 10:32:58 +01:00
c8969582a0
Auto-updated build strings.
2018-11-23 00:01:28 +01:00
62ad6b9a35
Added check of tags in report wizard
2018-11-22 10:39:48 +01:00
b4f3ce251b
Merge branch '2615-Bug_Session_Timeout' into 'develop'
...
fixed errors in session with send mail alerts graph API
See merge request artica/pandorafms!2004
2018-11-22 09:01:47 +01:00
de77e52297
Auto-updated build strings.
2018-11-22 00:01:28 +01:00
a5346a7ae3
fixed error login double
2018-11-21 17:38:11 +01:00
322c76b5e1
Merge remote-tracking branch 'origin/develop' into 2615-Bug_Session_Timeout
2018-11-21 16:52:20 +01:00
a3aa84bf92
fixed errors in session with send mail alerts graph API
2018-11-21 15:16:52 +01:00
7be5225429
Merge branch '2615-Bug_Session_Timeout' into 'develop'
...
fixed errors session_start
See merge request artica/pandorafms!2003
2018-11-21 13:13:47 +01:00
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
0344a5c2b0
Merge branch '2615-Bug_Session_Timeout' into 'develop'
...
fixed minor error session
See merge request artica/pandorafms!2000
2018-11-21 09:41:59 +01:00
3f6384c690
fixed minor error session
2018-11-21 09:36:37 +01:00
fd6d830de3
Auto-updated build strings.
2018-11-21 00:01:25 +01:00
a089a93477
fixed session bugs
2018-11-20 18:07:43 +01:00
20cbe0d767
Merge branch 'ent-3109-no-se-ven-los-agentes-en-la-creacion-de-clusters' into 'develop'
...
Fixed query on function agents_get_group_agents
See merge request artica/pandorafms!1997
2018-11-20 17:37:07 +01:00
80b39782e4
Fixed function report_value in reports
2018-11-20 14:16:25 +01:00
5ac947c2fd
Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop'
...
Ent 2169 rediris modificacion de comandos en alertas
See merge request artica/pandorafms!1878
2018-11-20 11:33:00 +01:00
8a00fe5a30
Fixed query on function agents_get_group_agents
2018-11-20 10:58:58 +01:00
6302dc634d
Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
...
fixed minor error
See merge request artica/pandorafms!1996
2018-11-20 09:22:17 +01:00
2078014406
fixed minor error
2018-11-20 09:14:36 +01:00
01ba290a68
Auto-updated build strings.
2018-11-20 00:01:29 +01:00
522a098d24
Merge branch '2615-bug-session-timeout' into 'develop'
...
time used for session cookie expiration set to gmt time
See merge request artica/pandorafms!1995
2018-11-19 17:30:11 +01:00
ee22d3988c
fixed error ldap
2018-11-19 16:33:27 +01:00
2c5cd6627b
time used for session cookie expiration set to gmt time
2018-11-19 16:33:27 +01:00
34aea47449
Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
...
2784 pantalla por dispositivos filtrado por custom fields
See merge request artica/pandorafms!1993
2018-11-19 16:24:58 +01:00
9d80e940bf
fixed minor error cfv
2018-11-19 16:17:20 +01:00
8e72f53aff
Removed unnecessary loop - #3096
2018-11-19 16:07:45 +01:00
c499a21cc2
Merge branch '2615-bug-session-timeout' into 'develop'
...
time used for session cookie set to timezone current time instead of gmt time
See merge request artica/pandorafms!1991
2018-11-19 13:29:01 +01:00
3ffab647cb
time used for session cookie set to timezone current time instead of gmt time
2018-11-19 13:21:25 +01:00
24fe48d5c5
Added token metaconsole_deploy_collection in the config
2018-11-19 12:12:10 +01:00
04ebb6b2c5
Added delete function in the api
2018-11-19 11:28:35 +01:00
105e93d069
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-19 08:42:30 +01:00
96a36615cc
Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
...
2784 pantalla por dispositivos filtrado por custom fields
See merge request artica/pandorafms!1987
2018-11-19 08:39:16 +01:00
ce5c679ad6
Auto-updated build strings.
2018-11-19 00:01:29 +01:00
f2bf27d367
Auto-updated build strings.
2018-11-18 00:01:28 +01:00
4021af48f9
Auto-updated build strings.
2018-11-17 00:01:31 +01:00
2eb47c1251
fixed errors in custom fields view
2018-11-16 15:00:09 +01:00
b2ed4a9d2c
standby software agent while disabling
2018-11-16 14:26:11 +01:00
d0d989ab19
Merge branch 'fix/db-retry-lock' into 'develop'
...
retried db query on error 1205 - lock
See merge request artica/pandorafms!1981
2018-11-16 13:15:06 +01:00
f99dadca39
Merge branch 'fix/ux-panel-historical-images' into 'develop'
...
Fix/ux panel historical images
See merge request artica/pandorafms!1984
2018-11-16 12:51:31 +01:00
5c3b3a0e66
adjusted replication_interval default
2018-11-16 12:46:10 +01:00
0a097d185d
fixed errors in custom fields view
2018-11-16 11:58:49 +01:00
8956ebd3c0
Changed the font styles of the labels - #3047
2018-11-16 11:46:41 +01:00
50c3453415
change default values for event synch
2018-11-16 11:27:32 +01:00
e6cd8c5471
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-16 09:11:49 +01:00
a0fde9503f
Auto-updated build strings.
2018-11-16 00:01:29 +01:00
e21fde537a
fixed css errors custom field view and new features
2018-11-15 19:16:49 +01:00
a00c10a136
Merge branch '2166-Hide-not-init-agents-2' into 'develop'
...
removed hide not init modules from sla and availability report
See merge request artica/pandorafms!1976
2018-11-15 17:20:00 +01:00
73590705e9
Merge branch '3079-Alertas_php7' into 'develop'
...
3079 alertas php7
See merge request artica/pandorafms!1980
2018-11-15 15:41:16 +01:00
7700ee85ca
Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7
2018-11-15 15:34:08 +01:00
d12a25866d
fixed translate php7 warning
2018-11-15 15:33:46 +01:00
1edb7fda03
Merge remote-tracking branch 'origin/develop' into 3072-Problemas_jquery
2018-11-15 15:20:02 +01:00
34ea7cfbcb
fixed position select autocomplete agent jqui
2018-11-15 15:19:43 +01:00
da410c9394
Merge branch '3079-Alertas_php7' into 'develop'
...
3079 alertas php7
See merge request artica/pandorafms!1978
2018-11-15 14:17:26 +01:00
aee12e6bf9
Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7
2018-11-15 13:23:09 +01:00
b78c52caa4
fixed error Acess for Access
2018-11-15 13:22:54 +01:00
b786c6c3ab
Fixed snmptrap binary in windows trap generator
2018-11-15 13:04:35 +01:00
a1846a6e22
removed hide not init modules from sla and availability report
2018-11-15 12:00:25 +01:00
614efef0c4
Merge branch '3079-Alertas_php7' into 'develop'
...
create alert php7
See merge request artica/pandorafms!1975
2018-11-15 09:46:27 +01:00
e9e132589c
Auto-updated build strings.
2018-11-15 00:01:29 +01:00
daniel
artica
fbsanchez
samucarc
Daniel Rodriguez
fermin831
Tatiana Llorente
Daniel Maya
manuel.montes
Alejandro Fraguas
Alejandro Gallardo Escobar
Ramon Novoa
artica
alejandro-campos
enriquecd
Enrique Camargo
Samuel Carcases
vgilc