Commit Graph

589 Commits

Author SHA1 Message Date
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
vgilc fe4b1da1e3 Merge branch '1709-REDIRIS-Permitir-cambiar-links-en-pantalla-de-login' into 'develop'
Make help and support links in login page customizables - #1709

See merge request artica/pandorafms!1201
2018-02-06 11:57:23 +01:00
enriquecd d59289db62 Change builder style - #1748 2018-02-02 14:56:33 +01:00
enriquecd 768e6e605f Fix bugs - #1748 2018-02-02 13:05:36 +01:00
enriquecd 88fddf3032 Add permissions - #1748 2018-02-01 17:49:37 +01:00
enriquecd e1669ded9d Change branch to enterprise - #1748 2018-02-01 11:35:23 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola
Conflicts:
	pandora_console/include/functions_users.php
2018-01-30 17:56:30 +01:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00
enriquecd 2b446a681d Popup when click modules in cluster view, new images, filter modules - #1748 2018-01-30 17:38:29 +01:00
vgilc c9074ecbd3 Merge branch '1745-Mejora-visual-en-el-pop-up-de-ayuda-dev' into 'develop'
Fixed link to official documentation

See merge request artica/pandorafms!1224
2018-01-29 13:36:39 +01:00
vgilc 618498dc65 Merge branch '1672-Letrero-de-página-de-inicio-de-sesión-de-la-consola-no-permite-meter-letras-en-minúsuclas' into 'develop'
Show real case in login page titles - #1672

See merge request artica/pandorafms!1166
2018-01-29 13:30:45 +01:00
enriquecd 4358f37e07 Delete clusters, agents and modules - #1748 2018-01-24 16:15:53 +01:00
enriquecd 099cd3bbe8 Wizard first and second step, clusters functions - #1478 2018-01-17 18:56:44 +01:00
enriquecd cce92cc961 Clusters creator main page, fix pandoradb - #1748 2018-01-16 19:24:58 +01:00
enriquecd 74b4f2a5f3 Add optional token animation and vissual effects in visual styles configuration view - #1724 2018-01-08 13:01:29 +01:00
danielmaya e58b99d74e Fixed link to official documentation 2018-01-04 17:32:47 +01:00
enriquecd a027defccd Make help and support links in login page customizables - #1709 2017-12-20 19:14:05 +01:00
enriquecd a5fe4d58a5 Show real case in login page titles - #1672 2017-12-05 19:39:26 +01:00
enriquecd 092ec0acf6 Disable autorefresh on new dashboard view - #1527 2017-11-07 11:19:31 +01:00
enriquecd f2c6837cd5 Add minor realeases doc link in header advice modal window - #951 2017-10-30 18:20:43 +01:00
Daniel Maya f6e012e0fa Added time autorefresh 2017-10-23 13:17:06 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
daniel c29d8a4fdb Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
2017-08-23 09:35:17 +02:00
Arturo Gonzalez 7b208f6209 Added code to separate networkmap manage and networkmap view 2017-08-22 09:24:16 +02:00
vgilc e0746e65e8 Merge branch '138-login-items-separate-width-dev' into 'develop'
Added separation width to login fields

See merge request !632
2017-08-18 13:18:40 +02:00
vgilc 7dd0e989fa Merge branch '412-consola-visual-Módulo-imagen' into 'develop'
Add data image option to simple data visual console element - #412

See merge request !584
2017-07-17 17:03:04 +02:00
vgilc 0bd74d92f0 Merge branch '1040-autorefresh-in-user-section-is-separated-by-user-dev' into 'develop'
Added refresh by user

See merge request !607
2017-07-17 10:54:06 +02:00
Enrique Camargo 1e7fbc443e Merge branch 'develop' into '412-consola-visual-Módulo-imagen'
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
2017-07-17 10:39:20 +02:00
vgilc fd955112fb Merge branch '994-No-se-muestra-correctamente-la-versión-en-el-footer-dev' into 'develop'
Fixed version in footer

See merge request !570
2017-07-13 11:47:57 +02:00
vgilc 97e897c0d4 Merge branch '963-Ventana-Welcome-to-Pandora-FMS-siempre-aparece' into 'develop'
Change jquery ajax call method in welcome window dont show get to post - #963

See merge request !551
2017-07-13 11:30:47 +02:00
daniel b4ca9c958d fixed error XSS in login_page 2017-06-30 13:26:05 +02:00
Arturo Gonzalez b519cd46d3 Added separation width to login fields 2017-06-29 14:51:43 +02:00
daniel bea2a38969 fixed error xss in login page 2017-06-29 13:07:35 +02:00
daniel 39d090db1e fixed minor error 2017-06-28 16:39:54 +02:00
Arturo Gonzalez e86c87d23b Added refresh by user 2017-06-21 13:50:05 +02:00
enriquecd 44fb3f248d Show enterprise icon in login header when is not defined in config - #976 2017-06-15 11:01:39 +02:00
enriquecd 2ede057298 Add data image option to simple data visual console element - #412 2017-06-13 16:49:25 +02:00
Daniel Maya a27a9e8cb3 Fixed version in footer 2017-06-08 10:22:59 +02:00
Arturo Gonzalez d101d9abdc Changed bad ajax call 2017-06-07 11:28:09 +02:00
enriquecd 85b98a10fa Change jquery ajax call method in welcome window dont show get to post - #963 2017-06-02 12:51:22 +02:00
vgilc 6d2607e178 Merge branch '912-login-page-background-dev' into 'develop'
Added correct path to images in login page background

See merge request !506
2017-05-31 17:51:34 +02:00
vgilc f64b4852a6 Merge branch '870-No-se-muestra-Custom-logo-header-en-pantalla-de-logout' into 'develop'
Show custom header logo when logout - #870

See merge request !477
2017-05-31 17:14:10 +02:00
Arturo Gonzalez fe7b4257f0 Changed text in header when mr file is available 2017-05-30 13:59:47 +02:00
Arturo Gonzalez a1063e9b50 Translations changed 2017-05-29 12:35:31 +02:00
Arturo Gonzalez 3155b81eb5 Added correct path to images in login page background 2017-05-24 17:09:44 +02:00
artu30 faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
2017-05-23 09:50:22 +02:00
Enrique Camargo 2ccd799cbd Merge branch 'develop' into '825-La-pantalla-de-login-con-mysql-parado/no-configurado-no-se-ve-correctamente'
# Conflicts:
#   pandora_console/general/login_page.php
2017-05-18 15:23:20 +02:00
vgilc 19a76701a3 Merge branch '813-Footer-no-muestra-la-versión-correctamente' into 'develop'
Show package version rather build version in footer (ext. fix update manager css) - #813

See merge request !454
2017-05-17 17:51:25 +02:00
vgilc ab51561ecf Merge branch 'Barra-de-scroll-en-ventana-de-error-de-permisos-de-config.php' into 'develop'
Not show scroll bar in config permission error dialog in index - #728

See merge request !385
2017-05-17 17:40:29 +02:00
vgilc 888d66ca4c Merge branch '732-Cambio-enlace-a-soporte-en-el-login-de-la-consola-(version-enterprise)-dev' into 'develop'
Support link changed in pandora enterprise

See merge request !381
2017-05-17 17:28:22 +02:00