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

19413 Commits

Author SHA1 Message Date
fbsanchez b2758e6738 updates on pwrd, simplified 2018-12-04 18:22:11 +01:00
Alejandro Gallardo Escobar 3c317c182d Default value given to a textPath's startOffet attribute to fix an error 2018-12-04 16:42:19 +01:00
Alejandro Gallardo Escobar f81cbed374 Fixed an error which caused the networkmap elements to not have lines 2018-12-04 16:22:35 +01:00
alejandro-campos 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
tatiana.llorente@artica.es 2cb494bfe7 Show popup before drop database - #3153 2018-12-04 15:41:36 +01:00
tatiana.llorente@artica.es 94c6144653 Changed funciton size by length in jquery - #2893 2018-12-04 15:08:17 +01:00
vgilc d17b34a8f6 Merge branch '3209-Graficas_disponibilidad_muy_pequenas_en_PDF' into 'develop' 
fixed minor error availability graph print to pdf

See merge request artica/pandorafms!2040
 2018-12-04 14:16:59 +01:00
vgilc dfad4cf74f Merge branch 'pandora_enterprise/#3135-no-funciona-encriptacion-del-pandora_encrypt_db' into 'develop' 
Add a missing module to the Docker image and fix a related warning.

See merge request artica/pandorafms!2039
 2018-12-04 13:05:58 +01:00
daniel df3d142baf fixed minor error availability graph print to pdf 2018-12-04 13:00:51 +01:00
Ramon Novoa e009ea5567 Add a missing module to the Docker image and fix a related warning. 2018-12-04 12:50:12 +01:00
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
samucarc 517cb85547 Added new features in CLI to create and view alert commands 2018-12-03 17:38:57 +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
Alejandro Gallardo Escobar a4f2a65e3a Fixed the initial zoom and center of the networkmaps 2018-12-03 16:12:43 +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