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

17584 Commits

Author SHA1 Message Date
Jose Gonzalez a4e22d325d Solved issue 2019-09-18 15:39:33 +02:00
Tatiana Llorente eb271a93eb Added button for export to csv - #4642 2019-09-18 15:32:36 +02:00
Daniel Rodriguez c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop' 
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
 2019-09-18 14:41:35 +02:00
Jose Gonzalez 73a341912f Changed caption Expires 2019-09-18 13:35:11 +02:00
Daniel Barbero Martin 056bbb7348 fixed minor error 2019-09-18 13:16:05 +02:00
Luis Calvo 43af2269ee Fixed default values uncompress data 2019-09-18 11:51:01 +02:00
Daniel Rodriguez c20fcd6366 Merge branch 'ent-4419-error-sql-filtrar-instrucciones-de-evento' into 'develop' 
Event column instructions maked unsortabe

See merge request artica/pandorafms!2733
 2019-09-18 10:58:36 +02:00
artica 47be6a611f Auto-updated build strings. 2019-09-18 00:01:11 +02:00
Luis Calvo 0c60f13ccd Event column instructions maked unsortabe 2019-09-17 19:54:34 +02:00
alejandro-campos f2a6dbb60e Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria 2019-09-17 14:56:54 +02:00
alejandro-campos 979f7beca4 created ajax file to manage incident fields autocompletion 2019-09-17 13:41:21 +02:00
alejandro-campos 87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
Tatiana Llorente 326b053f23 New view - List of Integria IMS tickets - #4642 2019-09-17 13:03:36 +02:00
Tatiana Llorente 027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +02:00
Luis Calvo e409b33c6c Added changes to treport_content_template to db 2019-09-17 12:32:07 +02:00
Daniel Rodriguez 66a97f2f66 Merge branch 'ent-4508-desajustes-y-en-bug-en-open' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2669
 2019-09-17 11:36:07 +02:00
Daniel Rodriguez 1ad8c6fe2e Merge branch 'ent-4280-Nombres-duplicados-SNMP-console-y-trap-generator-en-ACL-Enterprise' into 'develop' 
Fixed duplicated names - #4280

See merge request artica/pandorafms!2658
 2019-09-17 10:47:05 +02:00
Alejandro Fraguas d9b697d076 Merge branch 'ent-4635-8710-Monitor-Report-informes-muestra-el-dato-al-reves' into 'develop' 
Fixed bug in item type monitor report

See merge request artica/pandorafms!2726
 2019-09-17 09:48:15 +02:00
artica 15a5d6f2e5 Auto-updated build strings. 2019-09-17 00:01:57 +02:00
Luis Calvo 0b8ff69a36 Fixed modules first load on edit agent/module item report 2019-09-16 12:57:37 +02:00
Luis Calvo b79cf8fda5 Merge remote-tracking branch 'origin/develop' into ent-3314-Agents/Modules-item-error-on-report 2019-09-16 11:42:47 +02:00
Luis Calvo e89efea022 Added column 'uncompressed_module' to 'treport_content' 2019-09-16 11:18:01 +02:00
Luis Calvo a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
Alejandro Fraguas 18abd5e3d6 Merge branch 'ent-4648-no-funciona-refresh-de-las-consolas-visuales-publicas' into 'develop' 
Fixed refresh

See merge request artica/pandorafms!2729
 2019-09-16 10:30:32 +02:00
Luis daa70f84db Merge branch 'develop' into 'ent-3314-Agents/Modules-item-error-on-report' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2019-09-16 10:09:52 +02:00
artica 2e121e2cc5 Auto-updated build strings. 2019-09-16 00:01:08 +02:00
artica 05eeb6f3d2 Auto-updated build strings. 2019-09-15 00:01:08 +02:00
artica bc36ed132d Auto-updated build strings. 2019-09-14 00:01:23 +02:00
Daniel Maya a4a84c154f Fixed refresh 2019-09-13 12:04:30 +02:00
Tatiana Llorente ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
manuel 00fc4c9238 Fixed bug in item type monitor report 2019-09-13 09:39:09 +02:00
artica 2f45d3d6ec Auto-updated build strings. 2019-09-13 00:01:11 +02:00
fbsanchez aa6c105841 Update 32.sql missed ';' 2019-09-12 17:47:49 +02:00
Alejandro Fraguas 3a85b434ca Merge branch 'ent-4558-8584-intracom-el-pdf-generado-desde-custom-report-es-ilegible-si-la-tabla-tiene-muchas-filas' into 'develop' 
Fixed max,min,avg report

See merge request artica/pandorafms!2720
 2019-09-12 17:29:09 +02:00
alejandro-campos 2218ad7d60 Added email check functionality 2019-09-12 15:37:16 +02:00
Daniel Maya 3d8486659e Fixed period in template 2019-09-12 12:52:40 +02:00
fbsanchez ebcce5cad4 Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-12 11:17:44 +02:00
Alejandro Fraguas a56d5dcad5 Merge branch 'ent-4147-file-repository-manager-a-combo-multiselect' into 'develop' 
Changed checkboxes for combo multiselect in File repository manager

See merge request artica/pandorafms!2700
 2019-09-12 11:12:05 +02:00
artica 602c9ccb5e Auto-updated build strings. 2019-09-12 00:01:26 +02:00
Daniel Maya d9dc03dd91 Fixed max,min,avg report 2019-09-11 18:08:40 +02:00
Alejandro Fraguas 3eadb07058 Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop' 
Fixed bug in custom unit #4166

See merge request artica/pandorafms!2675
 2019-09-11 16:47:40 +02:00
marcos.alconada b9b4230a6e changed style on tables pdf report 2019-09-11 12:20:09 +02:00
Alejandro Fraguas a9e6409cf9 Merge branch 'ent-4587-Limpieza-de-sesiones' into 'develop' 
delete session open by api calls

See merge request artica/pandorafms!2691
 2019-09-11 09:40:18 +02:00
artica fdef0b5188 Auto-updated build strings. 2019-09-11 00:01:10 +02:00
Tatiana Llorente c842c96d08 Fixed duplicated names - #4280 2019-09-10 12:19:53 +02:00
Alejandro Fraguas b97080f13c Merge branch 'ent-4275-notificaciones-correo-no-escribe-bien-url' into 'develop' 
Added ui_get_full_url in all links

See merge request artica/pandorafms!2703
 2019-09-10 12:18:52 +02:00
Tatiana Llorente b198700172 Fixed duplicated names - #4280 2019-09-10 12:18:17 +02:00
alejandro-campos 4722d4a08b changed setup option text 2019-09-10 11:38:02 +02:00
alejandro-campos 93b9c76f58 Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email 2019-09-10 10:50:53 +02:00
alejandro-campos c2e47e0ffa Revert "ddded comment" 
This reverts commit 4ec832f523.
 2019-09-10 10:06:33 +02:00
alejandro-campos 4ec832f523 ddded comment 2019-09-10 10:03:30 +02:00
artica 16912732d2 Auto-updated build strings. 2019-09-10 00:01:08 +02:00
artica 5526bb49ed Auto-updated build strings. 2019-09-09 00:01:07 +02:00
artica f088f47605 Auto-updated build strings. 2019-09-08 00:01:06 +02:00
artica 3680555bae Auto-updated build strings. 2019-09-07 00:01:10 +02:00
Daniel Rodriguez da7811953c Merge branch 'ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono' into 'develop' 
Added mr and uncommented code

See merge request artica/pandorafms!2558
 2019-09-06 13:38:11 +02:00
Daniel Rodriguez 566b7ec7bd Merge branch 'ent-3898-name-alias-statistics-SNMP' into 'develop' 
Changed name for alias when identify an agent in SNMP statistics

See merge request artica/pandorafms!2698
 2019-09-06 12:51:19 +02:00
artica ae474a2731 Auto-updated build strings. 2019-09-06 00:01:10 +02:00
Daniel Rodriguez d02f3621f3 Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop' 
Removed autofill proxi in auth server

See merge request artica/pandorafms!2361
 2019-09-05 18:29:43 +02:00
Daniel Rodriguez 64fc679d89 Merge branch 'ent-4599-no-se-muestran-items-vista-de-consola-visual-de-meta' into 'develop' 
Fixed some errors in visual console

See merge request artica/pandorafms!2708
 2019-09-05 15:27:41 +02:00
marcos.alconada 9e4b5ca5c8 Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font 2019-09-05 12:03:37 +02:00
marcos.alconada c12d672109 Add visual condition for JA and CH Lenguage 2019-09-05 12:01:25 +02:00
Daniel Maya 86cf025317 Fixed some errors in visual console 2019-09-05 11:58:15 +02:00
Daniel Rodriguez c0a0364164 Merge branch 'ent-4608-Bug-en-el-visor-de-eventos-cuando-el-lenguaje-esta-en-español' into 'develop' 
fix bug in events advanced filter: default option other than All

See merge request artica/pandorafms!2706
 2019-09-05 11:39:45 +02:00
fbsanchez 315d9728ec quick fix short news titles 2019-09-05 10:54:14 +02:00
fbsanchez 148cd5cce6 db updates pandora_db 2019-09-05 10:45:17 +02:00
alejandro-campos 42fad5acb1 fix bug in events advanced filter: default option other than All 2019-09-05 10:37:12 +02:00
artica a4739e4891 Auto-updated build strings. 2019-09-05 00:01:07 +02:00
Jose Gonzalez bb25679344 Added ui_get_full_url in all links 2019-09-04 14:12:38 +02:00
fbsanchez d0e6f0dbae Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-04 12:07:56 +02:00
Marcos Alconada a468c79a67 Changed visual console ID 2019-09-04 10:05:44 +02:00
artica 61c75118f2 Auto-updated build strings. 2019-09-04 00:01:10 +02:00
Daniel Rodriguez 8493ec20eb Merge branch 'ent-4580-8639-errores-al-generar-informes-dinamicos' into 'develop' 
Fixed date limit in historical_data

See merge request artica/pandorafms!2695
 2019-09-03 18:37:55 +02:00
Daniel Rodriguez f126b8b2a2 Merge branch 'ent-4503-XML-bloquea-vista-101-de-consola' into 'develop' 
Escape the double quotes that may have the name of the module - #4503

See merge request artica/pandorafms!2680
 2019-09-03 17:09:21 +02:00
Daniel Rodriguez 66f6267495 Merge branch 'ent-4575-Problema-permisos-en-vista-de-gráficas-dentro-de-un-agente' into 'develop' 
Change permissions to save custom graph in agent view - #4575

See merge request artica/pandorafms!2689
 2019-09-03 17:08:48 +02:00
Daniel Rodriguez a5fe2a913f Merge branch 'ent-4478-no-carga-valores-actuales-al-editar-accion-alerta' into 'develop' 
Fixed alert actions bug

See merge request artica/pandorafms!2636
 2019-09-03 17:08:17 +02:00
Daniel Rodriguez 2f0a19ae6e Merge branch 'ent-4446-Bug-Creacion-filtro-SNMP' into 'develop' 
Fixed bug create snmp filter - #4446

See merge request artica/pandorafms!2638
 2019-09-03 17:07:27 +02:00
Daniel Rodriguez b3b0f082d7 Merge branch 'ent-4484-Acceso-update-manager-offline-en-open' into 'develop' 
Don't allow access to update manager offline in community edition - #4484

See merge request artica/pandorafms!2648
 2019-09-03 13:37:02 +02:00
marcos.alconada b18f72dcdd Add new visual console Host Alive Keep Alive 2019-09-03 13:04:12 +02:00
Jose Gonzalez 914ac28151 Changed checkboxes for combo multiselect in File repository manager 2019-09-03 12:59:24 +02:00
fbsanchez 291dece854 obhd encapsulated debug print 2019-09-03 12:40:16 +02:00
Daniel Rodriguez 81511d1ac4 Merge branch 'ent-4422-campos-vacios-al-crear-modulos-wb' into 'develop' 
Fixed empty http_auth_user and pass

See merge request artica/pandorafms!2656
 2019-09-03 12:09:04 +02:00
Jose Gonzalez b60b41878c Changed name for alias when identify an agent in SNMP statistics 2019-09-03 11:14:33 +02:00
artica fa39119264 Auto-updated build strings. 2019-09-03 00:01:12 +02:00
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +02:00
fbsanchez 5c535514e1 Updated MR reference 2019-09-02 15:44:48 +02:00
fbsanchez b4991050c6 Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-02 15:35:22 +02:00
Daniel Rodriguez 20cc562911 Merge branch 'ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs' into 'develop' 
Fixed bug in report deletions

See merge request artica/pandorafms!2362
 2019-09-02 13:18:20 +02:00
Daniel Maya 6c51c4e1e9 Fixed date limit in historical_data 2019-09-02 11:18:04 +02:00
fbsanchez 9868462d43 Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-02 09:57:45 +02:00
artica d6b91e9fce Auto-updated build strings. 2019-09-02 00:01:15 +02:00
artica aea8a6b3c7 Auto-updated build strings. 2019-09-01 00:01:07 +02:00
artica fe7ec38cef Auto-updated build strings. 2019-08-31 00:01:12 +02:00
Daniel Rodriguez c47b24d84c Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop' 
Fixed bug permissions on filter events- 4278

See merge request artica/pandorafms!2671
 2019-08-30 16:07:45 +02:00
Daniel Rodriguez aa383e3f56 Merge branch 'ent-4513-bugs-en-password-policy' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2678
 2019-08-30 14:35:57 +02:00
Daniel Rodriguez c46686981e Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop' 
modified function to export audit csv to decode entities as separator

See merge request artica/pandorafms!2692
 2019-08-30 14:29:44 +02:00
Daniel Rodriguez e322e58dbb Merge branch 'ent-4371-noticias-modales-no-funcionan' into 'develop' 
Fixed error with news modal windows

See merge request artica/pandorafms!2655
 2019-08-30 14:25:43 +02:00
Daniel Rodriguez 71a6394967 Merge branch 'ent-4357-fallo-visual-en-el-menu-topology-maps' into 'develop' 
add space in networkp map

See merge request artica/pandorafms!2661
 2019-08-30 14:22:39 +02:00
Daniel Rodriguez 258a2f41ce Merge branch 'ent-4363-Marquesinas-ilegibles-desde-Firefox' into 'develop' 
Reduced the speed of events marquee - #4363

See merge request artica/pandorafms!2653
 2019-08-30 14:19:47 +02:00
Daniel Rodriguez 191161dbfc Merge branch '4474-Paginacion-SNMP-se-pierde-al-actualizar-Intracom' into 'develop' 
Fixed pagination bug

See merge request artica/pandorafms!2637
 2019-08-30 14:13:29 +02:00