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

30917 Commits

Author SHA1 Message Date
Daniel Maya 26cfde6687 #8732 Added autoconfiguration scheduled 2 2022-07-12 12:37:22 +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
Diego Muñoz-Reja b276af9de3 Merge branch 'ent-9226-Cambio-en-MR-de-tabla-Enterprise' into 'develop' 
Ent 9226 cambio en mr de tabla enterprise

See merge request artica/pandorafms!5000
 2022-07-08 12:03:22 +00:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Daniel Maya 994c76a39b #8732 Added autoconfiguration scheduled 2022-07-08 11:02:58 +02:00
artica 66cb2b42c2 Auto-updated build strings. 2022-07-08 01:00:24 +02:00
edu.corral 5ae50dfb64 ent-9157 alert templates 2022-07-07 15:07:38 +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
edu.corral 36e2043102 ent-9091 setup view 2022-07-06 10:58:16 +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
Daniel Maya 86052ff28a #8769 Fixed conflict 2022-07-06 09:49:39 +02: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
Diego Muñoz-Reja 3ebcf710ee Merge branch 'ent-9245-13886-auth-token-en-respuesta-de-vista-de-eventos' into 'develop' 
fix error events pandora_enterprise#9245

See merge request artica/pandorafms!5002
 2022-07-05 15:14:18 +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
Diego Muñoz-Reja 6aa6815273 Merge branch 'ent-9174-nuevo-evento-pandora_db-del-sistema' into 'develop' 
Generate events for pandora_db related problems.

See merge request artica/pandorafms!4999
 2022-07-05 09:37:43 +00:00
artica 45671b7c39 Auto-updated build strings. 2022-07-05 01:00:25 +02:00
Ramon Novoa c703c1995c Merge remote-tracking branch 'origin/develop' into ent-9174-nuevo-evento-pandora_db-del-sistema 2022-07-04 17:15:33 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Diego Muñoz-Reja aaafaf5f47 Merge branch '9204-mergeo-plugin-log-event' into 'develop' 
adding log event plugin

See merge request artica/pandorafms!4979
 2022-07-04 14:15:22 +00:00
Daniel Maya e839d82e00 resolved conflict 2022-07-04 13:40:06 +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
edu.corral 81283e2626 ent-9045 error message 2022-07-04 10:46:55 +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
artica 5ad9178bc4 Auto-updated build strings. 2022-07-03 01:00:26 +02:00
artica a8a1069aaa Auto-updated build strings. 2022-07-02 01:00:31 +02:00
Diego Muñoz-Reja 813ae6cb0b Merge branch 'ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales-2' into 'develop' 
fix error report top n pandora_enterprise#9129

See merge request artica/pandorafms!5001
 2022-07-01 12:11:08 +00:00
Daniel Barbero Martin de926b5677 fix error events pandora_enterprise#9245 2022-07-01 13:54:33 +02:00
Daniel Barbero Martin 8bb1263fa9 fix error report top n pandora_enterprise#9129 2022-07-01 13:37:39 +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
Diego Muñoz-Reja 488191d9d8 Merge branch 'ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales' into 'develop' 
top n regex pandora_enterprise#9129

See merge request artica/pandorafms!4989
 2022-07-01 10:57:20 +00:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' 
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

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

See merge request artica/pandorafms!4949
 2022-07-01 10:47:27 +00:00
Daniel Maya b43b7b4fa5 #9226 Added tuser_task tables 2022-07-01 10:37:08 +02:00