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

22174 Commits

Author SHA1 Message Date
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
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
artica fa39119264 Auto-updated build strings. 2019-09-03 00:01:12 +02:00
Daniel Rodriguez bc00f7d7b6 Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop' 
Ent 4489 revision comportamiento pandora server e7

See merge request artica/pandorafms!2696
 2019-09-02 15:48:36 +02:00
fbsanchez 0abb2ae987 Revert "Revert "Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'"" 
This reverts commit 74c9e604e8.
 2019-09-02 15:24:21 +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
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
Daniel Rodriguez ab5ad9a459 Merge branch 'ent-4519-iconos-no-alineados-en-reporting-builder' into 'develop' 
fixed error

See merge request artica/pandorafms!2665
 2019-08-30 14:12:42 +02:00
Daniel Rodriguez 85b7ee034f Merge branch 'ent-4524-Campo-Command-en-respuestas-de-eventos' into 'develop' 
Changed input for textarea in command field - #4524

See merge request artica/pandorafms!2676
 2019-08-30 14:12:21 +02:00
Alejandro Fraguas e8dc42fe5d Merge branch 'ent-4473-cambiar-configuracion-docker-de-agente' into 'develop' 
Changed Dockerfile

See merge request artica/pandorafms!2633
 2019-08-30 14:11:27 +02:00
Daniel Rodriguez f292780aa2 Merge branch 'ent-4377-Fallo-al-listar-los-items-de-tipo-text-en-los-reports-de-metaconsola' into 'develop' 
Added item type text to list of items- #4377

See merge request artica/pandorafms!2652
 2019-08-30 14:11:18 +02:00
Daniel Rodriguez cbfb8b1e89 Merge branch 'ent-4389-Error-al-mostrar-el-nombre-de-un-agente-en-la-edicion-de-un-item-de-un-report' into 'develop' 
Show alias instead of name - #4389

See merge request artica/pandorafms!2651
 2019-08-30 14:10:52 +02:00
Daniel Rodriguez 1ca7e03fa4 Merge branch 'ent-4523-fallos-en-black-theme' into 'develop' 
Changed background-color in request new licence

See merge request artica/pandorafms!2673
 2019-08-30 14:10:04 +02:00
marcos.alconada d650ff6959 fixed error 2019-08-30 11:28:24 +02:00
alejandro-campos f423ddc42f modified function to export audit csv to decode entities as separator 2019-08-30 09:42:58 +02:00
manuel ce4f4f003d Merge branch 'develop' into ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.php
 2019-08-30 09:30:11 +02:00
artica 79298d0b8e Auto-updated build strings. 2019-08-30 00:01:09 +02:00
manuel b6870178c9 Fixed minor error 2019-08-29 15:21:39 +02:00
artica 1c4b639deb Auto-updated build strings. 2019-08-29 00:01:08 +02:00
Daniel Rodriguez 94c36f98e7 Merge branch 'revert-d561f786' into 'develop' 
Revert "Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'"

See merge request artica/pandorafms!2686
 2019-08-28 14:33:10 +02:00
Daniel Rodriguez 74c9e604e8 Revert "Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'" 
This reverts merge request !2644
 2019-08-28 14:19:59 +02:00
Alejandro Fraguas 14bf71e6c6 Merge branch '4531-8567-No-está-funcionando-bien-el-cierre-de-sessiones' into 'develop' 
Fixed session garbage collector

See merge request artica/pandorafms!2685
 2019-08-28 12:54:40 +02:00
Daniel Maya 5ad22620b9 mr power up 2019-08-28 12:49:41 +02:00
Daniel Maya 94d797b4b7 Fixed session garbage collector 2019-08-28 11:33:02 +02:00
Alejandro Fraguas 21712c5c23 Merge branch 'ent-4565-No-funciona-el-filtro-de-servidor-en-la-vista-de-eventos-de-la-metaconsola' into 'develop' 
Fixed bug in metaconsole filter events

See merge request artica/pandorafms!2683
 2019-08-28 09:20:18 +02:00
artica 662c9ca7f2 Auto-updated build strings. 2019-08-28 00:01:10 +02:00
manuel 3901a1abb6 Fixed bug in metaconsole filter events 2019-08-27 15:46:22 +02:00
Alejandro Fraguas fe088a59d6 Merge branch 'ent-4490-Cambio-de-dato-a-percentil-segun-el-tamano-de-custom-graph-en-consola-visual' into 'develop' 
fixed error labels pie chart

See merge request artica/pandorafms!2679
 2019-08-27 12:02:27 +02:00
Daniel Rodriguez cb8278030a Merge branch 'ent-4132-custom-fields-url' into 'develop' 
Custom fields url improved

See merge request artica/pandorafms!2525
 2019-08-27 10:32:01 +02:00
Luis Calvo 23e5c50d13 Added new custom fields url formating to custom fields 2019-08-27 09:34:42 +02:00
Luis Calvo 2dc084da8a Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:11:45 +02:00
artica c06ec0477c Auto-updated build strings. 2019-08-27 00:01:10 +02:00
Alejandro Fraguas fadccf0ff3 Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop' 
Fixed bug in public visual console view

See merge request artica/pandorafms!2672
 2019-08-26 13:12:31 +02:00
marcos.alconada efd6a72bb8 Merge remote-tracking branch 'origin/develop' into ent-4513-bugs-en-password-policy 2019-08-26 08:09:14 +02:00
artica a2713517f0 Auto-updated build strings. 2019-08-26 00:01:08 +02:00
artica 1320426628 Auto-updated build strings. 2019-08-25 00:01:09 +02:00
artica 56da633588 Auto-updated build strings. 2019-08-24 00:01:09 +02:00
Alejandro Fraguas 51f2baa0dd Merge branch 'ent-4541-Comportamiento_erroneo_en_Metaconsola' into 'develop' 
fixed event view metaconsole

See merge request artica/pandorafms!2677
 2019-08-23 13:19:30 +02:00
Daniel Barbero 22f125dee0 fixed error labels pie chart 2019-08-23 10:59:06 +02:00
artica 6a982697d2 Auto-updated build strings. 2019-08-23 00:01:11 +02:00
marcos.alconada 8d8e08d37b fixed visual error 2019-08-22 15:25:35 +02:00