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

33952 Commits

Author SHA1 Message Date
Daniel Rodriguez 38d2d66469 Merge branch 'ent-10597-pantalla-de-error-de-sistemas-no-mergeados' into 'develop' 
Ent 10597 pantalla de error de sistemas no mergeados

See merge request artica/pandorafms!5705
 2023-05-04 17:15:16 +00:00
Daniel Rodriguez 492032bd41 Merge branch 'ent-10157-14544-plugin-anadir-parametro-extra-para-calcular-el-de-bandwidth-max-de-port-channels' into 'develop' 
Ent 10157 14544 plugin anadir parametro extra para calcular el de bandwidth max de port channels

See merge request artica/pandorafms!5810
 2023-05-04 17:14:26 +00:00
Calvo c2e16ec94f Fix commit changes 2023-05-04 16:59:12 +02:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop' 
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
 2023-05-04 14:37:48 +00:00
Jonathan 477dc1d14d #10597 add logo pandora maintenance 2023-05-04 16:28:51 +02:00
miguel angel rasteu b3e97d9550 #11111 Fix module_manager_editor_web that it obtains the plugin_parameter data with the id of the tagente_modulo table 2023-05-04 16:01:35 +02:00
Calvo 768d7008f4 Fix commit error 2023-05-04 15:50:38 +02:00
Calvo f2a9716c79 Fix alert recovery execute one time 2023-05-04 15:18:02 +02:00
Calvo da96d5bd1e Merge remote-tracking branch 'origin/develop' into ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados 2023-05-04 15:14:01 +02:00
Matias Didier 96305c9528 Merge branch 'ent-11110-selectores-de-tipo-select2-rotos-en-metaconsola' into 'develop' 
fix select2 pandora_enterprise#11110

See merge request artica/pandorafms!5831
 2023-05-04 12:39:20 +00:00
Calvo fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
daniel e77a63a91f fix select2 pandora_enterprise#11110 2023-05-04 12:57:01 +02:00
Calvo c74ed4914b Websocket engine test button 2023-05-04 11:37:16 +02:00
Diego Muñoz-Reja 038e21cf0c Merge branch 'ent-10744-mejorar-deteccion-de-os-con-nmap-mucho-mas-lento' into 'develop' 
Remoced xprobe and modified nmap for better performance detecting OS

See merge request artica/pandorafms!5797
 2023-05-04 09:01:52 +00:00
miguel angel rasteu f3488e2aa4 #11095 Fix id_policy_module in url 2023-05-04 09:43:48 +02:00
artica 151358190c Auto-updated build strings. 2023-05-04 01:00:20 +02:00
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 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
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
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
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
Daniel Maya e4b17428b7 #10474 visual changes 2023-04-27 10:05:20 +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