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

20860 Commits

Author SHA1 Message Date
artica e0d1cdd667 Auto-updated build strings. 2021-02-09 01:00:25 +01:00
fbsanchez e711239c69 Added port, limited base OID (default) removed timeout (browser) capturing error to message 2021-02-08 17:42:41 +01:00
Jose Gonzalez 2521b32f13 WIP: Backup upload 2021-02-08 16:33:54 +01:00
fbsanchez 67c51b0e96 Merge remote-tracking branch 'origin/develop' into ent-7020-movidas-del-wizard 2021-02-08 15:22:04 +01:00
Jose Gonzalez d9d82e1803 Fixed sorting by description 2021-02-08 10:22:38 +01:00
artica c828ca2061 Auto-updated build strings. 2021-02-08 01:00:16 +01:00
artica fe8a54aa48 Auto-updated build strings. 2021-02-07 01:00:17 +01:00
artica 0362e4a1a0 Auto-updated build strings. 2021-02-06 01:00:17 +01:00
fbsanchez 679ada717e filter with preload - filtering improved 2021-02-05 15:10:31 +01:00
Marcos Alconada 92cf6c60cb Ent 7015 establecer las nuevas consolas visuales habilitadas por defecto en instalaciones nuevas 2021-02-05 15:08:58 +01:00
fbsanchez 9a439a96e5 filtering interfaces in wizard 2021-02-05 12:37:27 +01:00
Junichi Satoh 83ac2a134a Fixed allowing invalid parameters in API 'set update_agent'. 2021-02-05 16:00:06 +09:00
artica fffea9fd99 Auto-updated build strings. 2021-02-05 01:00:20 +01:00
fbsanchez 63834c62a7 Awesome wizard 2021-02-04 18:26:34 +01:00
fbsanchez 7bb68abbad Wizard RC1 with filtering and improved comm 2021-02-04 18:19:35 +01:00
fbsanchez 3dc699e8fd Fix for unexistent OIDs values or names in dynamic wizard 6980 2021-02-04 15:33:54 +01:00
fbsanchez 43040801c4 SNMP wizard performance review RC1 2021-02-04 14:55:07 +01:00
Jose Gonzalez aee474e43c Fixed issue with date 2021-02-04 14:54:11 +01:00
fbsanchez d43507ff53 minor fix 2021-02-04 13:18:40 +01:00
fbsanchez 3ad3e7e562 removed traces 2021-02-04 13:13:49 +01:00
fbsanchez 5a38d31a6d Wizard (interfaces) backend performance improved 2021-02-04 13:11:47 +01:00
artica 778b3762a2 Auto-updated build strings. 2021-02-04 01:00:25 +01:00
fbsanchez d171e805b5 alerts criticity in event response to retrieve event_instructions 2021-02-03 14:26:45 +01:00
fbsanchez 600b914715 Some improvements in multi-server communications (Entity) 2021-02-03 14:21:59 +01:00
fbsanchez 93908626a0 Merge remote-tracking branch 'origin/develop' into ent-6665-axa-datos-heredados-en-evento-alert-fired 2021-02-03 13:32:54 +01:00
Daniel Rodriguez aba8813095 Merge branch 'ent-6384-consola-visual-nuevo-elemento-interfaz-de-red' into 'develop' 
First steps VC network link

See merge request artica/pandorafms!3521
 2021-02-03 13:29:44 +01:00
fbsanchez 59eb9880fe vc link force being linked 2021-02-03 13:01:31 +01:00
fbsanchez d2b166c295 fixes MC graphs in network link + vc links between mc and nodes 2021-02-03 12:53:05 +01:00
fbsanchez 3b0319cecc event responses including alerts 2021-02-03 11:16:20 +01:00
Marcos Alconada b7bf265cb4 changed ssl/tls to ssl 2021-02-03 11:09:38 +01:00
artica 7ed515afd1 Auto-updated build strings. 2021-02-03 01:00:20 +01:00
fbsanchez da2ee342e6 Full metal jacket QA tester fighting 2021-02-02 19:06:05 +01:00
fbsanchez 4d00270b78 Minor fixes 2021-02-02 18:55:38 +01:00
fbsanchez 906ac7f13f fixes VC in MC 2021-02-02 18:40:55 +01:00
fbsanchez 000f8d4b66 smooth movement in parent-lines + std-lines + network-link-lines 2021-02-02 17:55:52 +01:00
fbsanchez 9052a02c1b Smooth sticky lines 2021-02-02 16:54:01 +01:00
fbsanchez 0b15f27699 minor CDE 2021-02-02 16:22:17 +01:00
fbsanchez 03b605cd54 removed networklink button from legacy vc 2021-02-02 13:17:03 +01:00
fbsanchez 380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
artica ff7516cd23 Auto-updated build strings. 2021-02-02 01:00:19 +01:00
Daniel Rodriguez 231981bcc9 Merge branch 'ent-fix-special-day-related-api' into 'develop' 
Fixed wrong behavior of special_day related APIs.

See merge request artica/pandorafms!3787
 2021-02-01 13:41:20 +01:00
artica 466ebb8b6b Auto-updated build strings. 2021-02-01 01:00:15 +01:00
artica 705e1e4623 Auto-updated build strings. 2021-01-31 01:00:11 +01:00
artica 6871aaf358 Auto-updated build strings. 2021-01-30 01:00:19 +01:00
Daniel Rodriguez 2676d326b9 Merge branch 'ent-5840-cambio-politica-passwords' into 'develop' 
Changed password generation for installator

Closes pandora_enterprise#5840

See merge request artica/pandorafms!3682
 2021-01-29 14:54:39 +01:00
José González 8dfb5434ae Update install.php for avoid wildcards, single and double quote chars 2021-01-29 14:06:01 +01:00
Daniel Maya 0b722f3b62 Fixed master server 2021-01-29 14:02:35 +01:00
artica 750670ecf9 Auto-updated build strings. 2021-01-29 01:00:20 +01:00
Luis e6cf2fe9eb Remove visual console manager extension 2021-01-28 11:57:52 +01:00
Daniel Rodriguez 4d84ae8b58 Merge branch 'ent-6844-quitar-vista-estadisticas-eventos' into 'develop' 
Removes event_statistics view

See merge request artica/pandorafms!3738
 2021-01-28 10:25:13 +01:00
Daniel Rodriguez 147bac8e55 Merge branch 'ent-6126-add-csv-json-save-to-disk-console-task' into 'develop' 
Added CSV an JSON formats in console task report save to disk

See merge request artica/pandorafms!3613
 2021-01-28 10:23:22 +01:00
artica ff80c974da Auto-updated build strings. 2021-01-28 01:00:18 +01:00
fbsanchez d24bcd700d Merge remote-tracking branch 'origin/develop' into ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field 2021-01-27 14:08:41 +01:00
Luis 905f8801b7 Update 44.sql 2021-01-27 13:37:20 +01:00
Daniel Rodriguez ccc10abc16 Merge branch 'ent-6643-show-summary-vmware' into 'develop' 
Ent 6643 show summary vmware

Closes pandora_enterprise#6643

See merge request artica/pandorafms!3611
 2021-01-27 11:20:36 +01:00
Luis Calvo a09ee55d13 Added event_statistics to delete txt 2021-01-27 09:42:50 +01:00
Luis Calvo f2addc837a Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task 2021-01-27 09:25:12 +01:00
artica 096bcd1ed3 Auto-updated build strings. 2021-01-27 01:00:19 +01:00
Luis Calvo 954c12646b Added task save report to disk changes to migrate 2021-01-26 16:46:45 +01:00
Luis Calvo dc3ee2d553 Added task save report to disk changes to MR 2021-01-26 16:36:13 +01:00
Jose Gonzalez d5b99f255a Solved issue 2021-01-26 13:46:12 +01:00
Luis 29913883ae Fixed connected users seeing all users 2021-01-26 13:35:46 +01:00
artica 7d69ad114d Auto-updated build strings. 2021-01-26 01:00:11 +01:00
Daniel Maya 312a08219c Added disable/enable for discovery task 2021-01-25 13:56:04 +01:00
Jose Gonzalez 38ea74ed11 Updated merge 2021-01-25 13:36:12 +01:00
Luis Calvo 778419e71d Merge remote-tracking branch 'origin/develop' into ent-6844-quitar-vista-estadisticas-eventos 2021-01-25 13:06:36 +01:00
artica 831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Luis Calvo 84f3ead86a Added csv, json, xml formats to save report to disk task 2021-01-25 11:51:53 +01:00
marcos 74bdab5d00 add status filter on alert list 2021-01-25 11:00:24 +01:00
Daniel Rodriguez 485220a527 Merge branch 'ent-2948-Formulario-para-configuracion-remota-de-server-y-satellite-Proyectos' into 'develop' 
implemented new server file editor

See merge request artica/pandorafms!3495
 2021-01-25 10:17:35 +01:00
Daniel Rodriguez 9b92c5ff34 Merge branch 'ent-6932-Tags-no-entran-en-base-de-datos' into 'develop' 
Ent 6932 tags no entran en base de datos

See merge request artica/pandorafms!3776
 2021-01-25 10:15:29 +01:00
Daniel Rodriguez 77dfba453a Merge branch 'ent-6505-FENIX-Conteo-vista-tactica-modulos-Performance-vs-Total' into 'develop' 
fixed count in tactical view

See merge request artica/pandorafms!3671
 2021-01-25 10:12:43 +01:00
Daniel Rodriguez f92ba2ce3d Merge branch 'ent-6503-vista-tactica-numero-alertas' into 'develop' 
Modified query for show only available alerts

Closes pandora_enterprise#6503

See merge request artica/pandorafms!3672
 2021-01-25 10:11:25 +01:00
Daniel Rodriguez e88ca95a8d Merge branch 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso' into 'develop' 
Ent 6631 bug en dashboard de usuario sin permiso

See merge request artica/pandorafms!3781
 2021-01-25 10:07:53 +01:00
Daniel Rodriguez 7a614fcf48 Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop' 
Ent 6354 bug de creacion de dashboard con permisos no all

See merge request artica/pandorafms!3780
 2021-01-25 10:02:41 +01:00
Daniel Rodriguez 4d81396956 Merge branch 'ent-6930-No-funciona-Min-number-of-alerts-Alerts-templates' into 'develop' 
Ent 6930 no funciona min number of alerts alerts templates

See merge request artica/pandorafms!3785
 2021-01-25 09:55:28 +01:00
Daniel Rodriguez 5d137594a4 Merge branch 'ent-6920-no-se-visualiza-dato-de-modulo-tipo-string-en-consola-movil-con-command-line-snapshot-activado' into 'develop' 
Ent 6920 no se visualiza dato de modulo tipo string en consola movil con command line snapshot activado

See merge request artica/pandorafms!3767
 2021-01-25 09:54:06 +01:00
Daniel Rodriguez 7a9d928a98 Merge branch 'ent-6634-Bug-borrado-net-scan-scripts' into 'develop' 
fixed wrong error message: recon task is not necessarily linked to script

See merge request artica/pandorafms!3601
 2021-01-25 09:52:47 +01:00
Daniel Rodriguez d4050ad0ce Merge branch 'ent-6855-Casca-netscan-custom-en-la-open' into 'develop' 
several fixes in netscan custom

See merge request artica/pandorafms!3736
 2021-01-25 09:50:27 +01:00
Daniel Rodriguez 713abb63e6 Merge branch 'ent-6786-error-componentes-remotos-dynamic' into 'develop' 
Added control for avoid null values in dynamic components

Closes pandora_enterprise#6786

See merge request artica/pandorafms!3670
 2021-01-25 09:27:23 +01:00
Daniel Rodriguez 64ec705f2c Merge branch 'ent-6736-guardia-ticket-10925-omnishell-falla-con-certificados-autofirmados' into 'develop' 
allowing self signed certs for quickshell

See merge request artica/pandorafms!3625
 2021-01-25 09:26:04 +01:00
artica 82664be930 Auto-updated build strings. 2021-01-25 01:00:14 +01:00
artica 4be65955cb Auto-updated build strings. 2021-01-24 01:00:16 +01:00
artica e03f02a093 Auto-updated build strings. 2021-01-23 01:00:18 +01:00
marcos dc455636d9 add status filter alert list 2021-01-22 14:15:26 +01:00
Luis Calvo d98033ba92 Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task 2021-01-22 10:05:22 +01:00
artica a700318815 Auto-updated build strings. 2021-01-22 01:00:18 +01:00
marcos d9309616c4 updates new filter 2021-01-21 17:13:49 +01:00
fbsanchez bf453ab0ef Effective command preview (action) 2021-01-21 17:09:36 +01:00
fbsanchez 4aba3b7753 action_details avoid overlapping colors 2021-01-21 15:58:20 +01:00
Daniel Maya 693a58ef69 Fixed label size 2021-01-21 15:39:29 +01:00
alejandro-campos 983d58260d changes in dashboard permissions 2021-01-21 14:42:43 +01:00
marcos 642258e1a3 add status filter on alert list filter 2021-01-21 13:38:03 +01:00
artica 3992841ac5 Auto-updated build strings. 2021-01-21 01:00:18 +01:00
alejandro-campos 731d486455 changed behavior of All group and fixed acl vulnerability 2021-01-20 18:22:43 +01:00
Jose Gonzalez 91b74fe19f Fixed little issue with the URL 2021-01-20 17:55:11 +01:00
Junichi Satoh 4311d1caac Fixed wrong behavior of special_day related APIs. 2021-01-20 18:06:46 +09:00
artica 6dca4bb4ba Auto-updated build strings. 2021-01-20 01:00:17 +01:00
Jose Gonzalez 2bf6db3224 Added last modifies 2021-01-19 16:09:06 +01:00
Daniel Maya adf4c988ec Added warning 2021-01-19 16:03:34 +01:00
artica 548f960b83 Auto-updated build strings. 2021-01-19 01:00:18 +01:00
Daniel Maya 9bb6e7067b removed second head 2021-01-18 16:28:15 +01:00
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
alejandro-campos d697ffb703 Merge remote-tracking branch 'origin/ent-6631-Bug-en-dashboard-de-usuario-sin-permiso-2' into ent-6631-Bug-en-dashboard-de-usuario-sin-permiso 2021-01-18 13:38:54 +01:00
alejandro-campos 535486a429 Merge branch 'develop' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-18 11:48:51 +01:00
alejandro-campos 0549f2c604 added file to open folder 2021-01-18 10:31:53 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
artica f0ff1c72d4 Auto-updated build strings. 2021-01-18 01:00:15 +01:00
artica 0cde312850 Auto-updated build strings. 2021-01-17 01:00:14 +01:00
artica 6710cfd957 Auto-updated build strings. 2021-01-16 01:00:19 +01:00
Alejandro Campos 5b9d7bcb81 Merge branch 'develop' into 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso-2' 
# Conflicts:
#   pandora_console/include/lib/Dashboard/Widgets/agent_module.php
 2021-01-15 14:52:26 +01:00
alejandro-campos 05c39db0cc changes in dashboard permissions 2021-01-15 13:57:25 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
José González c2c29c0d4a Update functions_alerts.php with correction 2021-01-15 09:58:18 +01:00
Daniel Maya ca17e9cfcb change in column name of ttag 2021-01-15 09:50:40 +01:00
artica 5a837c9aaa Auto-updated build strings. 2021-01-15 01:00:17 +01:00
Jose Gonzalez 579b8d4965 Solve issue and added correct headers 2021-01-14 19:08:01 +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 a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
Daniel Maya dfeb42983f Ent 6605 buscador general no encuentra mapas 2021-01-14 14:36:47 +01:00
Jose Gonzalez 0ec39bd135 Merge remote-tracking branch 'origin' into ent-6503-vista-tactica-numero-alertas 2021-01-14 13:39:45 +01:00
Jose Gonzalez 7de277f458 Added some changes 2021-01-14 12:40:57 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +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
Jose Gonzalez 5d94369b5a Attach documentation 2021-01-12 16:10:01 +01:00
Jose Gonzalez 7129c105f9 Updated password generation for better results 2021-01-12 16:07:12 +01:00
fbsanchez b2d1369717 Added with option for api_get_module_graph 2021-01-12 13:50:44 +01:00
fbsanchez efcd123a65 Missed snapshot icon in module data list mobile 2021-01-12 12:45:38 +01:00
artica a56a0e7023 Auto-updated build strings. 2021-01-12 01:00:17 +01:00
fbsanchez 73c182f65d Avoid performance tests if there are not enough modules in system 2021-01-11 18:32:44 +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 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 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 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 f89397996f avoid double networkmap creation 2021-01-08 11:59:45 +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
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
Daniel Maya 2781b4ab34 Fixed task list groups 2021-01-05 11:42:34 +01:00
Junichi Satoh 818766912f Fixed permission problems and improved function for api calls, 'set create_alert_template', 'set update_alert_template' and 'set delete_alert_template'. 2021-01-05 18:06:21 +09:00
artica 93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
Daniel Maya 90d8ac5129 Fixed ip target while creating policy modules 2021-01-04 15:12:55 +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 2e07d6215f Merge branch 'ent-6822-Error-SQL-en-SNMP-console' into 'develop' 
Ent 6822 error sql en snmp console

See merge request artica/pandorafms!3708
 2021-01-04 11:16:35 +01:00
Daniel Rodriguez f528e47cdc Merge branch 'ent-6582-Bug-con-masivas-de-modulos-y-filtro-module-status' into 'develop' 
fixed status filter when applying changes to a module of any agent

See merge request artica/pandorafms!3630
 2021-01-04 11:16:07 +01:00
Daniel Rodriguez 2a2e63fedb Merge branch 'ent-6209-10494-quickshell-duplica-pantalla-en-firefox' into 'develop' 
Fix firefox double load of quickshell

See merge request artica/pandorafms!3686
 2021-01-04 11:15:26 +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 70fcba1b11 Merge branch 'ent-6765-11050-Bug-en-operaciones-masivas-sobre-modulos-SNMP-v3' into 'develop' 
fixed selector

See merge request artica/pandorafms!3644
 2021-01-04 11:11:48 +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
Daniel Rodriguez 5658b52e3f Merge branch 'ent-6498-Alertas-siempre-marcan-modulos-como-critical-en-los-correos-con-el-mail-to-admin-por-defecto' into 'develop' 
changed mail to admin default action

See merge request artica/pandorafms!3656
 2021-01-04 11:10:19 +01:00
Daniel Maya f2b673b62b merge conflict resolved 2021-01-04 09:16:14 +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
slerena a5f0784c24 Merge branch 'ent-fix-massive-user-management' into 'develop' 
Fixed problem that users with UM in specific groups can assign/delete profiles in other groups.

See merge request artica/pandorafms!3745
 2020-12-29 15:07:43 +01:00
Luis Calvo df9bc6198d Added string exclude filter to events reports 2020-12-29 12:04:09 +01:00
artica 1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
Luis Calvo 8ee14816b6 Added ACL groups in SAP view 2020-12-28 15:04:46 +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
artica 223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00
Junichi Satoh 1c8b70d1eb Fixed problem that users with UM in specific groups can assign/delete profiles in other groups. 2020-12-25 17:38:03 +09:00
artica 57c1433764 Auto-updated build strings. 2020-12-25 01:00:15 +01:00
Daniel Rodriguez aee7ec4cb2 Merge branch 'ent-6897-estilos-rotos-metaconsola' into 'develop' 
Fixed broken styles in meta

See merge request artica/pandorafms!3743
 2020-12-24 10:30:01 +01:00
Luis Calvo 97a1020ec2 Removed item permissions report from report templates 2020-12-24 09:06:38 +01:00
artica 91b3aca7cf Auto-updated build strings. 2020-12-24 01:00:19 +01:00
Luis Calvo d8900704ed Fixed broken styles in meta 2020-12-23 17:58:05 +01:00