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

1047 Commits

Author SHA1 Message Date
slerena c0cd577fb4 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos' into 'develop' 
Fixed bug in pandorafms

See merge request artica/pandorafms!1523
 2018-06-25 19:05:26 +02:00
slerena 053f037d0d Merge branch '2312-No-funciona-búsqueda-en-consolas-visuales-dev' into 'develop' 
Changed permission AW for VR in visual console

See merge request artica/pandorafms!1537
 2018-06-25 19:01:21 +02:00
manuel.montes 02822bcfd6 Deleted 'show in two columns' option 2018-06-22 13:36:38 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
danielmaya 9af4b25f31 Changed permission AW for VR in visual console 2018-06-13 17:28:03 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
fermin831 68ae6e3112 Always group All in custom reports and custom graphs 2018-06-12 13:06:42 +02:00
enriquecd 632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +02:00
manuel.montes bcd937b1ba Fixed bug in pandorafms 2018-06-11 17:42:12 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
 2018-06-06 11:57:02 +02:00
vgilc dbb802fb31 Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop' 
New graph thermometer - #2214

See merge request artica/pandorafms!1465
 2018-06-04 10:19:21 +02:00
vgilc 4abf3f3b2e Merge branch '1976-Informe-de-log-dev' into 'develop' 
Fixed sources in log report

See merge request artica/pandorafms!1508
 2018-06-04 10:17:17 +02:00
danielmaya 04f117523b Fixed sources in log report 2018-05-31 17:33:51 +02:00
fermin831 836cce115d Fixed ACL in custom graphs 2018-05-31 15:29:31 +02:00
fermin831 3155fecbfe Fixed ACL in reports created by another user in bit RM 2018-05-30 15:09:47 +02:00
fermin831 061df6495c Merge branch 'develop' into ent-2010-error-de-ACLs-en-custom-graphs-y-reports 2018-05-30 12:14:35 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
fermin831 358847ecef [Rebranding] Open godmode/<others> 2018-05-10 15:43:46 +02:00
daniel 123d49d604 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/styles/pandora.css
 2018-05-10 08:52:45 +02:00
daniel f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
fermin831 597e702e13 [Visual console] Removed show all advanced options in all elements and add its options to donut graphs 2018-05-08 18:50:14 +02:00
enriquecd 734c52d8bd New graph thermometer - #2214 2018-05-04 11:13:26 +02:00
fermin831 3a47c3a8fb [Visual console] Update position when change advanced options 2018-04-17 19:08:30 +02:00
fermin831 a190bd992b [SLA] Modified availability SLA to include priority modes 2018-04-16 12:25:02 +02:00
fermin831 9a55ee7d2a [SLA] Added priority mode to report style (only interface) 2018-04-12 15:42:53 +02:00
enriquecd 5418bbd099 Fix reports made by wizard - #2098 2018-03-28 18:54:15 +02:00
fermin831 0c3b6fbf83 [Visual console] Fixed icon preview 2018-03-14 10:25:27 +01:00
enriquecd 80fb004c96 Fix visual console list groups filter - #2011 2018-03-06 17:07:02 +01:00
fermin831 af6f251995 [ACL] Now only RM can delete custom graphs 2018-03-02 13:14:48 +01:00
vgilc 2b2c99cc42 Merge branch 'ent-1941-sql-charts' into 'develop' 
Ent 1941 sql charts

See merge request artica/pandorafms!1331
 2018-03-02 10:15:03 +01:00
fermin831 d7cbcd012f [SQL Graph reports] Added dynamic height configuration option 2018-03-02 09:27:29 +01:00
fermin831 6e62f4c023 [SQL Graphs] Added Max items form to top_n_value db column 2018-03-01 15:55:58 +01:00
enriquecd 095a703c6c Fix pagination in visual console list - #1994 2018-03-01 15:50:34 +01:00
enriquecd 38c6099664 Fix advanced options section in donut grpahs of visual consoles - #1899 2018-03-01 10:39:54 +01:00
vgilc 3f7e6f7ed3 Merge branch 'ent-1964-5331-error-de-ACLs-en-custom-graphs' into 'develop' 
Ent 1964 5331 error de ac ls en custom graphs

See merge request artica/pandorafms!1315
 2018-02-26 10:31:22 +01:00
fermin831 3b19d34bdc pandora_console/godmode/reporting/create_container.php 2018-02-26 10:12:29 +01:00
danielmaya a386fc9441 Fixed SQL report 2018-02-22 17:38:13 +01:00
danielmaya a801ba4ac8 Fixed issue with copy and delete visual console 2018-02-13 11:40:43 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-02-07 17:02:15 +01:00
vgilc 0f01fcbd20 Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop' 
Added type graph selection in container graph

See merge request artica/pandorafms!1113
 2018-02-06 09:55:36 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
vgilc 160daa836c Merge branch 'develop' into '1758-Error-tamaño-al-crear-elemento-de-imagen-en-consola-visual-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2018-02-05 15:55:56 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola 
Conflicts:
	pandora_console/include/functions_users.php
 2018-01-30 17:56:30 +01:00
vgilc 2a7bcb4bc2 Merge branch '1673-elemento-group-en-modo-show-statistics-no-muestra-cartel-dev' into 'develop' 
Fixed group status icon

See merge request artica/pandorafms!1178
 2018-01-29 13:30:10 +01:00
vgilc dc5840b844 Merge branch '1736-Consola-visual-Previsualización-background-no-carga-imagen-en-meta-dev' into 'develop' 
Fixed background preimage in visual console

See merge request artica/pandorafms!1243
 2018-01-29 13:23:46 +01:00
vgilc 9d4521e5e5 Merge branch '1374-Nombre-predeterminado-para-custom-graphs-4597-com1' into 'develop' 
Show graph name in custom graph items for report list - #1374

See merge request artica/pandorafms!1203
 2018-01-29 12:59:22 +01:00
daniel 65615dcf80 Fixed error sql 2018-01-25 10:06:05 +01:00
danielmaya 06a33faec2 Fixed element size of type icon, group and static graph 2018-01-11 15:32:52 +01:00