tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,049 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

683 Commits

Author SHA1 Message Date
daniel 1b78c1a78d fixed error log js and warning php visual style 2018-11-23 09:21:22 +01:00
daniel a3aa84bf92 fixed errors in session with send mail alerts graph API 2018-11-21 15:16:52 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
daniel d12a25866d fixed translate php7 warning 2018-11-15 15:33:46 +01:00
daniel b78c52caa4 fixed error Acess for Access 2018-11-15 13:22:54 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
WUX-UX integration

See merge request artica/pandorafms!1890
 2018-10-26 14:42:23 +02:00
vgilc 7a4b7d4289 Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop' 
2221 actualizacion de pandora a version 7 de php

See merge request artica/pandorafms!1875
 2018-10-26 14:41:15 +02:00
Junichi Satoh 91ed413b0a Fixed language selection problem at initial setup. 2018-10-26 17:34:49 +09:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
vgilc cab90a4fd3 Merge branch '2783-Falta-de-información-de-Module-Management-en-Last-Activity' into 'develop' 
Added module name and agent name in actions enable and disable module - #2783

See merge request artica/pandorafms!1783
 2018-10-25 11:44:42 +02:00
vgilc d0e9875795 Merge branch '2846-Descuadre-en-Windows' into 'develop' 
Added class data to the table for last activity - #2846

See merge request artica/pandorafms!1818
 2018-10-25 11:23:45 +02:00
daniel d84427b014 fixed errors php 2018-10-15 10:32:24 +02:00
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
alejandro-campos 94493e18ce included file required by update_manager_get_current_package function in footer file 2018-10-11 12:18:19 +02:00
tatiana.llorente@artica.es 9a08bd9ea0 Changed date in footer - #2849 2018-10-09 17:26:24 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
tatiana.llorente@artica.es c4c0e89cbe Added class data to the table for last activity - #2846 2018-10-01 13:24:08 +02:00
danielmaya 329622d53c Added head search in acl enterprise 2018-09-24 10:25:10 +02:00
tatiana.llorente@artica.es 51af767549 Limited number of characters shown in the table - #2783 2018-09-21 09:21:21 +02:00
vgilc 822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop' 
2042 ha cluster dev

See merge request artica/pandorafms!1524
 2018-06-13 16:14:29 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
manuel.montes 4281824555 Fixed jquery in pandora_console/general/main_menu.php 2018-06-05 16:23:30 +02:00
vgilc 2be81f76b9 Merge branch '2196-Menús-fijados-y-Classic-menu-hace-cosas-raras' into 'develop' 
Fixed menu with top property

See merge request artica/pandorafms!1501
 2018-06-05 09:42:01 +02:00
manuel.montes 23b6dd5bdb Fixed menu with top property 2018-05-28 12:58:23 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
danielmaya ad7e8229ed Added check_login 2018-05-24 09:02:06 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
Alejandro Gallardo Escobar dcdce9c8fc Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-05-22 17:58:47 +02:00
fermin831 2e8e3c27b6 [Rebranding] Modified tinylogo by custom_logo in node 2018-05-22 13:40:23 +02:00
danielmaya d48aeb05bb Update HA. change of icon and text 2018-05-22 08:39:38 +02:00
Fermin 8f2302630c [Rebranding] Docs and Support login icons are configurables 2018-05-21 14:29:11 +02:00
Alejandro Gallardo Escobar cada865042 Fixed XSS vulnerability 2018-05-18 11:00:41 +02:00
fermin831 cb11f0333e [Rebranding] Open general/firts_task/incidents.php 2018-05-14 16:06:32 +02:00
Alejandro Gallardo Escobar 6bc8cee237 Added the user defined timezone to some dates 2018-05-10 11:43:03 +02:00
fermin831 33abfa7f9d [Rebranding] Other general source files. Removed unreached code oon general/logon_ok.php 2018-05-09 18:50:45 +02:00
fermin831 b9504038fa [Rebranding] First tasks 2018-05-09 15:16:39 +02:00
fermin831 a3ebd00876 [Rebranding] Node setup and footer 2018-05-09 13:12:03 +02:00
danielmaya 475d243224 Added master creation in ha_cluster 2018-05-07 13:21:06 +02:00
enriquecd 4378dc48ad Fix cluster ACL - #1878 2018-03-28 18:37:59 +02:00
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
enriquecd a2f8919c75 Show custom header logo when logout - #870 2017-05-17 11:18:50 +02:00
Arturo Gonzalez 0346b49f1e Fixed jquery request 2017-05-16 10:42:41 +02:00
enriquecd 12dde46552 Change load order of homeurl when load config, fix mysql login error dialog - #825 2017-05-11 15:44:18 +02:00
vgilc 31bc5e08a1 Merge branch '787-help-in-cascade-protection-dev' into 'develop' 
Changed help section in cascade protection help button and fixed help language.

See merge request !421
 2017-05-11 12:12:08 +02:00
enriquecd 746eab7666 Show package version rather build version in footer (ext. fix update manager css) - #813 2017-05-10 13:18:45 +02:00
daniel ade8931149 fixed error icon comunity edition 2017-05-03 17:29:27 +02:00