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

13626 Commits

Author SHA1 Message Date
Jose Gonzalez 260b2dbdf7 Community API functions file 2021-01-18 14:57:20 +01:00
Jose Gonzalez 93a4d92a72 Modified line for solve linter error 2021-01-18 14:56:36 +01:00
artica 5a837c9aaa Auto-updated build strings. 2021-01-15 01:00:17 +01:00
Daniel Rodriguez 1a99dfa517 Merge branch 'ent-6666-error-extensino-mainframe' into 'develop' 
fixed sql error with secundary groups ZOS

See merge request artica/pandorafms!3607
 2021-01-14 14:49:26 +01:00
Daniel Rodriguez 8cd742c90c Merge branch 'ent-6901-Bug-en-custom-graph-de-consolas-visuales' into 'develop' 
Ent 6901 bug en custom graph de consolas visuales

See merge request artica/pandorafms!3750
 2021-01-14 14:48:57 +01:00
Daniel Rodriguez fc9eb947c8 Merge branch 'ent-6355-Cambio-de-mensaje-de-Widget-dashboard-sin-permisos' into 'develop' 
fix remove acl widget agent/module

See merge request artica/pandorafms!3637
 2021-01-14 14:46:52 +01:00
Daniel Rodriguez 24b71e477b Merge branch 'ent-6405-Borrado-conf-md5-data_in-borrar-agente' into 'develop' 
Adding delete_agent control for meta

Closes pandora_enterprise#6405

See merge request artica/pandorafms!3583
 2021-01-14 14:45:10 +01:00
Daniel Rodriguez c546e532a3 Merge branch 'ent-6351-Informes-de-logs-en-meta' into 'develop' 
Ent 6351 informes de logs en meta

See merge request artica/pandorafms!3681
 2021-01-14 14:44:22 +01:00
Daniel Rodriguez ea86889673 Merge branch 'ent-6645-bug-acl-discovery-tasks' into 'develop' 
Fixed acl on discovery tasklist

See merge request artica/pandorafms!3618
 2021-01-14 14:43:42 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
Jose Gonzalez 7de277f458 Added some changes 2021-01-14 12:40:57 +01:00
artica 884a7cabf7 Auto-updated build strings. 2021-01-14 01:00:19 +01:00
Jose Gonzalez c7b66e07e8 Merge remote-tracking branch 'origin' into ent-6405-Borrado-conf-md5-data_in-borrar-agente 2021-01-13 11:43:29 +01:00
artica 53957348be Auto-updated build strings. 2021-01-13 01:00:18 +01:00
Jose Gonzalez e2dec1b0fa Merge remote-tracking branch 'origin' into ent-6405-Borrado-conf-md5-data_in-borrar-agente 2021-01-12 16:58:15 +01:00
artica a56a0e7023 Auto-updated build strings. 2021-01-12 01:00:17 +01:00
Daniel Rodriguez 56d8f87e42 Merge branch 'ent-6886-item-permissions-report-aparece-en-templates' into 'develop' 
Removed item permissions report from report templates

See merge request artica/pandorafms!3744
 2021-01-11 18:11:58 +01:00
Daniel Rodriguez ed50126b1b Merge branch 'ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery' into 'develop' 
Ent 3661 poder elegir dataserver en vmware a traves de discovery

See merge request artica/pandorafms!3683
 2021-01-11 15:43:18 +01:00
fbsanchez 749b729c0c fix local auth 2021-01-11 15:08:07 +01:00
Daniel Rodriguez 14985c35ec Merge branch 'ent-6407-server-to-execute-snmp-browser' into 'develop' 
Fixed snmp server selection

See merge request artica/pandorafms!3658
 2021-01-11 14:57:12 +01:00
José González 55f1d3516f Cleaned trace 2021-01-11 14:26:15 +01:00
Daniel Rodriguez 8d7ac33cf1 Merge branch 'ent-6653-Error-enlace-publico-en-Consolas-Visuales-linkadas' into 'develop' 
fix public view link remove hash

See merge request artica/pandorafms!3639
 2021-01-11 13:23:05 +01:00
Daniel Rodriguez 38dd3b960e Merge branch 'ent-4953-local-admin-nunca-prueba-remotos-meta' into 'develop' 
Force try remote before falling back to local if admin user

See merge request artica/pandorafms!3715
 2021-01-11 09:22:14 +01:00
artica 732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
fbsanchez f35ae98e78 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 2021-01-08 13:21:58 +01:00
artica 2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +01:00
José González 3199b3d6b5 Merge branch 'develop' into 'ent-6407-server-to-execute-snmp-browser' 
# Conflicts:
#   pandora_console/include/ajax/snmp_browser.ajax.php
 2021-01-07 14:14:33 +01:00
fbsanchez 186b807ff7 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 
Conflicts:
	pandora_console/include/styles/wizard.css
 2021-01-07 10:50:57 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico 
Conflicts:
	pandora_server/util/pandora_db.pl
 2021-01-07 10:42:29 +01:00
artica 1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez 40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop' 
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
 2021-01-05 13:43:42 +01:00
Daniel Rodriguez 6faa827bfa Merge branch 'ent-6896-error-ACL-command-snapshot' into 'develop' 
Fixed module id on snapshot view

See merge request artica/pandorafms!3746
 2021-01-05 12:41:04 +01:00
artica 93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
Daniel Maya c11c122032 Fixed custom graph 2021-01-04 12:53:42 +01:00
Daniel Rodriguez 05645afd44 Merge branch 'ent-6797-11099-graficas-informe-de-proyeccion-fallan-en-pdf-de-forma-aleatoria' into 'develop' 
Increased phantomjs timeout to 120 seconds per resource

See merge request artica/pandorafms!3730
 2021-01-04 11:17:37 +01:00
Daniel Rodriguez b3861ad2c5 Merge branch 'ent-6534-Migracion-consolas-visuales' into 'develop' 
css simple value css CV

See merge request artica/pandorafms!3684
 2021-01-04 11:13:35 +01:00
Daniel Rodriguez b9a2998c49 Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop' 
Ent 6490 errores en edicion de acciones de alertas

See merge request artica/pandorafms!3657
 2021-01-04 11:11:16 +01:00
artica a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica 740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica 35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
artica 1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
Luis Calvo 47088a87b7 Fixed module id on snapshot view 2020-12-28 11:59:02 +01:00
artica 66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica 7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00