Commit Graph

16153 Commits

Author SHA1 Message Date
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
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
vgilc 66b13d2080 Merge branch '1602-error-al-obtener-el-id-del-mapa-de-red-dev' into 'develop'
Added changes to obtain id from external php

See merge request artica/pandorafms!1075
2017-11-15 15:38:17 +01:00
Arturo Gonzalez 088aa51996 Added changes to obtain id from external php 2017-11-15 15:30:55 +01:00
vgilc e91bcf8ad5 Merge branch '1597-pantalla-en-blanco-en-mapas-de-red-dev' into 'develop'
Fixed null values in js

See merge request artica/pandorafms!1073
2017-11-15 13:17:06 +01:00
Arturo Gonzalez 72acac8b57 Fixed null values in js 2017-11-15 12:19:41 +01:00
vgilc 2b4de0503e Merge branch '1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev' into 'develop'
Added groups acl in all visual console elements

See merge request artica/pandorafms!1044
2017-11-15 12:16:41 +01:00
vgilc a72f7b006e Merge branch 'develop' into '1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev'
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2017-11-15 12:04:11 +01:00
Arturo Gonzalez 59e1bdd225 Added email login attr to ldap users 2017-11-15 11:57:56 +01:00
Ramon Novoa 18fdba9dd6 Add a new enterprise server to parse syslog's output.
Ref pandora_enterprise#1526.
2017-11-15 11:29:50 +01:00
vgilc 1c84e4a77d Merge branch 'Updated-to-MR-9-dev' into 'develop'
Updated to MR 9

See merge request artica/pandorafms!1071
2017-11-15 11:25:09 +01:00
danielmaya 66547d28b0 Updated to MR 9 2017-11-15 11:15:12 +01:00
fbsanchez b7a9731dd3 Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479 2017-11-15 10:39:13 +01:00
Arturo Gonzalez 1a4502d150 Added new field to ldap config 2017-11-15 10:27:56 +01:00
vgilc 534140c795 Merge branch 'develop' into 'varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional'
# Conflicts:
#   pandora_console/extras/mr/9.sql
2017-11-15 10:24:04 +01:00
vgilc 93dd3c226f Merge branch '1476-Los-elementos-no-se-quedan-centrados-en-las-consolas-visuales-dev' into 'develop'
Fixed margin left and top in visual console

See merge request artica/pandorafms!1050
2017-11-15 10:18:02 +01:00
vgilc 3320bfb669 Merge branch '1491-Limite-de-caracteres-direcciones-de-email-en-cron-jobs-dev' into 'develop'
Changed column in tuser_task_scheduled

See merge request artica/pandorafms!958
2017-11-15 10:14:38 +01:00
vgilc e8076645d0 Merge branch 'develop' into '1491-Limite-de-caracteres-direcciones-de-email-en-cron-jobs-dev'
# Conflicts:
#   pandora_console/extras/mr/9.sql
2017-11-15 09:47:21 +01:00
vgilc faac4fa46f Merge branch '1240-fictional-node-link-to-other-map-dev' into 'develop'
Added function to update link to other map

See merge request artica/pandorafms!990
2017-11-15 09:45:03 +01:00
Arturo Gonzalez 776aca90d6 Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/pandoradb.sql
2017-11-15 09:43:33 +01:00
vgilc 8ebada6dbf Merge branch '1464-error-in-networkmap-with-weird-agent-names-dev' into 'develop'
Added safe input to agent name

See merge request artica/pandorafms!996
2017-11-15 09:43:29 +01:00
vgilc 11d696f209 Merge branch '910-new-real-view-based-on-tags-dev' into 'develop'
Added new section to menu

See merge request artica/pandorafms!967
2017-11-15 09:41:17 +01:00
vgilc d430375826 Merge branch '1413-CARREFOUR-Añadir-macros-en-los-label-de-las-consolas-visuales' into 'develop'
Add visual console macros - #1413

See merge request artica/pandorafms!1019
2017-11-15 09:40:38 +01:00
vgilc fbbd029812 Merge branch 'ent-1493-problemas-con-las-entidades-html-al-crear-eventos-con-el-pandora_server' into 'develop'
Added safe_output to server events

See merge request artica/pandorafms!970
2017-11-15 09:40:10 +01:00
vgilc 1789287673 Merge branch '1539-new-flow-in-networkmaps-when-creates-a-map-dev' into 'develop'
Changed flow

See merge request artica/pandorafms!1031
2017-11-15 09:39:31 +01:00
vgilc 7354ae534b Merge branch 'snmp-browser-safe-output' into 'develop'
Remove HTML entities from the SNMP community.

See merge request artica/pandorafms!1037
2017-11-15 09:36:20 +01:00
vgilc 55ac22055b Merge branch '1457-select-position-and-z-scale-in-networkmaps-dev' into 'develop'
Added the options in networkmap editor

See merge request artica/pandorafms!997
2017-11-15 09:35:19 +01:00
Arturo Gonzalez 4db2493cdd Merge branch 'develop' into 1464-error-in-networkmap-with-weird-agent-names-dev
Conflicts:
	pandora_console/include/functions_networkmap.php
2017-11-15 09:34:19 +01:00
vgilc b12d529578 Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop'
1276 cascade protection a nivel de módulo dev

See merge request artica/pandorafms!933
2017-11-15 09:31:05 +01:00
vgilc 4cafe69184 Merge branch 'optimizar-vista-de-eventos' into 'develop'
[Console > Events view] Removed the events graph to improve ~75% the render time

See merge request artica/pandorafms!1002
2017-11-15 09:30:38 +01:00
vgilc 90b99c491a Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop'
Added new system of calculate status if user set a parent weight

See merge request artica/pandorafms!1043
2017-11-15 09:28:10 +01:00