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

11628 Commits

Author SHA1 Message Date
artica 38dfa5cf35 Auto-updated build strings. 2019-10-24 00:01:09 +02:00
Alejandro Fraguas 5364ef0fa1 Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into 'develop' 
Fix and control API sessions

See merge request artica/pandorafms!2830
 2019-10-23 16:12:19 +02:00
Tatiana Llorente 31c36dc015 Ent 4819 no funciona llamada api get events 2019-10-23 15:53:30 +02:00
Alejandro Fraguas 8fd6f28070 Merge branch 'ent-4851-Cambio-de-color-en-la-union-de-agentes-del-GIS-map' into 'develop' 
Changed color

See merge request artica/pandorafms!2831
 2019-10-23 12:28:04 +02:00
Daniel Rodriguez 39b3a00276 Merge branch 'ent-4690-revision-completa-de-informes-templates-en-meta' into 'develop' 
Fixed bugs in reports

See merge request artica/pandorafms!2796
 2019-10-23 11:41:07 +02:00
Daniel Maya c01a856826 Changed color 2019-10-23 11:17:16 +02:00
artica 1470241783 Auto-updated build strings. 2019-10-23 00:01:11 +02:00
fbsanchez 9edb77d288 proper logout (api) 2019-10-22 20:48:45 +02:00
fbsanchez ccfd944ad7 Fix and control API sessions 
Conflicts:
	pandora_console/include/lib/User.php

	modified:   pandora_console/include/api.php
	modified:   pandora_console/include/chart_generator.php
	new file:   pandora_console/include/lib/User.php
	modified:   pandora_console/include/load_session.php
	modified:   pandora_console/include/web2image.js
 2019-10-22 17:33:50 +02:00
manuel bbeb750e46 Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta 
Conflicts:
	pandora_console/include/functions_graph.php
 2019-10-22 15:51:38 +02:00
manuel deb217906c Fixed bug in templates 2019-10-22 15:41:13 +02:00
Daniel Rodriguez 552d8758e8 Merge branch 'ent-4815-html-en-los-csv' into 'develop' 
Fixed bug in CSV export

See merge request artica/pandorafms!2824
 2019-10-22 14:22:42 +02:00
Daniel Rodriguez 0cf3e01f74 Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop' 
Ent 1880 umbrales inversos en negativo

See merge request artica/pandorafms!2818
 2019-10-22 12:56:21 +02:00
Alejandro Fraguas ee0eee06f6 Merge branch 'ent-4724-estilo-vista-pandora-wux' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2779
 2019-10-22 12:54:28 +02:00
marcos 79a1a1b2a3 add wux.css 2019-10-22 10:23:53 +02:00
artica f99616723b Auto-updated build strings. 2019-10-22 00:01:09 +02:00
manuel 312b1c7c40 Fixed bug in CSV export 2019-10-21 11:48:13 +02:00
artica f72fde0fb5 Auto-updated build strings. 2019-10-21 00:01:07 +02:00
artica bb9d18b6d8 Auto-updated build strings. 2019-10-20 00:01:07 +02:00
artica 88248fd226 Auto-updated build strings. 2019-10-19 00:01:11 +02:00
artica 22af1a3654 Auto-updated build strings. 2019-10-18 00:01:11 +02:00
Alejandro Fraguas be29f1dd55 Merge branch 'ent-4746-boton-de-aspecto-raro-en-forgot-your-password' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2782
 2019-10-17 13:20:14 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
Daniel Rodriguez 2dfc2b7a8a Merge branch 'ent-3989-graficas-sql-metaconsola' into 'develop' 
Available in metaconsole sql charts in reports for metaconsole server

See merge request artica/pandorafms!2697
 2019-10-17 11:07:37 +02:00
Daniel Rodriguez 3cb80e5d32 Merge branch '4820-planned_downtimes_created-no-se-almacena-correctamente' into 'develop' 
Solved issue with date_from and dato_to missing time data

See merge request artica/pandorafms!2817
 2019-10-17 10:16:07 +02:00
artica 361f2022f4 Auto-updated build strings. 2019-10-17 00:01:10 +02:00
Daniel Rodriguez b6db2aa041 Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop' 
Fixed open and enterprise network map migration

See merge request artica/pandorafms!2745
 2019-10-16 19:03:24 +02:00
Jose Gonzalez 4a29057a1b Solved issue with date_from and dato_to missing time data 2019-10-16 16:41:22 +02:00
Daniel Rodriguez 5f0dffb816 Merge branch 'ent-4559-desajuste-en-custom-fields' into 'develop' 
Ent 4559 desajuste en custom fields

See merge request artica/pandorafms!2684
 2019-10-16 11:38:38 +02:00
Alejandro Fraguas 7e54a26b49 Merge branch 'ent-4618-8580-4526-Bug-en-los-CSV-report' into 'develop' 
Fixed csv reports download

See merge request artica/pandorafms!2742
 2019-10-16 09:58:00 +02:00
artica a3a456da92 Auto-updated build strings. 2019-10-16 00:01:08 +02:00
Alejandro Fraguas 78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop' 
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
 2019-10-15 11:42:00 +02:00
Marcos Alconada 89843fcc3b Update functions_ui 2019-10-15 11:13:40 +02:00
artica 6c21d57677 Auto-updated build strings. 2019-10-15 00:01:09 +02:00
Daniel Rodriguez febe54e3c8 Merge branch '4779-call-set-planned_downtimes-no-se-muestra' into 'develop' 
Added date control

See merge request artica/pandorafms!2794
 2019-10-14 16:21:39 +02:00
artica 83b16d9d84 Auto-updated build strings. 2019-10-14 00:01:07 +02:00
artica 838fcfa3a1 Auto-updated build strings. 2019-10-13 00:01:06 +02:00
artica df2acbce96 Auto-updated build strings. 2019-10-12 00:01:10 +02:00
Daniel Rodriguez e4775a3e6d Merge branch 'ent-4607-8644-informe-histograma-no-funciona-bien' into 'develop' 
Fixed bug in histogram graph report

See merge request artica/pandorafms!2803
 2019-10-11 13:06:27 +02:00
Daniel Rodriguez adaead5f8f Merge branch 'ent-4763-paginacion-datatables' into 'develop' 
datatables hide when only 1 page

See merge request artica/pandorafms!2784
 2019-10-11 12:46:22 +02:00
Daniel Rodriguez c1853523f5 Merge branch 'ent-4545-Bug-creacion-infrome-con-graficas-MAX-Value-fallo-tabla' into 'develop' 
Ent 4545 bug creacion infrome con graficas max value fallo tabla

See merge request artica/pandorafms!2719
 2019-10-11 12:30:36 +02:00
manuel f139fb0d2c Merge branch 'develop' into ent-4618-8580-4526-Bug-en-los-CSV-report 2019-10-11 11:39:41 +02:00
Alejandro Fraguas 7fc31d127d Merge branch 'ent-4662-bug-creacion-agente-API-visualizacion-Metaconsola' into 'develop' 
Ent 4662 bug creacion agente api visualizacion metaconsola

See merge request artica/pandorafms!2764
 2019-10-11 11:25:16 +02:00
manuel a69cfb63f1 Fixed bug in histogram graph report 2019-10-11 09:04:13 +02:00
artica 9a165dc9d8 Auto-updated build strings. 2019-10-11 00:01:08 +02:00
Daniel Rodriguez f8dc0596ba Merge branch 'ent-4653-item-agent-modules-blank-on-template' into 'develop' 
Removed item agent/modules from templates

See merge request artica/pandorafms!2760
 2019-10-10 17:00:28 +02:00
artica edb3c806ce Auto-updated build strings. 2019-10-10 00:01:08 +02:00
fbsanchez d09c071684 discovery ACL 2019-10-09 15:45:02 +02:00
manuel 93bca4673f Fixed bugs in reports 2019-10-09 13:15:07 +02:00
artica be2148ff26 Auto-updated build strings. 2019-10-09 00:01:09 +02:00