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

638 Commits

Author SHA1 Message Date
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
Arturo Gonzalez ba312476e3 Changed help section in cascade protection help button and fixed help language. 2017-04-27 15:49:23 +02:00
vgilc 4b5da69e31 Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop' 
Change sec url string in message and vconsole section - #688 - 2

See merge request !378
 2017-04-25 16:21:00 +02:00
vgilc 8802f1cdca Merge branch '605-ayuda-descolocada-modulos-webserver' into 'develop' 
Fixed text overflow in help window

See merge request !332
 2017-04-25 16:16:29 +02:00
vgilc dfd0bb38e8 Merge branch '672-change_forums_url_in_wellcome_window' into 'develop' 
Changed forums url in wellcome window

See merge request !343
 2017-04-25 16:05:34 +02:00
Arturo Gonzalez d93fa1bb3f Added new option to enable and disable reset pass 2017-04-20 15:31:39 +02:00
Arturo Gonzalez 63254ac7e4 Move mail setup section to enterprise setup 2017-04-20 12:54:15 +02:00
Arturo Gonzalez bfa3b43ee7 Added changes to reset password system 2017-04-20 12:36:33 +02:00
Arturo Gonzalez e26dfcd466 Move code to enterprise section 2017-04-20 11:18:43 +02:00
Arturo Gonzalez 727bd095f5 Added function to reset password in node 2017-04-20 10:59:32 +02:00
Arturo Gonzalez 48f7fa50dd Added error control and email handler 2017-04-19 16:04:24 +02:00
enriquecd b21b3cabf6 Not show scroll bar in config permission error dialog in index - #728 2017-04-19 15:10:55 +02:00
Arturo Gonzalez bd30625532 Added return to login button 2017-04-19 15:10:51 +02:00
Arturo Gonzalez 7011eee871 Added a new page to reset password, for now without code, only visual page and error control 2017-04-19 13:26:20 +02:00
Daniel Maya 8f1d93c008 Support link changed in pandora enterprise 2017-04-18 11:46:57 +02:00
enriquecd 1348256d1a Change sec url string in message section - #684 /4 2017-04-17 19:30:44 +02:00
vgilc 553e58deba Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales' into 'develop' 
Filter custom graph size in  visual console editor, autoset size - #99

See merge request !287
 2017-04-07 12:51:37 +02:00
Arturo Gonzalez 790eb164da Changed forums url in wellcome window 2017-04-04 17:09:26 +02:00
Daniel Maya a4d5de69b4 Fixed text overflow in help window 2017-03-31 13:03:54 +02:00
daniel 07e5274d0d fixed error in login page errors and change icon pdf report 2017-03-22 15:26:54 +01:00
enriquecd 62541482ab Filter custom graph size in visual console editor, autoset size - #99 2017-03-22 10:10:56 +01:00
daniel 8365afbe76 fixed errors in helps pandora and visual styles 2017-03-21 11:44:46 +01:00
daniel 3ff7d28240 fixed minor error in icon open source 2017-03-17 09:34:31 +01:00
daniel 1325601082 fixed errors 2017-03-16 18:41:53 +01:00
daniel e252135979 merge develop 2017-03-15 17:09:40 +01:00
daniel aec0d91109 login page new 2017-03-15 15:23:28 +01:00
daniel a87839bd07 login page 2017-03-15 10:12:18 +01:00
Enrique Camargo 294477a982 Merge branch '517-footer-metaconsola-vs-footer-consola-open' into 'develop' 
Print metaconsole footer in buttom and change marks order - open - #517

See merge request !244
 2017-03-13 17:46:42 +01:00
enriquecd 0094cfa9bf Center alert modal window when is opened - #93 2017-03-13 13:25:16 +01:00
enriquecd 6b625197ec Print metaconsole footer in buttom and change marks order - open - #517 2017-03-10 17:42:55 +01:00
m-lopez-f 8de4984faf Fixed dialog of system warning alerts. Gitlab: #506 2017-03-09 15:40:59 +01:00
m-lopez-f 7f0359283d Fixed problems with ACL permmisions. Gitlab: #451 2017-03-06 12:54:48 +01:00
enriquecd ca97686b25 Change data function to show in footer windows compatible - #80 2017-02-27 12:00:28 +01:00
m-lopez-f 45316cdd0f Fixed visual in welcome view. Gitlab: #359 2017-02-23 12:26:48 +01:00
Arturo Gonzalez 5db7f93b53 Removed header bar in wellcome menu. Ticket #335 2017-02-21 16:54:53 +01:00
m-lopez-f 2abff60380 Fixed code 2017-02-21 13:30:53 +01:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez b42e4a8277 Rewrite lost code. 2017-02-13 15:29:45 +01:00
Arturo Gonzalez 5b7f4a5139 Merge branch 'develop' into feature/rolling_release 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/functions.php
	pandora_console/index.php
	pandora_console/pandoradb_data.sql
 2017-02-13 14:19:25 +01:00
Arturo Gonzalez 4c63756f51 Fixed classic menu mode. Ticket #250 2017-02-13 13:50:28 +01:00
Arturo Gonzalez cafda2a116 Added new option to see the menu bar in classic mode. Ticket #234 2017-02-07 12:58:29 +01:00
daniel 543fd0c7ea delete shortcut bar 2017-02-03 12:23:58 +01:00
enriquecd d066c5f88f Erase integria incidents integration with integria tickets - #29 2017-01-25 12:40:42 +01:00
enriquecd 6f0a1dfb00 Mensaje no access solo aparece con alertas [INTEGRIA: #4368] 2017-01-20 11:00:32 +01:00
daniel 99aa41b32a fixed reports events 2017-01-13 14:09:56 +01:00
m-lopez-f 9b02510599 Fixed problems with wizard login when cancel wizard. Ticket: #4246 
(cherry picked from commit f11e78cc3a)
 2017-01-09 09:10:13 +01:00