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

3396 Commits

Author SHA1 Message Date
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
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
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
nramon 70763ada3b 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:32:32 +01:00
nramon 7bc959ef41 Merge branch '1205-Editar-OID-desde-operaciones-masivas-4406-Northern' into 'develop' 
Add snmp oid field in module bulk operations - #1205

See merge request artica/pandorafms!807
 2017-10-30 15:27:34 +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
enriquecd 32f5db5934 Merge branch 'develop' into 1205-Editar-OID-desde-operaciones-masivas-4406-Northern 
Conflicts:
	pandora_console/godmode/massive/massive_edit_modules.php
 2017-10-30 15:19:49 +01:00
enriquecd d98ee0d0bd Merge branch 'develop' into 1406-Visual-consoles-e-imagenes-HTML-4623-com1 
Conflicts:
	pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-10-30 13:27:40 +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
Arturo Gonzalez eb99b0a885 Added lost code 2017-10-26 15:37:43 +02:00
Arturo Gonzalez 802cb3ef5e Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev 2017-10-26 14:41:07 +02:00
Arturo Gonzalez 5a59f9e2a5 Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev 2017-10-26 14:20:35 +02:00
vgilc 0537f8fe80 Merge branch '951-Añadir-enlace-documentación-en-aviso-de-MR-pendiente-open' into 'develop' 
Add link in minor release update dialog to documentation - #951

See merge request artica/pandorafms!626
 2017-10-26 13:59:54 +02:00
vgilc 3cbe8fa585 Merge branch '1228-Posicion-fija-para-boton-update-en-setup-visual-styles' into 'develop' 
Apply comfort displacement to update button in visual styles section - #1288

See merge request artica/pandorafms!794
 2017-10-26 13:54:03 +02:00
Arturo Gonzalez 704511aa56 Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev 2017-10-26 13:40:01 +02:00
vgilc 86b4fc433c Merge branch '1388-Meter-un-par-de-saltos-de-tamaño-de-fuente-mas-elementos-consola-visual' into 'develop' 
Add new font sizes for visual console - #1388

See merge request artica/pandorafms!874
 2017-10-26 13:39:59 +02:00
vgilc e8a14b6981 Merge branch '1416-new-h-and-v-bar-charts-in-visual-console-dev' into 'develop' 
1416 new h and v bar charts in visual console dev

See merge request artica/pandorafms!956
 2017-10-26 13:30:52 +02:00
vgilc e03d3a207a Merge branch '1430-werid-design-in-monitor-search-form-dev' into 'develop' 
Added good size to form elements

See merge request artica/pandorafms!884
 2017-10-26 13:19:16 +02:00
vgilc 89f5af3b52 Merge branch '1282-Errores-en-selectores-de-agentes-y-módulos-dev' into 'develop' 
Fixed ordering and repetition modules

See merge request artica/pandorafms!820
 2017-10-26 12:29:00 +02:00
vgilc c38546fa65 Merge branch '1386-Elemento-histograma-en-el-editor-se-ve-raro' into 'develop' 
Change auto sla graphs size in visual console editor mode - #1386

See merge request artica/pandorafms!897
 2017-10-26 11:19:23 +02:00
vgilc 3ff14bb001 Merge branch '895-Borrado-masivo-de-informes-7' into 'develop' 
Add multiple checkbox selector for report delete - #895

See merge request artica/pandorafms!596
 2017-10-26 11:08:47 +02:00
vgilc f654bdd241 Merge branch '1113-Enumeración-recursiva-de-grupos-en-vista-agente-modulo-3805-media-open' into 'develop' 
Add recursion group search for agent/module view and angent/module item in reports - #1113

See merge request artica/pandorafms!812
 2017-10-26 11:07:46 +02:00
vgilc 0d6804d052 Merge branch '1121-Icono-personalizado-por-agente-en-mapas-GIS-4283-2' into 'develop' 
Add agent icon group marker option in setup visuals for GIS maps - #1121

See merge request artica/pandorafms!848
 2017-10-26 11:06:48 +02:00
vgilc e344ad8de8 Merge branch '1441-Busqueda-y-ordenacion-no-funcionan-correctamente-en-Gestionar-agentes-Carrefour' into 'develop' 
Uncomment collation order for case insensitive agent search - #1441

See merge request artica/pandorafms!913
 2017-10-26 09:53:45 +02:00
vgilc 3c15924037 Merge branch '1456-Errores-en-paradas-planificadas-dev' into 'develop' 
fixed icon with planned downtime

See merge request artica/pandorafms!937
 2017-10-26 09:53:01 +02:00
daniel b23b9448b6 fixed errors in visual console 2017-10-24 17:03:35 +02:00
Arturo Gonzalez 5fa51ceb6b Fixed element in meta 2017-10-24 09:24:07 +02:00
Arturo Gonzalez 3c4331631d Fixed width in js 2017-10-23 16:24:40 +02:00
Arturo Gonzalez 9b01919342 Fixed function to get string type 2017-10-23 14:58:02 +02:00
vgilc 9de7f7591d Merge branch '1478-Problemas_varios_en_consolas_visuales' into 'develop' 
1478 problemas varios en consolas visuales

See merge request artica/pandorafms!944
 2017-10-23 11:06:51 +02:00
daniel 12f51156f8 fixed error background image metaconsole 2017-10-23 10:35:57 +02:00
vgilc 3fcf01f886 Merge branch '1478-Filtro-para-consolas-visuales--Carrefour]-dev' into 'develop' 
added filter in VISUAL CONSOLE

See merge request artica/pandorafms!942
 2017-10-23 09:12:32 +02:00
Arturo Gonzalez 05bbdecdd8 Added item to editor 2017-10-23 08:32:41 +02:00
Daniel Maya c1bd70a0f0 added filter in VISUAL CONSOLE 2017-10-20 11:44:58 +02:00
Arturo Gonzalez 1d3a082e5c Added item to editor 2017-10-19 12:22:01 +02:00
Arturo Gonzalez 90e12d66c2 Added item form and code in js 2017-10-19 10:52:19 +02:00
Arturo Gonzalez ddbe2a298c Adapts donut graph to meta 2017-10-18 16:29:51 +02:00
Arturo Gonzalez 0f2d6d17be Added change about linked visualmaps 2017-10-18 15:13:26 +02:00
Arturo Gonzalez f6fca4e46d Added donut to node visual consoles 2017-10-18 11:40:40 +02:00
Daniel Maya 03f0c47bc2 fixed icon with planned downtime 2017-10-18 11:15:51 +02:00
Arturo Gonzalez d18dded93a Added a lot of code to add donut graph to visual console. Print donut in progress. 2017-10-17 10:54:08 +02:00
vgilc 27746eedc0 Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'" 
This reverts merge request !862
 2017-10-16 16:44:44 +02:00
Arturo Gonzalez ce72e5a5af Added structure to new item 2017-10-16 16:10:59 +02:00
enriquecd da4a277625 Change db maintenance sections buttons location - #1350 2017-10-16 13:26:30 +02:00
fermin831 befb859e23 Fixed auto SLA item on visual console when no module is selected 2017-10-13 14:16:37 +02:00
enriquecd 45383875b1 Uncomment collation order for case insensitive agent search - #1441 2017-10-10 14:55:17 +02:00