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 |
Enrique Camargo
|
5c48dc9637
|
Update functions_container.php
|
2017-11-15 11:35:35 +01:00 |
enriquecd
|
27e7a51006
|
Fix graph container permissions and graph acl - #1576
|
2017-11-15 11:31:17 +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 |
fermin831
|
6e942fc0b9
|
Fixed first click on interface graphs
|
2017-11-15 11:02:42 +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 |
|
vgilc
|
4e09334718
|
Merge branch '1592-acceso-con-ldap-sin-establecer-pass-dev' into 'develop'
1592 acceso con ldap sin establecer pass dev
See merge request artica/pandorafms!1067
|
2017-11-15 09:27:39 +01:00 |
artica
|
e793e3fd4e
|
Auto-updated build strings.
|
2017-11-15 00:01:16 +01:00 |
|
fermin831
|
ae94be7779
|
Delete orig repo files
|
2017-11-14 19:37:00 +01:00 |
|
fbsanchez
|
0ea2475d60
|
minor fix pandora.flot.js
|
2017-11-14 19:02:13 +01:00 |
|
fermin831
|
78ef64ead2
|
Added resize functionality to flot graphs and fix overview in container graphs
|
2017-11-14 18:44:29 +01:00 |
|
Arturo Gonzalez
|
75cb2a668f
|
Added a lot of changes to save or not user password, only ldap
|
2017-11-14 16:20:26 +01:00 |
|
fbsanchez
|
722bc86381
|
Opensource plugins added to pandorafms
|
2017-11-14 15:17:27 +01:00 |
|
enriquecd
|
36c3f1fef6
|
Change group items url links in metaconsole - #1253
|
2017-11-14 13:51:33 +01:00 |
|
danielmaya
|
31d1f80a12
|
Fixed creating network components by snmpwalk
|
2017-11-14 13:31:39 +01:00 |
|
Arturo Gonzalez
|
8a1ba7130f
|
Added restriction to no pass token
|
2017-11-14 13:11:11 +01:00 |
|
Arturo Gonzalez
|
efa762626b
|
Changed text to new token
|
2017-11-14 12:47:23 +01:00 |
|
Arturo Gonzalez
|
861e112cec
|
Added token to pandora auth conf
|
2017-11-14 12:36:32 +01:00 |
|
fermin831
|
ff58a171e9
|
Fixed non interactive status graphs
|
2017-11-14 12:20:28 +01:00 |
|
enriquecd
|
089a0f94ea
|
Change texts in pandora - #1257
|
2017-11-14 11:37:49 +01:00 |
|
fbsanchez
|
958ef2bd38
|
Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479
Added max/min thresholds to hbar graphs
|
2017-11-14 10:49:15 +01:00 |
|
vgilc
|
6a71b9a359
|
Merge branch 'MR-8-dev' into 'develop'
Changed MR
See merge request artica/pandorafms!1061
|
2017-11-14 10:47:39 +01:00 |
|
danielmaya
|
e6d5adbf22
|
Changed MR
|
2017-11-14 10:38:50 +01:00 |
|
danielmaya
|
16eaf31c70
|
Added Autodisable mode in bulk operation
|
2017-11-14 10:21:55 +01:00 |