enriquecd
|
69f44aae13
|
Fix preload background image in visual console builder - #1617
|
2017-11-17 12:28:52 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|