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

34162 Commits

Author SHA1 Message Date
miguel angel rasteu 6813eb9d11 #11090 Fix the count that gave an error when there are no tags and the sql error when putting offset-20 when there are no tag 2023-05-03 13:24:11 +02:00
Matias Didier 5983333965 Merge branch 'ent-10908-Fallo-en-el-editor-de-tips' into 'develop' 
changes regarding encoding of tables

See merge request artica/pandorafms!5763
 2023-05-03 11:01:06 +00:00
Matias Didier 1d81b67082 Merge branch 'ent-10530-giss-demasiados-modulos-en-cola-en-vista-de-servidores' into 'develop' 
Ent 10530 giss demasiados modulos en cola en vista de servidores

See merge request artica/pandorafms!5688
 2023-05-03 09:25:04 +00:00
Daniel Cebrian d2c26ba607 #11092 fixed response tactical view 2023-05-03 11:07:20 +02:00
Daniel Maya 87a55dd26a #10530 Added img 2023-05-03 09:32:52 +02:00
Alejandro Campos 9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips' 
# Conflicts:
#   pandora_console/extras/mr/63.sql
 2023-05-03 07:11:28 +00:00
Jonathan 9da4f3d656 #11085 tinymce add plugins imagen link 2023-05-03 08:04:54 +02:00
artica 77ac357745 Auto-updated build strings. 2023-05-03 01:00:14 +02:00
artica b58ece6359 Auto-updated build strings. 2023-05-02 01:00:10 +02:00
artica 2e9c6a339f Auto-updated build strings. 2023-05-01 01:00:13 +02:00
artica 0bef49b5e7 Auto-updated build strings. 2023-04-30 01:00:18 +02:00
artica 459da487b8 Auto-updated build strings. 2023-04-29 01:00:23 +02:00
Calvo 8c65652c64 Fix gotty host missing on ws.php 2023-04-28 14:06:35 +02:00
Matias Didier 56614f8df0 Merge branch 'ent-10474-mejorar-visualmente-mapa-dinamico-sunburst' into 'develop' 
Ent 10474 mejorar visualmente mapa dinamico sunburst

See merge request artica/pandorafms!5800
 2023-04-28 11:01:17 +00:00
Calvo 7ef41d6273 Merge remote-tracking branch 'origin/develop' into ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados 2023-04-28 11:11:36 +02:00
Daniel Maya 77b5b7af45 #10157 Fix max_interfaces 2023-04-28 10:51:21 +02:00
Jonathan e1f473f985 #10638 format numbers network link 2023-04-28 10:51:02 +02:00
Daniel Maya 44ffd0f75b #10157 Added max parameter 2023-04-28 10:27:45 +02:00
Jonathan 305a853281 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-04-28 10:18:31 +02:00
Jonathan d0281443a4 #10185 MR 63.sql 2023-04-28 10:07:55 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2023-04-28 08:07:10 +00:00
miguel angel rasteu c1e35a5d17 #10081 Add option homescreen in metaconsole again 2023-04-28 09:51:30 +02:00
Jonathan afa26e45db #10185 change MR 63 to 64.sql 2023-04-28 09:16:29 +02:00
Daniel Rodriguez 0bc18b47db Merge branch 'ent-10420-14668-errores-en-usuarios-ldap-ad-con-apostrofes' into 'develop' 
Ent 10420 14668 errores en usuarios ldap ad con apostrofes

See merge request artica/pandorafms!5687
 2023-04-28 07:03:37 +00:00
Daniel Rodriguez 6570f0b98d Merge branch 'ent-10053-No-existe-borrado-en-cascada-de-modulos-usando-CLI' into 'develop' 
implemented module cascade deletion

See merge request artica/pandorafms!5641
 2023-04-28 07:00:59 +00:00
Daniel Rodriguez d5450853f5 Merge branch 'ent-10833-15134-bug-en-chromium-111-0-5563-64-1' into 'develop' 
update composer

See merge request artica/pandorafms!5674
 2023-04-28 06:11:25 +00:00
Daniel Rodriguez 191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop' 
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
 2023-04-28 06:07:10 +00:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' 
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
 2023-04-28 06:04:18 +00:00
artica 153294a9b0 Auto-updated build strings. 2023-04-28 01:00:28 +02:00
Diego Muñoz-Reja ddda7a71bf Merge branch 'ent-10777-encolamiento-ficheros-xml-con-tildes' into 'develop' 
Changed xml agent filename to hash to avoid special chars problems

See merge request artica/pandorafms!5773
 2023-04-27 15:51:14 +00:00
miguel angel rasteu 728cc27396 #11068 Add option change to critical status 2023-04-27 15:34:42 +02:00
miguel angel rasteu 2fe3662724 #11064 Fixed a conditional in the jquery code that generates the toggle which was not executed when the value of the is_metaconsole variable was 1 2023-04-27 12:34:56 +02:00
alejandro.campos@artica.es ccc66f3e65 keep inprocess status based on extra id 2023-04-27 12:22:22 +02:00
alejandro.campos@artica.es 9a97f5c40c keep inprocess status based on extra id 2023-04-27 12:11:28 +02:00
alejandro.campos@artica.es 857405b886 add target ip field to remote components 2023-04-27 11:13:19 +02:00
Daniel Maya e4b17428b7 #10474 visual changes 2023-04-27 10:05:20 +02:00
miguel angel rasteu 88d6e0e4f1 #11067 Add to the title the ip_target of the module when it exists. 2023-04-27 09:58:16 +02:00
alejandro.campos@artica.es 9f9aed4d77 add target ip field to remote components 2023-04-27 09:40:32 +02:00
artica 0b5672980d Auto-updated build strings. 2023-04-27 01:00:23 +02:00
Calvo 829ed3e33a Remoced xprobe and modified nmap for better performance detecting OS 2023-04-26 18:05:21 +02:00
Rafael Ameijeiras da0aa3c7e7 Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil-2' into 'develop' 
Ent 9555 revision visual ui de la vista movil 2

See merge request artica/pandorafms!5779
 2023-04-26 11:52:16 +00:00
Matias Didier 3a318436a9 Merge branch 'ent-11029-poner-remote_config-a-1-por-defecto-en-el-pandora_server-conf' into 'develop' 
Changed default remote_config on server to 1

See merge request artica/pandorafms!5764
 2023-04-26 09:30:59 +00:00
Diego Muñoz-Reja 8c05f1af03 Merge branch 'ent-10558-15096-proteccion-en-cascada-servicios' into 'develop' 
Check CPS for modules and parents to inhabilate alerts

See merge request artica/pandorafms!5744
 2023-04-26 09:10:39 +00:00
Diego Muñoz-Reja 3e0c06b4b7 Merge branch 'ent-10769-Errores-en-Trap-console-y-Trap-editor' into 'develop' 
several minor fixes

See merge request artica/pandorafms!5638
 2023-04-26 08:57:03 +00:00
Jorge Rincon 4b74dc7e78 #10623 removal of the default text in the textarea description 2023-04-26 09:38:03 +02:00
artica 8effae4991 Auto-updated build strings. 2023-04-26 01:00:20 +02:00
Calvo 300e1c4581 Fix correlation server connection with nodes with encrypt enabled 2023-04-25 19:16:30 +02:00
Matias Didier f0194286d6 Merge branch 'ent-10755-meter-leyendas-de-las-graficas-alineadas-horizontalmente-no-verticalmente-2' into 'develop' 
Ent 10755 meter leyendas de las graficas alineadas horizontalmente no verticalmente 2

See merge request artica/pandorafms!5778
 2023-04-25 15:39:49 +00:00
miguel angel rasteu 8108a84ba7 Fix incompatibility with Firefox 2023-04-25 16:47:52 +02:00
Pablo Aragon abf5e027c5 9555-Subservice remove href 2023-04-25 16:40:06 +02:00