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
|
18cba9ad84
|
Merge branch 'ent-5489-Filtrar-desde-SEARCH-GENERAL-grupos-secundarios' into 'develop'
Ent 5489 filtrar desde search general grupos secundarios
See merge request artica/pandorafms!3614
|
2021-01-14 14:46:03 +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 Rodriguez
|
7e0a3baa1e
|
Merge branch 'ent-6893-event-filters-without-name' into 'develop'
Fixed event filter creation with empty name
See merge request artica/pandorafms!3742
|
2021-01-14 14:43:01 +01:00 |
Daniel Rodriguez
|
1793d6ebbc
|
Merge branch 'ent-6624-IPAM-recon-no-esta-funcionando-como-debiese-ni-instalandose-inicialmente' into 'develop'
remove IPAM to extension
See merge request artica/pandorafms!3673
|
2021-01-14 14:42:18 +01:00 |
daniel
|
a470658543
|
remove IPAM to extension
|
2021-01-14 14:42:18 +01:00 |
Daniel Rodriguez
|
8b86289ab3
|
Merge branch 'ent-6605-Buscador-general-no-encuentra-mapas' into 'develop'
Ent 6605 buscador general no encuentra mapas
See merge request artica/pandorafms!3631
|
2021-01-14 14:36:47 +01:00 |
Daniel Maya
|
dfeb42983f
|
Ent 6605 buscador general no encuentra mapas
|
2021-01-14 14:36:47 +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
|
86794af7b4
|
Merge branch 'ent-6889-vista-usuarios-aparece-ip' into 'develop'
Removed ip from connected user list
See merge request artica/pandorafms!3741
|
2021-01-11 18:11:28 +01:00 |
Daniel Rodriguez
|
79d6c8fb59
|
Merge branch 'ent-6670-POST-Prioridad-incorrecta-en-el-contenido-de-las-alertas-SNMP' into 'develop'
changed action/alert priority of fields for snmp alerts
See merge request artica/pandorafms!3595
|
2021-01-11 18:09: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 |
Daniel Rodriguez
|
d3adc32355
|
Merge branch 'ent-ent-4953-local-admin-nunca-prueba-remotos-meta-fix' into 'develop'
fix local auth
See merge request artica/pandorafms!3764
|
2021-01-11 15:28:23 +01:00 |
fbsanchez
|
749b729c0c
|
fix local auth
|
2021-01-11 15:08:07 +01:00 |
Daniel Rodriguez
|
7bbecceacc
|
Merge branch 'ent-6779-Cambio-label-en-campo-de-alertas-SNMP' into 'develop'
Ent 6779 cambio label en campo de alertas snmp
See merge request artica/pandorafms!3661
|
2021-01-11 14:58:14 +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
|
8605061d36
|
Merge branch 'ent-6790-cepsa-review-results-sale-en-tareas-oracle' into 'develop'
Set default value for review_mode to 1 instead 0
See merge request artica/pandorafms!3760
|
2021-01-11 14:17:52 +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
|
d4c161ae58
|
Merge branch 'ent-6707-Bug-pandora_db-con-compactacion-en-historico' into 'develop'
Ent 6707 bug pandora db con compactacion en historico
See merge request artica/pandorafms!3615
|
2021-01-11 09:30:56 +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 |
fbsanchez
|
8f2109003b
|
avoid review for non H&D tasks
|
2021-01-08 10:31:38 +01:00 |
artica
|
2b17ab4496
|
Auto-updated build strings.
|
2021-01-08 01:00:18 +01:00 |
fbsanchez
|
dd08b7937c
|
Set default value for review_mode to 1 instead 0
|
2021-01-07 14:36:56 +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 |
Daniel Rodriguez
|
54c768984a
|
Merge branch 'ent-6652-pandora_db-en-historico' into 'develop'
Fixes in history db settings and improved pandora_db tool
See merge request artica/pandorafms!3640
|
2021-01-07 12:59:48 +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
|
705beeac52
|
Merge branch 'ent-6902-Warning-pandora-db' into 'develop'
added additional check for token
See merge request artica/pandorafms!3757
|
2021-01-05 17:43:21 +01:00 |
alejandro.campos@artica.es
|
84d768853a
|
added additional check for token
|
2021-01-05 15:50:28 +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 |