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 |
Arturo Gonzalez
|
fc9e78c301
|
Added new map center
|
2017-11-16 13:43:51 +01:00 |
|
Arturo Gonzalez
|
76576899f9
|
Added acl group to visual console status elements
|
2017-11-16 10:37:46 +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 |
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
|
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 |
|
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 |
|
Arturo Gonzalez
|
eb1789f08b
|
Fixed errors at update
|
2017-11-15 16:06:28 +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
|
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 |
|
Arturo Gonzalez
|
1a4502d150
|
Added new field to ldap config
|
2017-11-15 10:27:56 +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
|
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
|
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 |
|
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
|
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 |
|
Arturo Gonzalez
|
75cb2a668f
|
Added a lot of changes to save or not user password, only ldap
|
2017-11-14 16:20:26 +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 |
|
Arturo Gonzalez
|
274c551671
|
Added height to bars graph
|
2017-11-14 08:50:12 +01:00 |
|
artica
|
69aff8a420
|
Auto-updated build strings.
|
2017-11-14 00:01:10 +01:00 |
|
Arturo Gonzalez
|
833983e34e
|
Added visual changes to donut graph
|
2017-11-13 12:54:28 +01:00 |
|
vgilc
|
3493b9c15c
|
Revert "code backup"
This reverts commit b9851a3a71
|
2017-11-13 10:21:38 +01:00 |
|
vgilc
|
86a5599aad
|
Revert "Fixed traces"
This reverts commit 173efae22d
|
2017-11-13 10:20:58 +01:00 |
|
Arturo Gonzalez
|
49df1e448a
|
Added changes from donut graph
|
2017-11-13 09:59:00 +01:00 |
|
vgilc
|
67373e39ac
|
Merge branch '1378-grafica-donut-en-consola-visual-dev' into 'develop'
1378 grafica donut en consola visual dev
See merge request artica/pandorafms!1051
|
2017-11-13 09:39:43 +01:00 |
|
Arturo Gonzalez
|
110945bccf
|
Added the last change to load string modules
|
2017-11-13 09:35:24 +01:00 |
|
artica
|
301795af83
|
Auto-updated build strings.
|
2017-11-13 00:01:08 +01:00 |
|
artica
|
2e6e46c10c
|
Auto-updated build strings.
|
2017-11-12 00:01:08 +01:00 |
|
artica
|
b8e6d7927e
|
Auto-updated build strings.
|
2017-11-11 00:01:10 +01:00 |
|
Arturo Gonzalez
|
eb39d25c4b
|
Added field to get string modules
|
2017-11-10 15:03:52 +01:00 |
|
Arturo Gonzalez
|
de65e7cf27
|
Fixed element name and leyend separator
|
2017-11-10 14:43:31 +01:00 |
|
vgilc
|
68a10343fb
|
Revert "Merge branch…"
This reverts merge request !1025
|
2017-11-10 12:24:33 +01:00 |
|
vgilc
|
555dc3744d
|
Revert "Merge branch…"
This reverts merge request !1045
|
2017-11-10 12:24:01 +01:00 |
|
vgilc
|
29971f4d38
|
Merge branch '1512-ldap-atributo-de-login-dev' into 'develop'
Added changes to fix ldap login
See merge request artica/pandorafms!1047
|
2017-11-10 10:13:31 +01:00 |
|
vgilc
|
a38f47b4a9
|
Merge branch '1522-Fallos_a_la_hora_de_representar_las_gráficas_con_rangos_en_desconocido_v714_2' into 'develop'
fixed errors in TIP
See merge request artica/pandorafms!1045
|
2017-11-10 10:12:51 +01:00 |
|
Arturo Gonzalez
|
fe4a93f646
|
Added changes to fix ldap login
|
2017-11-10 09:33:12 +01:00 |
|
artica
|
680d23038e
|
Auto-updated build strings.
|
2017-11-10 00:01:09 +01:00 |
|
artica
|
f512bea610
|
Auto-updated build strings.
|
2017-11-09 00:01:13 +01:00 |
daniel
|
e6e925cbf6
|
fixed errors in TIP
|
2017-11-08 18:57:37 +01:00 |
artica
|
ef8b69841c
|
Updated version and build strings.
|
2017-11-08 15:30:28 +01:00 |