tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,389 Commits 34 Branches 30 Tags
Commit Graph

2031 Commits

Author SHA1 Message Date
Enrique Martin
169ea3c18b Added default ncm telnet templates 2024-05-28 19:43:58 +02:00
Matias Didier
118f3d1ec2 Merge branch 'ent-13801-tokens-repetidos-en-tabla-tconfig-welcome_state' into 'develop' 
fix remove welcome_state pandora_enterprise#13801

See merge request artica/pandorafms!7424
 2024-05-27 14:33:23 +00:00
daniel
f815b9dc1e fix token welcome_state pandora_enterprise#13801 2024-05-27 09:02:09 +02:00
daniel
103b1e663b fix remove last_compact_offset pandora_enterprise#13806 2024-05-24 14:05:35 +02:00
daniel
194ebd71c4 translates pandora_enterprise#13668 2024-05-22 14:11:11 +02:00
Jose Martin
cad9f56ee1 Merge branch 'ent-12916-error-en-ejecucion-aws-rds-2' into 'develop' 
update version

See merge request artica/pandorafms!7087
 2024-05-17 09:21:58 +00:00
alejandro
6164cd23b9 update version in 68.sql 2024-05-16 10:01:20 +02:00
Alejandro Sánchez
a92c35bb63 Merge branch 'develop' into 'ent-12916-error-en-ejecucion-aws-rds-2' 
# Conflicts:
#   pandora_console/extras/mr/68.sql
 2024-05-16 07:53:46 +00:00
daniel
f54c68b5c2 fix mr update for content pandora_enterprise#13231 2024-05-10 14:37:25 +02:00
Félix Suárez
20f63042a7 Remove line break in get frimeware 2024-05-09 15:28:07 -06:00
Félix Suárez
79df76d612 Fix Palo Alto frimeware script 2024-05-09 15:27:59 -06:00
Matias Didier
5a218cd4e9 Merge branch 'ent-13682-falta-tabla-tnetwork_matrix-en-pandoradb-sql' into 'develop' 
Ent 13682 falta tabla tnetwork matrix en pandoradb sql

See merge request artica/pandorafms!7346
 2024-05-09 14:27:16 +00:00
Félix Suárez
71bfc77059 Safe Input on OS Name 2024-05-08 09:04:03 -06:00
Matias Didier
3ce9156e12 Merge branch 'ent-13289-Eliminar-respuesta-a-eventos-Create-incident-from-event' into 'develop' 
Ent 13289 eliminar respuesta a eventos create incident from event

See merge request artica/pandorafms!7348
 2024-05-07 10:20:48 +00:00
Matias Didier
be3645e7ca Merge branch 'ent-13583-bugs-wizard-de-consola-visual' into 'develop' 
Ent 13583 bugs wizard de consola visual

See merge request artica/pandorafms!7301
 2024-05-07 09:42:19 +00:00
Jorge Rincon
9861b02c0e #13289 delete of the Create incident from event option 2024-05-06 11:22:34 +02:00
Jonathan
558196bcce #13682 drop table tnetwork_matrix 2024-05-03 13:50:12 +02:00
alejandro
73c7ddcedb Merge remote-tracking branch 'origin/develop' into ent-13624-plugin-vmware-remover-intervalos-de-tiempo-y-anadir-nueva-metrica-para-sensores 
Conflicts:
	pandora_console/extras/mr/69.sql
 2024-04-29 17:40:50 +02:00
alejandro
4f098cc514 update hash 2024-04-29 16:22:16 +02:00
Daniel Cebrian
4c485be711 Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta 2024-04-26 12:41:08 +02:00
Pablo Aragon
8d1e3c1cf6 13853-Fixes in wizard visual consoles 2024-04-26 10:21:26 +02:00
alejandro
573f304594 space in comment 2024-04-25 15:07:30 +02:00
alejandro
7131685be7 update execution in proxmox plugin 2024-04-25 14:18:41 +02:00
alejandro
ddd6d6ad8b update execution in proxmox plugin 2024-04-24 12:03:03 +02:00
alejandro
b057f59a1b update version vmware and hash 2024-04-23 16:28:56 +02:00
Rafael Ameijeiras
167e6e4b81 Merge branch 'ent-13117-16676-plugin-vmware' into 'develop' 
Update version

See merge request artica/pandorafms!7094
 2024-04-22 14:20:53 +00:00
Rafael Ameijeiras
1f215110e7 Merge branch 'ent-13072-campo-en-db-fenix-de-tmensajes-que-no-esta-en-el-esquema-actual' into 'develop' 
Ent 13072 campo en db fenix de tmensajes que no esta en el esquema actual

See merge request artica/pandorafms!7099
 2024-04-22 09:13:16 +00:00
Matias Didier
dfe9485ae4 Merge branch 'ent-13526-fe-de-errata-en-el-MR-69' into 'develop' 
Ent 13526 fe de errata en el mr 69

See merge request artica/pandorafms!7219
 2024-04-18 12:07:20 +00:00
Pablo Aragon
f07f6808bf Merge branch 'develop' into ent-13072-campo-en-db-fenix-de-tmensajes-que-no-esta-en-el-esquema-actual 2024-04-18 13:51:55 +02:00
Rafael Ameijeiras
3fabf025c1 Merge branch 'ent-13232-mikrotik-ncm-template-no-ejecuta-comando-correcto-para-obtener-cfg' into 'develop' 
Ent 13232 mikrotik ncm template no ejecuta comando correcto para obtener cfg

See merge request artica/pandorafms!7193
 2024-04-18 09:19:43 +00:00
Jorge Rincon
e141b49ba0 #13526 The errata is fixed 2024-04-16 16:18:24 +02:00
Jose Martin
afd9704e6c Merge branch 'ent-13236-anadir-a-drop-table-tskins-un-if-exists' into 'develop' 
Ent 13236 anadir a drop table tskins un if exists

See merge request artica/pandorafms!7192
 2024-04-16 07:32:27 +00:00
Daniel Cebrian
8d9a89a6a8 Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta 2024-04-15 09:54:30 +02:00
Jonathan
aea0eabf2f #13232 change script mikrotik 2024-04-12 12:32:14 +02:00
Jonathan
78ca912c34 #13236 add check before drop table 2024-04-12 11:16:59 +02:00
Jonathan
6f60ddd716 #13311 add skin files delete_files.txt 2024-04-11 16:17:01 +02:00
Pablo Aragon
62030d67fa 13072-Change to 69.sql 2024-04-09 11:20:37 +02:00
Daniel Rodriguez
66504dd425 Merge branch 'ent-12934-cambio-sistema-despliegue-de-agentes' into 'develop' 
Ent 12934 Cambio sistema despliegue de agentes

See merge request artica/pandorafms!6962
 2024-04-05 09:56:40 +00:00
Daniel Cebrian
06947b0457 #13035 added sync jwt with nodes 2024-04-03 16:24:45 +02:00
Daniel Cebrian
1299e17ccc #13035 added new auth token method 2024-04-03 14:01:40 +02:00
Pablo Aragon
ee10584cde 13224-Change to 69.sql 2024-04-03 09:37:59 +02:00
Pablo Aragon
3788ae1364 13224-Fix CHARACTER in DB 2024-04-02 12:33:27 +02:00
Daniel Cebrian
33caead3be Merge branch 'develop' into ent-12934-cambio-sistema-despliegue-de-agentes 2024-04-01 10:42:22 +02:00
Daniel Cebrian
3db981ef62 Merge branch 'develop' into ent-12934-cambio-sistema-despliegue-de-agentes 2024-04-01 10:39:11 +02:00
Daniel Cebrian
8037fc0994 Merge branch 'develop' into ent-11634-eliminar-ha-antigua 2024-04-01 09:17:05 +02:00
Daniel Cebrian
a03ff46ae3 Merge remote-tracking branch 'origin/develop' into ent-11634-eliminar-ha-antigua 2024-04-01 09:15:12 +02:00
Pablo Aragon
5e273db908 13072-DROP id_usuario_destino FROM tmensajes if exists 2024-04-01 08:17:58 +02:00
Juan Antonio Loarte
36bf3454e3 Merge branch 'ent-13084-17268-link-roto-en-tips-de-inicio' into 'develop' 
Ent 13084 [#17268] Link roto en Tips de inicio.

See merge request artica/pandorafms!7083
 2024-03-26 12:06:54 +00:00
Rafael Ameijeiras
469445a320 Merge branch 'ent-13061-limitar-el-aviso-de-lts-versions-del-warp-offline' into 'develop' 
Ent 13061 limitar el aviso de lts versions del warp offline

See merge request artica/pandorafms!7037
 2024-03-26 11:31:02 +00:00
Rafael Ameijeiras
3287a56be0 Merge branch 'ent-13017-no-se-eliminan-los-datos-de-demo' into 'develop' 
Fixed demo data cleanup

See merge request artica/pandorafms!7033
 2024-03-26 11:02:27 +00:00