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

11467 Commits

Author SHA1 Message Date
Alejandro Fraguas 0418c86867 Merge branch 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' into 'develop' 
pandora HA review

See merge request artica/pandorafms!2654
 2019-09-20 13:57:03 +02:00
Daniel Rodriguez 409ac061e0 Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop' 
Ent 4047 simplificacion de la configuracion del sistema de email

See merge request artica/pandorafms!2712
 2019-09-20 11:57:58 +02:00
artica d8ab1defcb Auto-updated build strings. 2019-09-20 00:01:09 +02:00
Daniel Rodriguez 28559f4fcb Merge branch 'ent-4435-consola-visual-host-alive-keep-alive' into 'develop' 
Add new visual console Host Alive Keep Alive

See merge request artica/pandorafms!2701
 2019-09-19 16:10:33 +02:00
fbsanchez 6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-19 10:18:15 +02:00
artica 14f73f147f Auto-updated build strings. 2019-09-19 00:01:10 +02:00
Daniel Rodriguez c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop' 
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
 2019-09-18 14:41:35 +02:00
Daniel Barbero Martin 056bbb7348 fixed minor error 2019-09-18 13:16:05 +02:00
artica 47be6a611f Auto-updated build strings. 2019-09-18 00:01:11 +02:00
Daniel Rodriguez 1ad8c6fe2e Merge branch 'ent-4280-Nombres-duplicados-SNMP-console-y-trap-generator-en-ACL-Enterprise' into 'develop' 
Fixed duplicated names - #4280

See merge request artica/pandorafms!2658
 2019-09-17 10:47:05 +02:00
Alejandro Fraguas d9b697d076 Merge branch 'ent-4635-8710-Monitor-Report-informes-muestra-el-dato-al-reves' into 'develop' 
Fixed bug in item type monitor report

See merge request artica/pandorafms!2726
 2019-09-17 09:48:15 +02:00
artica 15a5d6f2e5 Auto-updated build strings. 2019-09-17 00:01:57 +02:00
Luis Calvo a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
artica 2e121e2cc5 Auto-updated build strings. 2019-09-16 00:01:08 +02:00
artica 05eeb6f3d2 Auto-updated build strings. 2019-09-15 00:01:08 +02:00
artica bc36ed132d Auto-updated build strings. 2019-09-14 00:01:23 +02:00
manuel 00fc4c9238 Fixed bug in item type monitor report 2019-09-13 09:39:09 +02:00
artica 2f45d3d6ec Auto-updated build strings. 2019-09-13 00:01:11 +02:00
Alejandro Fraguas 3a85b434ca Merge branch 'ent-4558-8584-intracom-el-pdf-generado-desde-custom-report-es-ilegible-si-la-tabla-tiene-muchas-filas' into 'develop' 
Fixed max,min,avg report

See merge request artica/pandorafms!2720
 2019-09-12 17:29:09 +02:00
Daniel Maya 3d8486659e Fixed period in template 2019-09-12 12:52:40 +02:00
fbsanchez ebcce5cad4 Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-12 11:17:44 +02:00
artica 602c9ccb5e Auto-updated build strings. 2019-09-12 00:01:26 +02:00
Daniel Maya d9dc03dd91 Fixed max,min,avg report 2019-09-11 18:08:40 +02:00
Alejandro Fraguas a9e6409cf9 Merge branch 'ent-4587-Limpieza-de-sesiones' into 'develop' 
delete session open by api calls

See merge request artica/pandorafms!2691
 2019-09-11 09:40:18 +02:00
artica fdef0b5188 Auto-updated build strings. 2019-09-11 00:01:10 +02:00
Tatiana Llorente c842c96d08 Fixed duplicated names - #4280 2019-09-10 12:19:53 +02:00
Alejandro Fraguas b97080f13c Merge branch 'ent-4275-notificaciones-correo-no-escribe-bien-url' into 'develop' 
Added ui_get_full_url in all links

See merge request artica/pandorafms!2703
 2019-09-10 12:18:52 +02:00
Tatiana Llorente b198700172 Fixed duplicated names - #4280 2019-09-10 12:18:17 +02:00
alejandro-campos 93b9c76f58 Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email 2019-09-10 10:50:53 +02:00
artica 16912732d2 Auto-updated build strings. 2019-09-10 00:01:08 +02:00
artica 5526bb49ed Auto-updated build strings. 2019-09-09 00:01:07 +02:00
artica f088f47605 Auto-updated build strings. 2019-09-08 00:01:06 +02:00
artica 3680555bae Auto-updated build strings. 2019-09-07 00:01:10 +02:00
Daniel Rodriguez da7811953c Merge branch 'ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono' into 'develop' 
Added mr and uncommented code

See merge request artica/pandorafms!2558
 2019-09-06 13:38:11 +02:00
artica ae474a2731 Auto-updated build strings. 2019-09-06 00:01:10 +02:00
Daniel Rodriguez d02f3621f3 Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop' 
Removed autofill proxi in auth server

See merge request artica/pandorafms!2361
 2019-09-05 18:29:43 +02:00
Daniel Maya 86cf025317 Fixed some errors in visual console 2019-09-05 11:58:15 +02:00
fbsanchez 315d9728ec quick fix short news titles 2019-09-05 10:54:14 +02:00
artica a4739e4891 Auto-updated build strings. 2019-09-05 00:01:07 +02:00
Jose Gonzalez bb25679344 Added ui_get_full_url in all links 2019-09-04 14:12:38 +02:00
fbsanchez d0e6f0dbae Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-04 12:07:56 +02:00
artica 61c75118f2 Auto-updated build strings. 2019-09-04 00:01:10 +02:00
Daniel Rodriguez 8493ec20eb Merge branch 'ent-4580-8639-errores-al-generar-informes-dinamicos' into 'develop' 
Fixed date limit in historical_data

See merge request artica/pandorafms!2695
 2019-09-03 18:37:55 +02:00
Daniel Rodriguez f126b8b2a2 Merge branch 'ent-4503-XML-bloquea-vista-101-de-consola' into 'develop' 
Escape the double quotes that may have the name of the module - #4503

See merge request artica/pandorafms!2680
 2019-09-03 17:09:21 +02:00
Daniel Rodriguez a5fe2a913f Merge branch 'ent-4478-no-carga-valores-actuales-al-editar-accion-alerta' into 'develop' 
Fixed alert actions bug

See merge request artica/pandorafms!2636
 2019-09-03 17:08:17 +02:00
marcos.alconada b18f72dcdd Add new visual console Host Alive Keep Alive 2019-09-03 13:04:12 +02:00
fbsanchez 291dece854 obhd encapsulated debug print 2019-09-03 12:40:16 +02:00
artica fa39119264 Auto-updated build strings. 2019-09-03 00:01:12 +02:00
Daniel Maya 6c51c4e1e9 Fixed date limit in historical_data 2019-09-02 11:18:04 +02:00
fbsanchez 9868462d43 Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-02 09:57:45 +02:00