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

2011 Commits

Author SHA1 Message Date
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
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
alejandro 38e46ad057 Update version 2024-03-26 11:24:07 +01:00
Daniel Cebrian 5faa977bd8 #13084 fixed url tip 2024-03-26 10:34:15 +01:00
Jonathan e4d26875ed Merge branch 'develop' into ent-13061-limitar-el-aviso-de-lts-versions-del-warp-offline 2024-03-26 08:20:48 +01:00
Daniel Cebrian 567f1bb1ca Merge remote-tracking branch 'origin/develop' into ent-11634-eliminar-ha-antigua 2024-03-25 15:01:36 +01:00
Daniel Cebrian 0ee3b16308 #13084 fixed link in tips 2024-03-25 11:56:44 +01:00
Jonathan 5848142fcb Merge branch 'develop' into ent-12997-eliminar-sistema-de-skins 2024-03-25 10:44:04 +01:00
Jonathan 7aaab5f39c Merge branch 'develop' into ent-13061-limitar-el-aviso-de-lts-versions-del-warp-offline 2024-03-25 08:38:36 +01:00
Jonathan 8a29e03b58 #13061 toekn lts message no show to individual users 2024-03-25 08:32:56 +01:00
Daniel Cebrian ded8c9b7b5 Merge branch 'develop' into ent-12934-cambio-sistema-despliegue-de-agentes 2024-03-21 15:23:43 +01:00
Daniel Cebrian b874f236ae Merge branch 'develop' into ent-12934-cambio-sistema-despliegue-de-agentes 2024-03-21 15:20:12 +01:00
Daniel Rodriguez 50d95d5120 Merge branch 'ent-12905-deprecar-eliminar-discovery-legacy' into 'develop' 
Ent 12905 Deprecar (eliminar) discovery legacy

See merge request artica/pandorafms!6960
 2024-03-21 13:23:16 +00:00
alejandro c1fd4134fc update version 2024-03-20 11:53:55 +01:00
Daniel Cebrian 62dc85248e Merge branch 'develop' into ent-12905-deprecar-eliminar-discovery-legacy 2024-03-19 17:32:47 +01:00
Jonathan 424f365ea4 #12997 remove skins section 2024-03-19 13:35:53 +01:00
Daniel Cebrian 27501f90cb #12905 fixed mr 2024-03-19 11:22:13 +01:00
Enrique Martin 20011387d7 Fixed demo network map relationships creation 2024-03-15 13:39:12 +01:00
Daniel Maya c842210722 #13081 Fixed mr 2024-03-14 15:15:19 +01:00
Alejandro Sánchez cb5bb38b0e Merge branch 'ent-12857-tickets-vmware-776' into 'develop' 
update version

See merge request artica/pandorafms!6920
 2024-03-12 12:41:43 +00:00