1656 Commits

Author SHA1 Message Date
Jimmy Olano
661c77e107 Merge branch 'ent-9321-bugs-en-consolas-visuales' into 'develop'
fixed show modal label VC in list item pandora_enterprise#9321

pandora_enterprise#9321

See merge request artica/pandorafms!5036
2022-08-25 21:07:36 +00:00
Daniel Barbero
2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val
Conflicts:
	pandora_console/godmode/menu.php
2022-08-02 10:34:21 +02:00
Daniel Barbero Martin
bd69105d7e fix label color vc black theme pandora_enterprise#9321 2022-07-29 09:37:38 +02:00
Daniel Barbero Martin
72614130a8 fixed widget dashboards no exist item pandora_enterprise#9229 2022-07-28 14:25:31 +02:00
Jimmy Olano
33f6ae1875 Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop'
Alerts list datatable

Ref: pandora_enterprise#8797

See merge request artica/pandorafms!5018
2022-07-22 02:39:35 +00:00
Daniel Barbero Martin
027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos
Conflicts:
	pandora_console/extras/mr/56.sql
2022-07-19 10:18:04 +02:00
Calvo
642c60428c Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola 2022-07-19 09:40:56 +02:00
Daniel Rodriguez
93e9992b19 Merge branch 'ent-9156-13785-cuadro-processing-ocupa-demasiado-en-eventos' into 'develop'
loading events pandora_enterprise#9156

See merge request artica/pandorafms!5014
2022-07-19 06:31:49 +00:00
Calvo
34333f9f88 Alerts list datatable 2022-07-15 12:15:37 +02:00
Diego Muñoz-Reja
74d19b3dbd Merge branch 'ent-9029-Mejora-estética-en-header-vista-agente' into 'develop'
Ent 9029 mejora estética en header vista agente

See merge request artica/pandorafms!5003
2022-07-13 12:54:54 +00:00
Daniel Barbero Martin
1f394907c9 loading events pandora_enterprise#9156 2022-07-13 12:28:18 +02:00
Daniel Barbero Martin
01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Daniel Maya
a71c26b4a7 #9029 Added starmap 2022-07-05 17:44:52 +02:00
Daniel Barbero Martin
12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Barbero Martin
033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Barbero Martin
15363b1ac5 Merge remote-tracking branch 'origin/develop' into ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos 2022-07-04 09:12:10 +02:00
Daniel Barbero Martin
2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Jimmy Olano
2bf757a364 Merge branch 'ent-8252-12671-ordenar-campos-custom-fields-eventos' into 'develop'
Ent 8252 12671 ordenar campos custom fields eventos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8252

See merge request artica/pandorafms!4948
2022-07-01 11:01:57 +00:00
Daniel Barbero Martin
a92d50303d fix color tabs and block histogram pandora_enterprise#8621 2022-06-30 14:09:29 +02:00
Daniel Barbero Martin
c2c519694a size modal form widget pandora_enterprise#8621 2022-06-28 17:49:58 +02:00
José González
c3dc1d820d Frontend changes 2022-06-28 17:24:49 +02:00
Daniel Barbero Martin
867c6a1415 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/javascript/pandora.js
2022-06-28 17:02:01 +02:00
daniel
4ca27cd5a9 Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop'
events sound pandora_enterprise#7960

See merge request artica/pandorafms!4923
2022-06-28 13:47:05 +00:00
Daniel Barbero Martin
1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2
Conflicts:
	pandora_console/include/functions_events.php
2022-06-27 16:07:19 +02:00
Daniel Barbero Martin
3cdde5054a size form widgets dashboards pandora_enterprise#8827 2022-06-27 15:43:42 +02:00
Daniel Barbero Martin
24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
2022-06-27 08:38:50 +02:00
Daniel Barbero Martin
f89aaabc21 minor fixed events 2022-06-23 18:06:25 +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 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
Daniel Barbero Martin
b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02:00
Daniel Barbero Martin
e77ae67fb2 new images update manager online pandora_enterprise#9192 2022-06-22 14:48:54 +02: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 Barbero Martin
9505206328 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-22 08:48:38 +02:00
edu.corral
22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
Daniel Barbero Martin
9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Barbero Martin
3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Barbero Martin
7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
José González
7f2182d52a Merge branch 'develop' into 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion'
# Conflicts:
#   pandora_console/install.php
2022-06-17 07:37:01 +00:00
Daniel Rodriguez
ae5c4dca24 Merge branch 'ent-9026-Buscador-roto-agregar-acciones-a-alerta-SNMP' into 'develop'
Fix several issues with SNMP Alert view

See merge request artica/pandorafms!4913
2022-06-16 11:35:40 +00:00
José González
32bfa233d5 Merge 2022-06-16 11:45:58 +02:00
José González
bad0335502 Changed styles 2022-06-16 11:14:29 +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
74e2dcad26 Merge branch 'ent-9064-Cambiar-logo-en-CSS-blanco-estándar' into 'develop'
Set new brand and color for header

See merge request artica/pandorafms!4944
2022-06-16 06:43:21 +00:00
Daniel Rodriguez
ffdc8ee656 Merge branch 'ent-9032-Mejora-visual-eventos-largos-destrozan' into 'develop'
Improve event names

See merge request artica/pandorafms!4951
2022-06-16 06:41:07 +00:00
Daniel Barbero Martin
5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2
Conflicts:
	pandora_console/include/javascript/pandora.js
2022-06-13 17:10:19 +02:00
José González
dc599d2fe6 Handle header image with community and with black theme 2022-06-13 16:23:37 +02:00
José González
8e4cffbc0a Several style refactory 2022-06-13 12:34:16 +02:00
Daniel Rodriguez
38de162f94 Merge branch 'ent-9031-Mejora-visual-Cajas-de-busqueda-avanzada-de-ver-eventos' into 'develop'
Ent 9031 mejora visual cajas de busqueda avanzada de ver eventos

See merge request artica/pandorafms!4925
2022-06-13 09:22:54 +00:00
José González
022d28981d Update styles 2022-06-10 12:57:04 +02:00
José González
bce182f2b2 Improve event names 2022-06-09 11:02:11 +02:00