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

988 Commits

Author SHA1 Message Date
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +01:00
vgilc e5c4dc4778 Merge branch '1319-Unsuccessfull-action-open' into 'develop' 
Check empty SLA fields on SLA wizar create form - #1319

See merge request artica/pandorafms!1096
 2017-12-21 10:52:35 +01:00
vgilc 097bc3df32 Merge branch 'ent-1577-vista-general-descuadrada-en-graph-containers' into 'develop' 
Added resize functionality to flot graphs and fix overview in container graphs

See merge request artica/pandorafms!1068
 2017-12-21 10:46:42 +01:00
vgilc 7938f6e65e Merge branch '1617-Consola-visual-Previsualización-background-no-carga-imagen' into 'develop' 
Fix preload background image in visual console builder - #1617

See merge request artica/pandorafms!1090
 2017-12-21 10:44:03 +01:00
vgilc 4f0a451ba1 Merge branch '1576-Permisos-sobre-gráficas-no-permite-ver-graph-containers-4863-media-open' into 'develop' 
1576 permisos sobre gráficas no permite ver graph containers 4863 media open

See merge request artica/pandorafms!1072
 2017-12-21 08:59:36 +01:00
vgilc c98e94e59e Merge branch '1626-Fallo-al-clonar-item-de-la-consola-visual-dev' into 'develop' 
Fixed copy item in visual console

See merge request artica/pandorafms!1106
 2017-12-21 08:56:17 +01:00
enriquecd d0d0f8b229 Fix custom graph builder order bar - #1382 2017-12-13 13:08:41 +01:00
danielmaya 43e697a1cb Added hint in field Add summatory series 2017-12-13 11:50:15 +01:00
danielmaya 61b33221bf Added check modules and series 2017-12-13 10:37:23 +01:00
Daniel Maya e01f00ac3d code backup 2017-12-13 10:36:08 +01:00
nramon cf01084873 Merge branch '1382-Ordenar-elementos-custom-graphs-4606' into 'develop' 
Add order items setting bar to graph editor - #1382

See merge request artica/pandorafms!961
 2017-11-30 13:12:25 +01:00
Alejandro Gallardo Escobar f49cef9ca4 Merge branch 'develop' into visual-console-agent-link-bug 
Conflicts:
	pandora_console/include/ajax/visual_console_builder.ajax.php
 2017-11-29 14:00:44 +01:00
vgilc 684658d81f Merge branch '1409-Imágenes-en-consolas-visuales---enlace-publico-dev' into 'develop' 
Changed convert_urls in tinymce

See merge request artica/pandorafms!931
 2017-11-29 13:47:50 +01:00
danielmaya 02d67835bd Fixed copy item in visual console 2017-11-21 17:27:39 +01:00
enriquecd cc737e5120 Check empty SLA fields on SLA wizar create form - #1319 2017-11-20 11:49:13 +01:00
enriquecd 69f44aae13 Fix preload background image in visual console builder - #1617 2017-11-17 12:28:52 +01:00
enriquecd 8fa2acfd2a Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/pandoradb.sql
 2017-11-15 17:35:51 +01:00
Enrique Camargo 02670bef03 Update visual_console_builder.editor.js 2017-11-15 16:05:34 +01:00
enriquecd 27e7a51006 Fix graph container permissions and graph acl - #1576 2017-11-15 11:31:17 +01:00
Arturo Gonzalez 776aca90d6 Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/pandoradb.sql
 2017-11-15 09:43:33 +01:00
vgilc 90b99c491a Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop' 
Added new system of calculate status if user set a parent weight

See merge request artica/pandorafms!1043
 2017-11-15 09:28:10 +01:00
fermin831 78ef64ead2 Added resize functionality to flot graphs and fix overview in container graphs 2017-11-14 18:44:29 +01:00
Arturo Gonzalez 274c551671 Added height to bars graph 2017-11-14 08:50:12 +01:00
vgilc 3493b9c15c Revert "code backup" 
This reverts commit b9851a3a71
 2017-11-13 10:21:38 +01:00
Arturo Gonzalez 49df1e448a Added changes from donut graph 2017-11-13 09:59:00 +01:00
Arturo Gonzalez 110945bccf Added the last change to load string modules 2017-11-13 09:35:24 +01:00
Arturo Gonzalez eb39d25c4b Added field to get string modules 2017-11-10 15:03:52 +01:00
Arturo Gonzalez fac066debd Added groups acl in all visual console elements 2017-11-08 15:01:44 +01:00
Arturo Gonzalez c9d1fab036 Added new system of calculate status if user set a parent weight 2017-11-08 12:49:03 +01:00
Arturo Gonzalez 092c43bede Merge branch 'develop' into 1378-donut-graph-element-in-visual-console-dev 
pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
 2017-11-08 10:27:44 +01:00
Arturo Gonzalez 3de0e38c2d Added color to resume data 2017-11-08 10:21:09 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
vgilc 7e6cc539e8 Merge branch '1396-problems-with-percentile-items-in-visual-console-dev' into 'develop' 
Fixed problems with unit

See merge request artica/pandorafms!1027
 2017-11-07 11:23:02 +01:00
vgilc 47171418cd Merge branch '1548-problems-with-simple-value-in-visual-console-dev' into 'develop' 
Modified simple value

See merge request artica/pandorafms!1026
 2017-11-07 11:22:28 +01:00
Arturo Gonzalez 31577a823c Fixed problems with unit 2017-11-07 10:57:30 +01:00
Arturo Gonzalez 94a9bcb85b Modified simple value 2017-11-07 10:26:26 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop' 
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
 2017-11-06 17:41:45 +01:00
enriquecd f0fe30fc3a Now can create static graphs a group items without images, fix bugs - #1407 2017-11-02 15:54:18 +01:00
vgilc 594b6e9417 Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop' 
1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007
 2017-11-02 15:35:38 +01:00
vgilc a7e1e877e7 Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480-cherry' into 'develop' 
654 cambios en informes de maximo minimo y media 4480 cherry

See merge request artica/pandorafms!994
 2017-10-31 12:13:55 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
nramon 4e672cc758 Merge branch '655-module_data_increment_new_type_of_report' into 'develop' 
655 module data increment new type of report

See merge request artica/pandorafms!519
 2017-10-31 08:18:26 +01:00
Alejandro Gallardo Escobar 849eba10d4 [Console] Fixed a vulnerability into the 'fgraph.php' script 2017-10-30 18:03:09 +01:00
enriquecd f608c686b8 Graph and table mode for max, min and avg reports an template reports - #654 2017-10-30 17:23:59 +01:00
nramon 8163200f54 Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'" 
This reverts merge request !871
 2017-10-30 16:11:58 +01:00
nramon 65ae5ed2eb Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop' 
Graph and table mode for max, min and avg reports and template reports - #654

See merge request artica/pandorafms!871
 2017-10-30 15:51:51 +01:00
enriquecd f4fc23cb64 Merge branch 'develop' into 1407-No-se-puede-quitar-icono-de-objeto-Visual-consoles-2 
Conflicts:
	pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-10-30 15:21:46 +01:00
Arturo Gonzalez 9145811d29 Added final lost code 2017-10-27 10:40:58 +02:00
Arturo Gonzalez 139db28eca Added lost code 2017-10-26 16:13:27 +02:00
vgilc b96b50129c Merge branch '1103-Opciones-copiar-cortar-pegar-editor-de-etiquetas-de-la-consola-visual' into 'develop' 
Now the label editor color is changed by the mouse scroll - #1103

See merge request artica/pandorafms!802
 2017-10-26 15:48:33 +02:00