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

15705 Commits

Author SHA1 Message Date
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 77a0f634cc Merge branch '1407-No-se-puede-quitar-icono-de-objeto-Visual-consoles-2' into 'develop' 
Show no data advice when select none in visual console  static graph or icon element - #1407

See merge request artica/pandorafms!907
 2017-10-30 15:48:57 +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 9ecc68bfe7 Merge branch '1125-Vista-de-Agente-Modulo' into 'develop' 
Disable autosubmit in agent module view - #1125

See merge request artica/pandorafms!753
 2017-10-30 15:29:09 +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
nramon cac7a181ea Merge branch '1406-Visual-consoles-e-imagenes-HTML-4623-com1' into 'develop' 
Fix labels for static graphs with image inserted, and avoid create without icon image - #1406

See merge request artica/pandorafms!903
 2017-10-30 15:26:58 +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 8b11ba0e07 Merge branch 'develop' into 1125-Vista-de-Agente-Modulo 
Conflicts:
	pandora_console/extensions/agents_modules.php
 2017-10-30 15:15:39 +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
nramon d247046694 Merge branch '708-Añadir-sección-Description-a-HTML-view-en-Meta' into 'develop' 
Add optional report description section to metaconsole - 708

See merge request artica/pandorafms!589
 2017-10-30 11:01:52 +01:00
nramon 49a1f7d872 Merge branch '1459-Campo-para-establecer-el-tiempo-de-autorefresco-dev' into 'develop' 
Added time autorefresh

See merge request artica/pandorafms!945
 2017-10-30 10:58:07 +01:00
nramon 08ffc18deb Merge branch 'nuevos-indices-para-tagente_datos' into 'develop' 
Replace the index data_index1 on tagente_datos with a composite index.

See merge request artica/pandorafms!943
 2017-10-30 10:55:22 +01:00
nramon 37de48111c Merge branch '1512-lost-ldap-login-attr-dev' into 'develop' 
Added lost parameter

See merge request artica/pandorafms!991
 2017-10-30 10:53:52 +01:00
nramon 9939c45791 Merge branch '159-Pandora-Console-The-agent-list-shows-up-not-in-alphabetical-order-at-some-place' into 'develop' 
Order agents list by alias in module bulk operations - #159

See merge request artica/pandorafms!752
 2017-10-30 10:48:12 +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
vgilc d57b7e3d3f Merge branch 'lost-code-in-visual-console-3-dev' into 'develop' 
Added final lost code

See merge request artica/pandorafms!988
 2017-10-27 11:34:42 +02:00
Arturo Gonzalez 9145811d29 Added final lost code 2017-10-27 10:40:58 +02:00
vgilc 2e6f92228f Merge branch '1498-documentacion-analizador-de-rutas' into 'develop' 
Route parser deployment

See merge request artica/pandorafms!987
 2017-10-27 10:07:06 +02:00
artica 42a43b0c4e Auto-updated build strings. 2017-10-27 00:01:09 +02:00
Fco de Borja Sánchez 9edb84f00e Route parse binaries 2017-10-26 20:37:15 +02:00
vgilc 98fab7fadf Merge branch '31-mostrar-espacio-en-descripcion-agente-windows-integria-4378-v2' into 'develop' 
Fixed description on module_freedisk_percent

See merge request artica/pandorafms!985
 2017-10-26 17:04:22 +02:00
vgilc 6e2fa136fd Merge branch 'lost-code-in-visual-console-2-dev' into 'develop' 
Added lost code

See merge request artica/pandorafms!984
 2017-10-26 17:03:57 +02:00
fermin831 cb7de8a8f2 Fixed description on module_freedisk_percent 2017-10-26 16:29:02 +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
vgilc d3a70e6029 Merge branch 'lost-code-in-visual-console-dev' into 'develop' 
Added lost code

See merge request artica/pandorafms!983
 2017-10-26 15:41:36 +02:00
Arturo Gonzalez eb99b0a885 Added lost code 2017-10-26 15:37:43 +02:00
vgilc 9dcef3043b Merge branch '1396-new-circular-percentile-item-in-visual-console-dev' into 'develop' 
1396 new circular percentile item in visual console dev

See merge request artica/pandorafms!904
 2017-10-26 14:45:10 +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
vgilc 25baa801da Merge branch '1378-donut-graph-in-visual-console-dev' into 'develop' 
1378 donut graph in visual console dev

See merge request artica/pandorafms!939
 2017-10-26 14:24:26 +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
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 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
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 ecb09fdfa6 Merge branch '1508-Añadir-xgettext-y-nano-a-los-paquetes-del-Dockerfile' into 'develop' 
Add nano and xgettext to Dockerfile - #1508

See merge request artica/pandorafms!980
 2017-10-26 13:18:01 +02:00
enriquecd 953aa53ce0 Add nano and xgettext to Dockerfile - #1508 2017-10-26 12:34:22 +02:00