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

22334 Commits

Author SHA1 Message Date
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
Luis Calvo 72ba228b68 Fixed policy macro on mail 2019-08-30 12:48:03 +02:00
marcos.alconada d650ff6959 fixed error 2019-08-30 11:28:24 +02:00
Daniel Maya de47275735 Fixed mr 2019-08-30 10:34:52 +02:00
manuel 94e377c3c3 Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2019-08-30 09:46:27 +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
Daniel Maya 25354f6f3b delete session open by api calls 2019-08-30 08:47:49 +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
Tatiana Llorente 94195cf70a Change permissions to save custom graph in agent view - #4575 2019-08-29 11:27:40 +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
Tatiana Llorente d38f1f8aec Fixed bug in unit in massive operations - #4166 2019-08-27 12:21:00 +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
Daniel Maya 63da85798e Change mr 2019-08-26 16:10:06 +02:00
Daniel Maya 473b29252c Merge branch 'develop' into ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono 2019-08-26 16:08:03 +02:00
Luis Calvo a88329dbb3 Changed function to get policy name macro 2019-08-26 15:07:13 +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
Tatiana Llorente ea970f2adc Escape the double quotes that may have the name of the module - #4503 2019-08-26 12:26:43 +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
Daniel Barbero Martin 31da17db03 fixed event view metaconsole 2019-08-22 14:27:45 +02:00
Alejandro Fraguas 03fb2875be Merge branch 'ent-4431-Problemas-CSV-Audit-log' into 'develop' 
Modified the divider in print_audit_csv function

See merge request artica/pandorafms!2615
 2019-08-22 13:40:55 +02:00
Tatiana Llorente e8a873de7c Changed input for textarea in command field - #4524 2019-08-22 11:22:40 +02:00
Alejandro Fraguas 38d6a587fd Merge branch 'ent-4504-contador-de-graficas-encontradas-no-funciona' into 'develop' 
fixed error

See merge request artica/pandorafms!2663
 2019-08-22 10:12:57 +02:00
Alejandro Fraguas 26f247375b Merge branch '4496-Graficas-Metaconsola-no-funcionan' into 'develop' 
fix graphs not showing in metaconsole monitors view

See merge request artica/pandorafms!2649
 2019-08-22 09:41:18 +02:00
Alejandro Fraguas 1e5b6a8416 Merge branch 'ent-4507-bug-visual-en-version-open' into 'develop' 
fixed visual error in Open

See merge request artica/pandorafms!2670
 2019-08-22 08:43:44 +02:00
artica 1d0875e89a Auto-updated build strings. 2019-08-22 00:01:11 +02:00
Tatiana Llorente b444be87b4 Fixed bug in custom unit #4166 2019-08-21 14:46:58 +02:00