16632 Commits

Author SHA1 Message Date
artica
9b530c414f Auto-updated build strings. 2017-11-01 00:01:10 +01:00
fermin831
92c7eb59f5 Fixed public dashboard permissions 2017-10-31 19:48:56 +01:00
Alejandro Gallardo Escobar
15c87bdd67 [Console > Events view] Removed the events graph to improve ~75% the render time 2017-10-31 16:43:49 +01:00
Arturo Gonzalez
50e7e5fc17 Added changes to sort json in ajax return 2017-10-31 16:39:58 +01:00
vgilc
cd508098cb Merge branch 'change_route_parser' into 'develop'
Exposed route_parser code

See merge request artica/pandorafms!1000
2017-10-31 14:42:36 +01:00
fbsanchez
5496446819 Exposed route_parser code 2017-10-31 14:01:56 +01:00
Arturo Gonzalez
1a04e6085a Added empty networkmap functions 2017-10-31 13:17:51 +01:00
vgilc
62b4ed9b2d Merge branch 'ent-1365-graficas-gauge-no-muestran-umbrales-menores-a-1' into 'develop'
Fixed lower than 1 values on gauges

See merge request artica/pandorafms!974
2017-10-31 12:52:51 +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
vgilc
2e606acad9 Merge branch '951-Añadir-enlace-documentación-en-aviso-de-MR-pendiente-open-2' into 'develop'
Add minor realeases doc link in header advice modal window - #951

See merge request artica/pandorafms!995
2017-10-31 12:13:22 +01:00
vgilc
ef47b1dc6f Merge branch '1398-Dashboard-En-la-creacion-solo-1-widget-2b' into 'develop'
Add only one widget when creating a dashboard - #1398

See merge request artica/pandorafms!998
2017-10-31 12:08:04 +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
Arturo Gonzalez
3ead7ca3da Added the options in networkmap editor 2017-10-31 11:11:30 +01:00
Arturo Gonzalez
385685de8a Added safe input to agent name 2017-10-31 09:35:13 +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
f2c6837cd5 Add minor realeases doc link in header advice modal window - #951 2017-10-30 18:20:43 +01:00
Alejandro Gallardo Escobar
849eba10d4 [Console] Fixed a vulnerability into the 'fgraph.php' script 2017-10-30 18:03:09 +01:00
Daniel Maya
718a2dbaff Fixed in visual map 2017-10-30 17:57:47 +01:00
enriquecd
96b3ebc67a Change pandoradb treport_content_template and treport_content fields - #654 2017-10-30 17:27:37 +01:00
enriquecd
2da1e57dc1 Change pandora migrate and add mr8 changes - #654
Conflicts:
	pandora_console/extras/mr/8.sql
2017-10-30 17:26:35 +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
0897bbea28 Merge branch 'revert-65ae5ed2' into 'develop'
Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"

See merge request artica/pandorafms!993
2017-10-30 16:15:28 +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
Alejandro Gallardo Escobar
64ec82f9d6 [Console] Added a notice to warn the users about the php files uploaded with the files manager 2017-10-30 16:04: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
fermin831
2adf951121 Added free search values to data table 2017-10-30 15:45:31 +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
Alejandro Gallardo Escobar
c687e6a97b [Console] Fixed an XSS vulnerability into the 'ui_print_truncate_text' function 2017-10-27 13:25:27 +02:00
Arturo Gonzalez
74753918c3 Added function to update link to other map 2017-10-27 12:43:46 +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