Commit Graph

16298 Commits

Author SHA1 Message Date
artica 92b71b17f4 Auto-updated build strings. 2017-11-19 00:01:09 +01:00
artica 1fb39ee151 Auto-updated build strings. 2017-11-18 00:01:11 +01:00
enriquecd 59b5d64486 Fix qr button image in public viusal console - #1621 2017-11-17 15:18:44 +01:00
fermin831 492b55a713 Added custom_data to events responeses macros 2017-11-17 15:17:08 +01:00
fermin831 7fb8406bc0 Added several macros to events responses 2017-11-17 14:50:23 +01:00
vgilc dbdd4c5800 Merge branch '1618-nuevos-campos-en-las-funciones-de-consolas-visuales-del-cli-dev' into 'develop'
Added new fields

See merge request artica/pandorafms!1092
2017-11-17 13:27:37 +01:00
Arturo Gonzalez 2bfd7bd231 Added new fields 2017-11-17 13:12:35 +01:00
Alejandro Gallardo Escobar b6470a0e98 [Pandora Console > Mobile] Added support to the user's default page 2017-11-17 12:29:52 +01:00
enriquecd 69f44aae13 Fix preload background image in visual console builder - #1617 2017-11-17 12:28:52 +01:00
enriquecd 1f2f8fdc0c Change time format in agent events 24h bar view and show the last start time - #1613 2017-11-17 11:44:38 +01:00
vgilc 215d3c005f Merge branch '1457-selectores-de-posicion-y-zoom-en-mapas-de-red-dev' into 'develop'
Added new map center

See merge request artica/pandorafms!1086
2017-11-17 10:07:48 +01:00
artica c624c213ea Auto-updated build strings. 2017-11-17 00:01:11 +01:00
Alejandro Gallardo Escobar c93ab00920 Recovered a reverted change 2017-11-16 16:47:19 +01:00
fermin831 49411f17e4 Fixed dark arrow in Interface information (SNMP) 2017-11-16 15:35:26 +01:00
fbsanchez 539deda4d6 Updates plugintools 2017-11-16 14:53:17 +01:00
vgilc 2f10d1e669 Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop'
Added safe_mode_module in metaconsole

See merge request artica/pandorafms!1085
2017-11-16 13:52:12 +01:00
Arturo Gonzalez fc9e78c301 Added new map center 2017-11-16 13:43:51 +01:00
danielmaya ede677f07c Added safe_mode_module in metaconsole 2017-11-16 13:38:59 +01:00
vgilc 9fdd95ad0d Merge branch '1539-pantalla-en-blanco-al-crear-mapas-de-red-radial-dinamic-dev' into 'develop'
1539 pantalla en blanco al crear mapas de red radial dinamic dev

See merge request artica/pandorafms!1083
2017-11-16 12:48:03 +01:00
enriquecd e902baaf9d Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574 2017-11-16 12:46:19 +01:00
enriquecd eedd6407b5 Apply Safe input to ui_get_url_refresh function return - #1574 2017-11-16 12:11:07 +01:00
Arturo Gonzalez f665fe9d07 Added empty maps to flow 2017-11-16 12:10:37 +01:00
Arturo Gonzalez 06d47e03db Added dinamic to new flow 2017-11-16 12:03:20 +01:00
enriquecd 213e8e6d18 Fix Run performance tests checkbox in web analysis module updater - #1470 2017-11-16 11:52:51 +01:00
vgilc 9f66f6c269 Merge branch 'varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional' into 'develop'
[artica/pandora_enterprise#1462] Added the DB changes needed by the dashboard items slideshow feature

See merge request artica/pandorafms!951
2017-11-16 11:03:01 +01:00
Alejandro Gallardo Escobar 2dd0dbbcc9 Merge branch 'develop' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional 2017-11-16 10:59:01 +01:00
Alejandro Gallardo Escobar ec48829c71 [DB] Added a missing coma 2017-11-16 10:55:01 +01:00
vgilc 35a412fd7c Merge branch '1505-acl-de-grupos-en-consola-visual-dev' into 'develop'
Added acl group to visual console status elements

See merge request artica/pandorafms!1081
2017-11-16 10:44:22 +01:00
Arturo Gonzalez 76576899f9 Added acl group to visual console status elements 2017-11-16 10:37:46 +01:00
Alejandro Gallardo Escobar 23a9e4f5ac Merge branch 'varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional' of https://brutus.artica.lan:8081/artica/pandorafms into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional
Conflicts resolved:
	pandora_console/extras/mr/9.sql
2017-11-16 10:10:37 +01:00
Alejandro Gallardo Escobar f2ad76636c Merge branch 'develop' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional
Conflicts resolved:
	pandora_console/extras/mr/9.sql
2017-11-16 09:49:11 +01:00
vgilc c46375e3e3 Merge branch '1313-cambio-en-mr-para-mostrar-elementos-al-frente-en-consolas-visuales-dev' into 'develop'
Added sql to MR

See merge request artica/pandorafms!1080
2017-11-16 08:53:32 +01:00
vgilc 14038ab302 Merge branch '1612-se-borran-elementos-al-mover-un-item-en-consola-visual-dev' into 'develop'
Fixed move function

See merge request artica/pandorafms!1079
2017-11-16 08:52:11 +01:00
Arturo Gonzalez b565500182 Added sql to MR 2017-11-16 08:32:39 +01:00
Arturo Gonzalez bcc6672cdf Merge branch 'develop' into 1612-se-borran-elementos-al-mover-un-item-en-consola-visual-dev
Conflicts:
	pandora_console/include/ajax/visual_console_builder.ajax.php
2017-11-16 08:09:05 +01:00
Arturo Gonzalez 1a4597874a Fixed move function 2017-11-16 08:06:52 +01:00
artica 104db9a875 Auto-updated build strings. 2017-11-16 00:01:12 +01:00
vgilc 921d3ac1aa Merge branch '1313-Poder-elegir-posición-en-consola-visual-4517-2' into 'develop'
Add show on top option to all visual console elements - #1313

See merge request artica/pandorafms!954
2017-11-15 17:43:03 +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
enriquecd 2a13f5fbf6 Order by name group select in manage agent view - #1596 2017-11-15 17:03:16 +01:00
vgilc 0618a2fd97 Merge branch 'requerimientos-sql-en-mr-dev' into 'develop'
Added visual console querys

See merge request artica/pandorafms!1077
2017-11-15 16:41:18 +01:00
vgilc 7ad2e7e227 Merge branch '1361-errores-de-version-anterior-en-mapas-de-red-dev' into 'develop'
Fixed errors at update

See merge request artica/pandorafms!1076
2017-11-15 16:16:25 +01:00
Arturo Gonzalez b5cff77a4f Added visual console querys 2017-11-15 16:10:43 +01:00
vgilc 30eb222118 Merge branch '1594-acceso-con-ldap-con-un-id-diferente-al-nombre-dev' into 'develop'
1594 acceso con ldap con un id diferente al nombre dev

See merge request artica/pandorafms!1074
2017-11-15 16:09:03 +01:00
Enrique Camargo 8d42f7fec1 Update pandoradb.sql 2017-11-15 16:08:38 +01:00
Arturo Gonzalez eb1789f08b Fixed errors at update 2017-11-15 16:06:28 +01:00
Enrique Camargo 02670bef03 Update visual_console_builder.editor.js 2017-11-15 16:05:34 +01:00
Enrique Camargo 4eae50f0f1 Update pandoradb_migrate_6.0_to_7.0.mysql.sql 2017-11-15 16:03:39 +01:00
vgilc d4fdb9d23c Merge branch '1316-new-empty-networkmaps-dev' into 'develop'
Added empty networkmap functions

See merge request artica/pandorafms!999
2017-11-15 15:53:38 +01:00
Arturo Gonzalez 0513a9e45a Merge branch 'develop' into 1316-new-empty-networkmaps-dev
Conflicts:
	pandora_console/include/functions_pandora_networkmap.php
2017-11-15 15:49:21 +01:00