tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,969 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

18969 Commits

Author SHA1 Message Date
vgilc 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
vgilc 7e5667c227 Merge branch '2517-api-listar-y-crear-perfiles-de-usuario-en-meta-6168-eucomm-2' into 'develop' 
Fixed profile_delete_profile_and_clean_users to not fail when a profile is not assigned to an user

See merge request artica/pandorafms!2037
 2018-12-04 12:21:26 +01:00
alejandro-campos 6f7ab8b435 fixed custom report's summatory in case module is uncompressed 2018-12-04 12:15:42 +01:00
alejandro-campos ef28abc460 fixed bug in custom report's summatory 2018-12-04 11:55:52 +01:00
fermin831 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
vgilc 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
daniel 05e94ece90 Merge remote-tracking branch 'origin/develop' into 3190-Bugarro_en_informe_servicios_SLA 2018-12-04 10:20:09 +01:00
daniel c63be5b4cc fixed error print pdf chart slice bars 2018-12-04 10:19:26 +01:00
vgilc 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
vgilc f7b5b6d57b Merge branch 'ent-2252-5716-fallos-en-extension-chrome-de-eventos-2' into 'develop' 
Fixed agent link on javascript chrome extension

See merge request artica/pandorafms!2035
 2018-12-04 10:16:30 +01:00
vgilc df5c5df6d2 Merge branch '2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail2' into 'develop' 
Fixed bug in agent detail filter

See merge request artica/pandorafms!2034
 2018-12-04 10:16:05 +01:00
fermin831 e27bf1a63c Fixed agent link on javascript chrome extension 2018-12-04 10:06:43 +01:00
daniel 67bd22fed3 Merge remote-tracking branch 'origin/develop' into 3170-Cambios_custom_fields_view 2018-12-04 09:39:08 +01:00
daniel 222da4ee40 group filter custom field view 2018-12-04 09:36:48 +01:00
manuel.montes d9749aad03 Fixed bug in agent detail filter 2018-12-04 09:17:34 +01:00
vgilc 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
vgilc 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
artica 500601c67f Auto-updated build strings. 2018-12-04 00:01:28 +01:00
samucarc 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
daniel a03adb1762 add field group filter 2018-12-03 18:00:41 +01:00
fbsanchez e5a658edf9 Merge remote-tracking branch 'origin/develop' into 3207-6970-update-manager-offline-no-funciona-v729 2018-12-03 17:02:15 +01:00
fbsanchez 4157a85a24 added php-pecl-zip to centos spec, fixed dependency on suse rpm - old php5 2018-12-03 17:02:09 +01:00
vgilc 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
vgilc 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
daniel 0c27534ca3 fixed refresh status agents 2018-12-03 12:53:41 +01:00
vgilc 6cd7e3b516 Merge branch 'ent-3201-bad-require-at-footer' into 'develop' 
Revert "included file required by update_manager_get_current_package function in footer file"

See merge request artica/pandorafms!2031
 2018-12-03 12:45:56 +01:00
tatiana.llorente@artica.es 749f443e9e Changed url for widgets in public dashboard Part2 - #2888 2018-12-03 12:08:39 +01:00
Alejandro Gallardo Escobar 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
daniel 01a9621eb5 Custom fields view add new filters 2018-12-03 11:36:34 +01:00
vgilc 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
artica 76db57a8b6 Auto-updated build strings. 2018-12-03 00:01:26 +01:00
artica b5ac333dd4 Auto-updated build strings. 2018-12-02 00:01:27 +01:00
artica f18c7cfc08 Auto-updated build strings. 2018-12-01 00:01:45 +01:00
enriquecd 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
daniel c128f750e1 new fields form custom field view 2018-11-30 13:46:29 +01:00
vgilc 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
vgilc 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
vgilc 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
vgilc da662485b0 Merge branch 'ent-2252-5716-fallos-en-extension-chrome-de-eventos' into 'develop' 
Ent 2252 5716 fallos en extension chrome de eventos

See merge request artica/pandorafms!1888
 2018-11-30 13:35:20 +01:00
vgilc 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
vgilc 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
vgilc 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
vgilc 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
vgilc 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
vgilc 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
vgilc 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
vgilc 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
vgilc 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
vgilc 5754674212 Merge branch '2906-TIP-para-Time-autorefresh-de-Edit-my-user' into 'develop' 
Tip added - #2906

See merge request artica/pandorafms!1882
 2018-11-30 13:09:34 +01:00
vgilc bf66319d90 Merge branch '2907-TIP-para-Query-History-DataBase' into 'develop' 
Tip added - #2907

See merge request artica/pandorafms!1884
 2018-11-30 13:09:15 +01:00