Commit Graph

7661 Commits

Author SHA1 Message Date
Arturo Gonzalez 4a6c7f1783 Fixed encoding problems and default label color 2017-11-06 08:35:42 +01:00
artica 2bca9c92fa Auto-updated build strings. 2017-11-06 00:01:08 +01:00
artica 3a220564ec Auto-updated build strings. 2017-11-05 00:01:09 +01:00
artica cc4e337f70 Auto-updated build strings. 2017-11-04 00:01:12 +01:00
vgilc c45154e9d7 Merge branch '179-Se-han-dejado-una-traza-en-la-vista-de-agente-dev' into 'develop'
Fixed traces

See merge request artica/pandorafms!1015
2017-11-03 14:48:47 +01:00
vgilc bbecd1af09 Merge branch '1534-No-se-inicializan-módulos-SNMPv3-con-caracteres-especiales-dev' into 'develop'
Fixed password entities in snmp walk

See merge request artica/pandorafms!1014
2017-11-03 13:49:40 +01:00
danielmaya 173efae22d Fixed traces 2017-11-03 13:38:59 +01:00
danielmaya 7c78cd2a34 Fixed password entities in snmp walk 2017-11-03 13:18:00 +01:00
vgilc 49d5f0878f Merge branch 'tardanza-en-vista-de-arbol-carrefour' into 'develop'
Initialize the group cache.

See merge request artica/pandorafms!1006
2017-11-03 12:10:55 +01:00
vgilc 43fdb65e92 Merge branch '1394-Errores-tema-black-2-open' into 'develop'
Change pandora black styles - #1394

See merge request artica/pandorafms!1013
2017-11-03 11:36:39 +01:00
vgilc 6ddf744163 Merge branch '1511-visual-console-elements-not-sorted-in-creation-dev' into 'develop'
Added changes to sort json in ajax return

See merge request artica/pandorafms!1001
2017-11-03 10:46:17 +01:00
enriquecd 1e138f240f Change pandora black styles - #1394 2017-11-03 10:27:01 +01:00
artica 3d6d1044ea Auto-updated build strings. 2017-11-03 00:01:11 +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
danielmaya 33bff02978 clear entities 2017-11-02 13:03:58 +01:00
Ramon Novoa ec870aa2f6 Initialize the group cache. 2017-11-02 10:41:07 +01:00
artica f8211e2c63 Auto-updated build strings. 2017-11-02 00:01:07 +01:00
artica 9b530c414f Auto-updated build strings. 2017-11-01 00:01:10 +01:00
Arturo Gonzalez 50e7e5fc17 Added changes to sort json in ajax return 2017-10-31 16:39:58 +01:00
fermin831 0a0506b9ff Merge branch 'develop' into ent-1365-graficas-gauge-no-muestran-umbrales-menores-a-1
Conflicts resolved:
*  pandora_console/include/graphs/pandora.d3.js
2017-10-31 12:47:42 +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
enriquecd d1c29845a9 Add only one widget when creating a dashboard - #1398 2017-10-31 12:00:30 +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
artica 0653c17a9d Auto-updated build strings. 2017-10-31 00:01:11 +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
Arturo Gonzalez 2c3d72eedf Added lost parameter 2017-10-30 08:49:10 +01:00
artica 90b671de74 Auto-updated build strings. 2017-10-30 00:01:08 +01:00
artica 8f6d4a5d42 Auto-updated build strings. 2017-10-29 00:01:08 +02:00
artica 9bc804073a Auto-updated build strings. 2017-10-28 00:01:11 +02:00
vgilc 9592868491 Merge branch '1150-add-map-link-in-a-fictional-node-dev' into 'develop'
Added lost code in limbo, come back to the heaven darling

See merge request artica/pandorafms!982
2017-10-27 12:25:12 +02:00
Arturo Gonzalez 9145811d29 Added final lost code 2017-10-27 10:40:58 +02:00
artica 42a43b0c4e Auto-updated build strings. 2017-10-27 00:01:09 +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 e4e5734ff5 Merge branch 'ent-1178-solicitud-de-macro-que-devuelve-el-server-al-que-esta-asignado-el-agente' into 'develop'
Ent 1178 solicitud de macro que devuelve el server al que esta asignado el agente

See merge request artica/pandorafms!902
2017-10-26 13:54:39 +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 2f9d999978 Merge branch '1397-Grafica-combinada-y-fondo-negro-transparente-Consola-visual' into 'develop'
Enable background color options for gauge charts - #1397

See merge request artica/pandorafms!900
2017-10-26 13:35:44 +02:00
vgilc ed483a27b9 Merge branch '1398-Dashboard-En-la-creacion-solo-1-widget' into 'develop'
Change default number of widgets when creating a dashboard - #1398

See merge request artica/pandorafms!872
2017-10-26 13:35:17 +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 0f50c3ff82 Merge branch '1429-new-options-in-agent-graphs-section-dev' into 'develop'
Added new item to choose between line and area. Changed radio button to select.

See merge request artica/pandorafms!886
2017-10-26 13:28:24 +02:00
Arturo Gonzalez 0b63fc22f9 Added lost code in limbo, come back to the heaven darling 2017-10-26 13:28:08 +02:00