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

30660 Commits

Author SHA1 Message Date
artica 99bfdc804e Auto-updated build strings. 2022-07-15 01:00:20 +02:00
Diego Muñoz-Reja 889d80fbdb Merge branch 'ent-8889-Redirecciones-usuarios-en-Carrefour' into 'develop' 
Ent 8889 redirecciones usuarios en carrefour

See merge request artica/pandorafms!4885
 2022-07-14 14:59:12 +00:00
Daniel Maya 0ff688f6fa #8889 Fixed url location 2022-07-14 16:50:26 +02:00
Diego Muñoz-Reja 5650758e5a Merge branch 'ent-8769-13353-usuario-no-admin-solo-puede-gestionar-agentes-de-1-nodo' into 'develop' 
Ent 8769 13353 usuario no admin solo puede gestionar agentes de 1 nodo

See merge request artica/pandorafms!4942
 2022-07-14 13:38:31 +00:00
Daniel Maya 4011ca99fe #8769 Resolved conflict 2 2022-07-14 13:02:39 +02:00
Diego Muñoz-Reja 0f770edc13 Merge branch 'ent-8732-giss-13230-aplicar-reglas-de-autoconfiguracion-de-forma-programada' into 'develop' 
Ent 8732 giss 13230 aplicar reglas de autoconfiguracion de forma programada

See merge request artica/pandorafms!5011
 2022-07-14 10:35:52 +00:00
Daniel Maya 8096ffebc1 #8732 Added autoconfiguration scheduled 4 2022-07-14 10:10:25 +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 Maya 8ffb247703 #8732 Added autoconfiguration scheduled 3 2022-07-13 13:04:15 +02:00
Daniel Maya e8c7c38c1f #8732 Resolved conflict 2022-07-13 11:31: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
Alejandro Sánchez 555c324241 Merge branch 'ent-9075-13679-hacer-compatible-plugin-cisco-ipsla-con-snmpv3' into 'develop' 
make open cisco ipsla plugin compatible with snmp v3

See merge request artica/pandorafms!4929
 2022-07-12 13:28:07 +00:00
alejandro c3e19c489c editing plugin cisco no enterprise 2022-07-12 15:24:58 +02:00
Daniel Maya 4f7918114b #9029 Added starmap 2 2022-07-12 13:45:01 +02:00
Daniel Maya 26cfde6687 #8732 Added autoconfiguration scheduled 2 2022-07-12 12:37:22 +02:00
artica d601ca88ca Auto-updated build strings. 2022-07-12 01:00:19 +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 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
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
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 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
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