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

1421 Commits

Author SHA1 Message Date
Daniel Maya 4011ca99fe #8769 Resolved conflict 2 2022-07-14 13:02:39 +02:00
Daniel Maya e8c7c38c1f #8732 Resolved conflict 2022-07-13 11:31:18 +02:00
Daniel Maya 994c76a39b #8732 Added autoconfiguration scheduled 2022-07-08 11:02:58 +02:00
Daniel Maya e839d82e00 resolved conflict 2022-07-04 13:40:06 +02:00
Daniel Maya b43b7b4fa5 #9226 Added tuser_task tables 2022-07-01 10:37:08 +02:00
vanessa gil 653226d45b Clean version. 2022-06-23 19:54:26 +02:00
Daniel Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Rodriguez d6ab78ba68 Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop' 
Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
 2022-06-23 07:53:11 +00:00
José González f241202168 Update delete_files.txt 2022-06-22 14:34:23 +00:00
Ramon Novoa 59ea9a716e Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-22 11:46:19 +02:00
Daniel Maya 44fdf1c321 #7926 Added asynchronous mode 2022-06-21 16:31:56 +02:00
José González 036505fa68 Fix DB issue 2022-06-21 09:38:13 +02:00
Luis 71326bf8bb Update pandoradb_migrate_6.0_to_759.mysql.sql 2022-06-20 14:57:45 +00:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
José González 6d70353254 Fix mistake 2022-06-16 16:09:05 +00:00
José González 32bfa233d5 Merge 2022-06-16 11:45:58 +02:00
José González ea60e4be71 Added database changes 2022-06-16 11:14:00 +02:00
Daniel Rodriguez fa28b5b7e1 Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop' 
Ent 9000 cambio update manager a warp update

See merge request artica/pandorafms!4957
 2022-06-16 08:43:12 +00:00
Daniel Rodriguez 709b49a371 Merge branch 'ent-9134-Falta-campo-disable-de-tabla-autoconfig-en-pandoradb.sql' into 'develop' 
Ent 9134 falta campo disable de tabla autoconfig en pandoradb.sql

See merge request artica/pandorafms!4954
 2022-06-14 12:10:22 +00:00
alejandro.campos@artica.es ec7a2f89bd revert migrate file 2022-06-14 10:17:43 +02:00
alejandro.campos@artica.es 4d3d684eeb revert migrate file 2022-06-14 10:15:15 +02:00
alejandro.campos@artica.es ac246aefb1 revert migrate file 2022-06-14 10:06:28 +02:00
alejandro.campos@artica.es c09d1334d6 revert migrate file 2022-06-14 10:05:05 +02:00
José González b5de60fb69 Update manager to Warp manager 2022-06-13 12:33:03 +02:00
Daniel Maya 519fd13299 #9134 Added dsiabled in mr 2022-06-09 15:22:14 +02:00
Calvo 5297123d17 Console changes for 8950 2022-06-08 13:10:01 +02:00
alejandro.campos@artica.es 6f0782782e Merge remote-tracking branch 'origin/develop' into ent-8838-Longitud-id-user-tusuario 2022-06-08 11:54:35 +02:00
alejandro.campos@artica.es 12b0f5cda1 database changes 2022-06-08 11:49:48 +02:00
Daniel Maya c9b94273be #8769 removed metaconsole_assigned_server 2022-06-07 15:21:07 +02:00
Daniel Maya ea16aac7af #8897 conflict resolved 2022-06-06 11:18:14 +02:00
Alejandro Campos 91d949942a Merge branch 'develop' into 'ent-8838-Longitud-id-user-tusuario' 
# Conflicts:
#   pandora_console/extras/mr/55.sql
 2022-06-03 10:26:35 +00:00
Daniel Rodriguez 0a51c5f916 Merge branch 'ent-8587-nueva-representacion-de-servicios-sunburst' into 'develop' 
Ent 8587 nueva representacion de servicios sunburst

See merge request artica/pandorafms!4819
 2022-06-02 07:21:17 +00:00
Daniel Maya fc7b4d8a11 #8897 Fixed tdashboard name 2022-05-25 13:13:09 +02:00
Daniel Maya 0d3b14da40 #9005 Added lts_name 2022-05-23 13:00:01 +02:00
alejandro.campos@artica.es 5c789125f2 changed id_user field length from tusuario 2022-05-09 12:40:36 +02:00
Daniel Maya aad40cb004 #8897 name changed 2022-05-04 16:11:08 +02:00
José González e272003396 Fix 2022-04-25 10:52:15 +02:00
Daniel Maya 9f1be4531b #8587 Added sunburst 2022-04-12 17:24:47 +02:00
fbsanchez 9406fa2c09 switch order of drops in MR 2022-04-08 11:31:36 +02:00
fbsanchez 037bf016fb Swap some stuff in MR becouse some environments had FK in deprecated tables 2022-04-07 17:26:14 +02:00
fbsanchez 686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 
Conflicts:
	pandora_console/extras/mr/53.sql
 2022-04-07 09:44:12 +02:00
Daniel Rodriguez 2471bbf1d4 Merge branch 'ent-8540-contel-nuevo-informe-custom-render' into 'develop' 
add new report custom render pandora_enterprise#8540

See merge request artica/pandorafms!4793
 2022-04-06 12:16:26 +00:00
Daniel Barbero Martin 9de7f0564e update version 2022-04-06 09:42:09 +02:00
Daniel Barbero Martin c049f18bf1 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-05 08:20:21 +02:00
Daniel Rodriguez 71fef65f35 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop' 
implemented custom data filter in event view

See merge request artica/pandorafms!4787
 2022-04-04 10:38:30 +00:00
fbsanchez e4c58fcb40 fix in UMC 2022-04-01 10:37:03 +02:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
fbsanchez e70c85fc65 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 2022-03-30 15:05:04 +02:00
fbsanchez 2ac8defa48 cleanup old UMC files from proyect 2022-03-30 14:54:08 +02:00