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
328013140c
Merge branch 'ent-2531-6174-recursividad-en-los-grupos-para-lanzar-alertas-de-eventos-2' into 'develop'
...
Added group_recursion as tevent_rule column
See merge request artica/pandorafms!2071
Former-commit-id: 8486d9250866bf44a140ef0b2ae664d19d6d3a6f
2018-12-11 17:53:38 +01:00
8088a51035
Fixed audit log
...
Former-commit-id: a78fb3fb377814a6e664fd66606cd293c8af5df3
2018-12-11 17:17:46 +01:00
386eeec7ef
Added group_recursion as tevent_rule column
...
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
2018-12-11 16:07:13 +01:00
e3243883f0
Fixed static graph without images creation and update previsualization
...
Former-commit-id: a3a0a7942f624d9ecb2a272560a57947be4b39a1
2018-12-11 13:56:48 +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
3914256352
Merge branch 'ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm-2' into 'develop'
...
Added forgotten include
See merge request artica/pandorafms!2064
Former-commit-id: fc3701c7da6effeea69ed28b887212f72d3cc809
2018-12-11 08:51:19 +01:00
663c140b2b
Auto-updated build strings.
...
Former-commit-id: 19c220a8e630e3f5f50e04862cc696be6f278f02
2018-12-11 00:01:27 +01:00
562c5c14ee
Added forgotten include
...
Former-commit-id: 78e7630eef24224f877998398c06c11ac864d261
2018-12-10 18:46:01 +01:00
50b1685e61
Added tagent_secondary_group in functions_reporting
...
Former-commit-id: ba4ac6e64e34810ae1f695840ba1af34bbcdc6c4
2018-12-10 17:34:18 +01:00
79ce629b30
Merge branch '3228-Vulnerabilidad' into 'develop'
...
3228 vulnerabilidad
See merge request artica/pandorafms!2062
Former-commit-id: 10c836e36c74c39ce40af8b4cc8547ea81850898
2018-12-10 16:19:37 +01:00
4d5631d355
add safe output function to strings printed in system audit log
...
Former-commit-id: 383b5885f163d167c8944ad6dc8d66a8b4c35e51
2018-12-10 15:47:25 +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
a2909db631
Revert "Eliminadas entidades html de vista de auditoria"
...
This reverts commit 530017a79d
2018-12-10 13:42:29 +01:00
dd1fb00e19
Revert "Removed html entities in the audit views"
...
This reverts commit ad7610d7f1
2018-12-10 13:40:37 +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
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
66f3886193
Merge branch '3229-Error-SQL-en-vista-de-Agente-dev' into 'develop'
...
Fixed sql error with secondary groups in agent view
See merge request artica/pandorafms!2050
Former-commit-id: 3a3a979c6e45ec7ee9fed078fa458198ef021708
2018-12-07 11:46:31 +01:00
05a06146ef
Fixed sql error with secondary groups in agent view
...
Former-commit-id: 45ddc8329c0ca417c8499cf54d3526acd28eae0a
2018-12-07 11:37:23 +01:00
b155b06ae9
Fixed issue with secondary group
...
Former-commit-id: 879f30eec17cc27446c86dcc34bb4d774f0632dc
2018-12-07 11:20:15 +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
bc255c09e8
Merge branch '2893-Error-configuración-personalizada-de-eventos_2' into 'develop'
...
Changed funciton size by length in jquery - #2893
See merge request artica/pandorafms!2041
Former-commit-id: d4b07122bd7b390f77edc4c746c966608aab1353
2018-12-05 08:34:11 +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
99ac3e5748
Merge branch '3207-6970-update-manager-offline-no-funciona-v729' into 'develop'
...
Added debian dependency
See merge request artica/pandorafms!2046
2018-12-05 08:32:52 +01:00
fe47a9c07e
Auto-updated build strings.
2018-12-05 00:01:38 +01:00
6a50366aea
Added debian dependency
2018-12-04 18:46:45 +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
94c6144653
Changed funciton size by length in jquery - #2893
2018-12-04 15:08:17 +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
426128bb51
Merge branch '3207-6970-update-manager-offline-no-funciona-v729' into 'develop'
...
3207 6970 update manager offline no funciona v729
See merge request artica/pandorafms!2033
2018-12-04 08:21:13 +01:00
abdd33949d
Merge branch '2877_Mejora_audit_log' into 'develop'
...
Fixed Audit log in profiles, collections and policies
See merge request artica/pandorafms!1876
2018-12-04 08:15:42 +01:00
500601c67f
Auto-updated build strings.
2018-12-04 00:01:28 +01:00
34986a5477
Merge branch 'develop' into 2877_Mejora_audit_log
...
# Conflicts:
# pandora_console/godmode/users/profile_list.php
2018-12-03 18:57:04 +01:00
a03adb1762
add field group filter
2018-12-03 18:00:41 +01:00
e5a658edf9
Merge remote-tracking branch 'origin/develop' into 3207-6970-update-manager-offline-no-funciona-v729
2018-12-03 17:02:15 +01:00
4157a85a24
added php-pecl-zip to centos spec, fixed dependency on suse rpm - old php5
2018-12-03 17:02:09 +01:00
a4f2a65e3a
Fixed the initial zoom and center of the networkmaps
2018-12-03 16:12:43 +01:00
4fa3f967f6
Merge branch '2888-Error-links-en-Show-link-to-public-dashboard_2' into 'develop'
...
Changed url for widgets in public dashboard Part2 - #2888
See merge request artica/pandorafms!2032
2018-12-03 15:50:20 +01:00
d9e3b58aee
Merge branch '2893-Error-configuración-personalizada-de-eventos' into 'develop'
...
Changed timestamp value by default - #2893
See merge request artica/pandorafms!1881
2018-12-03 15:36:10 +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
027043f9f3
Revert "included file required by update_manager_get_current_package function in footer file"
...
This reverts commit 94493e18ce
2018-12-03 11:54:17 +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
7d52afff16
Merge branch '1886-Bug-Aviso-Enterprise-Network-Component-Open' into 'develop'
...
Changed the value from modal to false - #1886
See merge request artica/pandorafms!1828
2018-11-30 13:37:44 +01:00
33603a79d8
Merge branch '2176-SNMP-Wizard-Nombres-de-modulos-con-entities2' into 'develop'
...
Fixed bug in SNMP Wizard
See merge request artica/pandorafms!1929
2018-11-30 13:37:07 +01:00
b45ad25b56
Merge branch '2658_Operaciones_masicas_sobre_politicas' into 'develop'
...
Fixed centralized management in nodes
See merge request artica/pandorafms!1870
2018-11-30 13:28:58 +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
0014c4df9e
Merge branch '2849-Cambio-de-hora' into 'develop'
...
Changed date in footer - #2849
See merge request artica/pandorafms!1847
2018-11-30 13:22:25 +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
472995ce63
Merge branch '2889-PHP-Fatal-error-al-pulsar-ayudas' into 'develop'
...
included file required by update_manager_get_current_package function in footer file
See merge request artica/pandorafms!1852
2018-11-30 13:12:04 +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
Alejandro Gallardo Escobar
artica
danielmaya
vgilc
samucarc
fermin831
daniel
alejandro-campos
tatiana.llorente@artica.es
manuel.montes
fbsanchez
enriquecd