Commit Graph

1393 Commits

Author SHA1 Message Date
Enrique Martin 93293f41ef Removed debug default agents to create value 2023-12-11 12:14:19 +01:00
Enrique Martin 00a0fa8eae Fixed reports generation 2023-12-11 11:53:46 +01:00
Enrique Martin 5a5674f3b4 Set default agents to create to 30 2023-12-11 10:33:03 +01:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-05 15:30:06 +00:00
alejandro.campos@artica.es cfc1992d26 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:58 +01:00
alejandro.campos@artica.es 9622b61557 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:40 +01:00
Enrique Martin 2d1b2bf6d2 Added new dashboard widgets 2023-12-05 12:11:25 +01:00
alejandro.campos@artica.es e7f18709b7 optimization 2023-12-05 12:07:23 +01:00
alejandro.campos@artica.es c9c3426b16 minor change 2023-12-05 08:30:00 +01:00
Enrique Martin e833499dc3 Improvements, fixes and new demo elements 2023-12-04 16:58:08 +01:00
alejandro.campos@artica.es 4a64f023fe Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-04 11:37:41 +01:00
alejandro.campos@artica.es 75ddb3b934 minor changes in demo data functionality 2023-12-04 11:37:12 +01:00
Enrique Martin 55aee67df3 Added GIS maps creation 2023-12-03 23:23:57 +01:00
Enrique Martin b14c77862e Added new items to visual consoles 2023-12-03 21:43:00 +01:00
Enrique Martin 14fc8ef2b1 Added new items to visual consoles and fixed unknown modules on creation 2023-12-03 21:30:17 +01:00
miguel angel rasteu 5ee6eb7306 #12052 Resolve conflicts 2023-12-01 10:19:39 +01:00
alejandro.campos@artica.es cb60581bcf Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-01 09:49:37 +01:00
alejandro.campos@artica.es d6e107ea95 performance improvement 2023-12-01 09:48:45 +01:00
Daniel Rodriguez 39c6420d2c Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop'
Ent 11763 15982 regex en busqueda de eventos

See merge request artica/pandorafms!6512
2023-12-01 08:44:46 +00:00
Enrique Martin 3807baa8ef Added GIS random data to agents 2023-11-30 17:41:01 +01:00
Matias Didier 8cfb0353dd Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop'
fix sound alerts severity filter pandora_enterprise#12378

See merge request artica/pandorafms!6663
2023-11-30 11:41:30 +00:00
Rafael Ameijeiras c60c75475b Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop'
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro

See merge request artica/pandorafms!6523
2023-11-30 09:23:16 +00:00
Enrique Martin 76327c6d73 Fixed demo graphs generation 2023-11-30 08:54:21 +01:00
alejandro.campos@artica.es dc2ac2a1b3 implement load demo data 2023-11-29 18:13:56 +01:00
alejandro.campos@artica.es ca17eef68a implement load demo data 2023-11-29 18:09:32 +01:00
alejandro.campos@artica.es a290203847 implement demo data load 2023-11-29 16:57:38 +01:00
alejandro.campos@artica.es 6f96087d90 implement demo data load 2023-11-29 11:30:48 +01:00
Jonathan f86a3e60e8 #11763 save filter regex on bbdd 2023-11-29 11:14:40 +01:00
alejandro.campos@artica.es 7240bbf934 implement demo data load 2023-11-29 09:00:45 +01:00
daniel 730cfb30ff Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
Conflicts:
	pandora_console/include/styles/pandora.css
2023-11-28 08:40:07 +01:00
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
Rafael Ameijeiras 8e68198ab5 Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop'
Ent 11679 15855 nombres de modulos no tienen link a su edicion

See merge request artica/pandorafms!6422
2023-11-27 14:39:14 +00:00
Matias Didier d544ef4ac5 Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop'
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola

See merge request artica/pandorafms!6539
2023-11-27 12:24:22 +00:00
Rafael Ameijeiras d6e613ca8b Merge branch 'ent-11791-any-user-can-change-any-other-user-s-notification-settings' into 'develop'
Ent 11791 any user can change any other user s notification settings

See merge request artica/pandorafms!6400
2023-11-27 11:19:14 +00:00
Diego Muñoz-Reja a0db8f5755 Merge branch 'ent-12204-visualizar-icono-de-los-modulso-pendientes-de-ejecucion-porque-se-han-forzado' into 'develop'
Ent 12204 visualizar icono de los modulso pendientes de ejecucion porque se han forzado

See merge request artica/pandorafms!6550
2023-11-27 10:34:56 +00:00
Diego Muñoz-Reja 59bed70175 Merge branch 'ent-12153-grafica-de-eventos-a-lo-largo-del-tiempo-en-vista-de-eventos' into 'develop'
Ent 12153 grafica de eventos a lo largo del tiempo en vista de eventos

See merge request artica/pandorafms!6532
2023-11-27 10:32:34 +00:00
alejandro.campos@artica.es a1916dc4b9 implement demo data load 2023-11-24 12:56:21 +01:00
alejandro.campos@artica.es c7770ec4f1 implement demo data load 2023-11-23 17:59:22 +01:00
Jonathan fafe4bc9b4 #10316 new function return_agent_macros 2023-11-23 17:21:37 +01:00
daniel 305f8c7658 Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos 2023-11-23 14:18:44 +01:00
Jonathan 4f707a5a1b Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-23 09:27:46 +01:00
Daniel Maya 300e01c186 #12502 Fixed filter 2023-11-22 10:10:35 +01:00
alejandro.campos@artica.es 0868c0c995 implement demo data load 2023-11-21 14:26:33 +01:00
alejandro.campos@artica.es 31e4e872c1 implement demo data load 2023-11-21 08:29:33 +01:00
alejandro.campos@artica.es d6bffbade1 implement demo data load 2023-11-20 16:52:49 +01:00
Gorka Sanchez 7748b59694 Merge branch 'ent-9946-meter-busqueda-en-listado-de-dashboard' into 'develop'
Ent 9946 meter busqueda en listado de dashboard

See merge request artica/pandorafms!6398
2023-11-20 15:20:46 +00:00
daniel 0aece464f8 fix sound alerts severity filter pandora_enterprise#12378 2023-11-14 13:38:09 +01:00
alejandro.campos@artica.es 1fcc263046 implemented demo data load 2023-11-10 11:24:34 +01:00
miguel angel rasteu 748238a7ea #11791 Prevent any user from changing another user's notification settings in AJAX 2023-11-10 10:03:13 +01:00
miguel angel rasteu c2b3eb14bf Merge branch 'develop' into ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion 2023-11-03 09:43:04 +01:00