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

19098 Commits

Author SHA1 Message Date
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
Daniel Rodriguez
958f851af5 Merge branch 'ent-8929-Mejora-en-widget-dasboard-General-group-stats' into 'develop' 
Ent 8929 mejora en widget dasboard general group stats

See merge request artica/pandorafms!4892
 2022-07-19 06:30:27 +00:00
Jimmy Olano
a296a58b61 Merge branch 'ent-9104-selector-multiple-a-veces-escoge-elementos-incorrectos' into 'develop' 
Ent 9104 selector multiple a veces escoge elementos incorrectos

#9104 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9104

See merge request artica/pandorafms!5006
 2022-07-19 01:33:57 +00:00
Jimmy Olano
3bbd08ec11 Merge branch 'ent-8249-12679-Incluir-filtrado-por-nombre-en-vista-de-arbol-de-servicios' into 'develop' 
Ent 8249 12679 incluir filtrado por nombre en vista de arbol de servicios

Ref pandora_enterprise#8249

See merge request artica/pandorafms!4899
 2022-07-19 01:06:53 +00:00
artica
672abbde79 Auto-updated build strings. 2022-07-19 01:00:18 +02:00
Jimmy Olano
8f00e9da6c Merge branch 'ent-9044-Mejorar-interfaz-de-herramienta-de-copia-de-configuraciones-remotas' into 'develop' 
Added Go Back input function

pandora_enterprise#9044

See merge request artica/pandorafms!4997
 2022-07-18 22:35:09 +00:00
Daniel Barbero Martin
13832dcfa2 fix time api create event pandora_enterprise#9284 2022-07-18 17:06:12 +02:00
artica
00d4f66dc3 Auto-updated build strings. 2022-07-18 01:00:16 +02:00
artica
914c12465b Auto-updated build strings. 2022-07-17 01:00:17 +02:00
artica
72a86aca26 Auto-updated build strings. 2022-07-16 01:00:18 +02:00
Calvo
34333f9f88 Alerts list datatable 2022-07-15 12:15:37 +02:00
Daniel Maya
987678b339 #9107 Fixed filter event 2022-07-15 11:38:46 +02:00
artica
99bfdc804e Auto-updated build strings. 2022-07-15 01:00:20 +02:00
Daniel Barbero Martin
e58bc4f96a move massive aperation edit agent pandora_enterprise#8564 2022-07-14 16:06:51 +02:00
artica
47e28e283b Auto-updated build strings. 2022-07-14 01:00:14 +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
artica
85c66a390c Auto-updated build strings. 2022-07-13 01:00:19 +02:00
Daniel Maya
9d259a4097 #9029 Added starmap 3 2022-07-12 16:18:17 +02:00
Daniel Maya
4f7918114b #9029 Added starmap 2 2022-07-12 13:45:01 +02:00
Daniel Barbero Martin
628d9b5630 new console report pandora_enterprise#6367 2022-07-12 10:18:06 +02:00
Daniel Barbero Martin
fc37f158d1 Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-07-12 08:55:30 +02:00
artica
d601ca88ca Auto-updated build strings. 2022-07-12 01:00:19 +02:00
Daniel Barbero Martin
8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin
8987f733d3 Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-07-11 08:37:50 +02:00
Diego Muñoz-Reja
289646a9b9 Merge branch 'ent-9230-no-se-muestra-la-version-de-codigo-instalada-en-el-footer-al-actualizar-a-763' into 'develop' 
Addded pandora_version and build_version globals

See merge request artica/pandorafms!4994
 2022-07-11 06:19:41 +00:00
artica
92936b5267 Auto-updated build strings. 2022-07-11 01:00:52 +02:00
artica
c72bf4fc9e Auto-updated build strings. 2022-07-10 01:00:19 +02:00
artica
be923c8838 Auto-updated build strings. 2022-07-09 01:00:37 +02:00
Daniel Barbero Martin
01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
artica
66cb2b42c2 Auto-updated build strings. 2022-07-08 01:00:24 +02:00
Diego Muñoz-Reja
bdb1fda92e Merge branch 'ent-9019-13559-Bug-en-logueo-con-AD-con-el-nombre' into 'develop' 
Ent 9019 13559 bug en logueo con ad con el nombre

See merge request artica/pandorafms!4910
 2022-07-07 10:44:46 +00:00
artica
6e30b7cc0e Auto-updated build strings. 2022-07-07 01:00:27 +02:00
Diego Muñoz-Reja
c756f804a7 Merge branch 'ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos' into 'develop' 
modal sound events pandora_enterprise#9095

See merge request artica/pandorafms!4998
 2022-07-06 14:57:44 +00:00
edu.corral
53fa3c8b8d ent-9185 tree view alerts modal window 2022-07-06 12:15:31 +02:00
Diego Muñoz-Reja
c0705fcce4 Merge branch 'ent-9257-13892-Error-al-mostrar-reporte-sin-datos' into 'develop' 
Ent 9257 13892 error al mostrar reporte sin datos

See merge request artica/pandorafms!5005
 2022-07-06 08:02:21 +00:00
artica
0421b3aebd Auto-updated build strings. 2022-07-06 01:00:31 +02:00
Daniel Maya
a71c26b4a7 #9029 Added starmap 2022-07-05 17:44:52 +02:00
Diego Muñoz-Reja
a257f43d49 Merge branch 'ent-8939-Cambiar-comportamiento-de-los-comentarios-en-eventos-rendimiento' into 'develop' 
Ent 8939 cambiar comportamiento de los comentarios en eventos rendimiento

See merge request artica/pandorafms!4889
 2022-07-05 15:44:24 +00:00
Daniel Barbero Martin
12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
edu.corral
4673a253f9 ent-9104 selector multiple 2022-07-05 13:38:59 +02:00
Daniel Maya
a1aa179031 #9257 Fixed return array 2022-07-05 13:12:29 +02:00
artica
45671b7c39 Auto-updated build strings. 2022-07-05 01:00:25 +02:00
Daniel Barbero Martin
033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Diego Muñoz-Reja
08a9761046 Merge branch 'ent-9239-bug-eventos-nodo' into 'develop' 
bugs events pandora_enterprise#9239

See merge request artica/pandorafms!4995
 2022-07-04 11:04:04 +00:00
edu.corral
4764b4ea3d ent-9045 error message v2 2022-07-04 12:38:50 +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
artica
225da0dac5 Auto-updated build strings. 2022-07-04 01:00:25 +02:00