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

426 Commits

Author SHA1 Message Date
José González 66ebe2ebf4 Merge branch 'develop' into 'ent-7531-menu-lateral-no-se-oculta-correctamente' 
# Conflicts:
#   pandora_console/index.php
 2021-08-16 08:12:40 +00:00
Daniel Rodriguez 3785258a83 Merge branch 'ent-7832-usuarios-creados-en-meta-no-pueden-logearse-en-el-nodo' into 'develop' 
create error login dialog when uncheck enable node access option

See merge request artica/pandorafms!4320
 2021-08-03 06:48:10 +00:00
marcos e8693ceb43 create error login dialog when uncheck enable node access option 2021-07-22 09:34:58 +02:00
fbsanchez 0cec3afba0 Deactivated nodes if not unified 2021-07-19 13:47:43 +02:00
fbsanchez 017e12c751 Use metaconsole_access_node to allow or deny access to node for a user created and synchronized from MC 2021-06-25 15:41:34 +02:00
Daniel Rodriguez 190932f12d Merge branch 'ent-7390-CSRF-login-recovery-pass' into 'develop' 
Added CSRF validation

Closes pandora_enterprise#7390

See merge request artica/pandorafms!4148
 2021-06-21 14:01:59 +00:00
Daniel Rodriguez 314639dc30 Merge branch 'ent-7594-custom-profile-acl-enterprise' into 'develop' 
Fix dashboards ACLs

Closes pandora_enterprise#7594

See merge request artica/pandorafms!4154
 2021-06-21 13:43:13 +00:00
José González 00d4f0c57d Clean code and fix issue with lateral main menu 2021-06-16 15:29:28 +02:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
José González 6db03d943d Merge branch 'develop' into 'ent-7594-custom-profile-acl-enterprise' 
# Conflicts:
#   pandora_console/index.php
 2021-06-11 13:57:10 +00:00
fbsanchez a98a72354b Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted 2021-06-01 10:04:53 +02:00
marcos 94cd396072 changed button position 2021-05-27 15:49:20 +02:00
José González a495b96bd6 Fix dashboards ACLs 2021-05-27 12:16:17 +02:00
José González 52bad0e53c Added CSRF validation 2021-05-21 13:59:54 +02:00
Daniel Rodriguez 128f67b058 Merge branch 'ent-7139-clickjacking' into 'develop' 
Avoiding clickjacking

Closes pandora_enterprise#7139

See merge request artica/pandorafms!4013
 2021-05-11 09:45:08 +00:00
Daniel Rodriguez bcb0832309 Merge branch 'ent-7070-archivo-raro-0-en-pandoa_console' into 'develop' 
Avoid file 0 with log in pandora_console

See merge request artica/pandorafms!3863
 2021-04-09 11:53:26 +00:00
Jose Gonzalez 2ef57919a1 Avoiding clickjacking 2021-04-08 11:28:01 +02:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez e9d666d54c Avoid file 0 with log in pandora_console 2021-02-23 17:29:08 +01:00
fbsanchez 40e97f6cf6 Removed warnings 2021-02-09 10:25:08 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
Daniel Rodriguez 30915ea8f8 Merge branch 'ent-6501-home-screen-link-externo' into 'develop' 
Added external link feature

See merge request artica/pandorafms!3665
 2020-12-22 16:30:44 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez 71ccdb945d Added external link feature 2020-11-27 12:54:28 +01:00
marcos 13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00
Daniel Rodriguez b0ccfc89b1 Merge branch 'ent-6472-graficas-con-phantomjs-y-saml' into 'develop' 
SAML with pandora sessions

See merge request artica/pandorafms!3533
 2020-11-04 18:42:42 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
alejandro-campos 806377a884 fixed authentication bypass 2020-10-27 10:28:42 +01:00
fbsanchez 8b4fd551d1 minor fixes 2020-10-19 19:17:07 +02:00
fbsanchez d7f3810bba improved message saml 2020-10-19 19:00:00 +02:00
fbsanchez 3562192d69 minor fix 2020-10-19 18:51:18 +02:00
fbsanchez 92211c71b7 trick to avoid simplesamlphp logout bug while using custom session handlers 2020-10-19 18:45:40 +02:00
fbsanchez 987e77271e another try 2020-10-19 17:42:50 +02:00
fbsanchez f6020e8791 Removed unwanted traces 2020-10-19 10:59:46 +02:00
fbsanchez 7b73a36eb0 rc1 2020-10-16 16:41:42 +02:00
fbsanchez 30c7da054f fixes SAML 2020-10-16 15:24:21 +02:00
fbsanchez ca9b167741 SAML with pandora sessions 2020-10-16 14:00:38 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
Luis 0d27296b79 Fixed acl enterprise acl gextensions 2020-08-24 10:16:25 +02:00
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop' 
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
 2020-07-14 18:10:11 +02:00
Luis Calvo d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
alejandro-campos cec16d01b8 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-23 09:56:21 +02:00
Daniel Rodriguez cd261fa629 Merge branch 'ent-5709-Fallo-refresh-consola-visual' into 'develop' 
Fixed error time refresh initial page CV

See merge request artica/pandorafms!3223
 2020-06-22 13:53:38 +02:00
Luis Calvo d346c76322 Connection error dialog working 2020-06-19 23:03:37 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
marcos cc16d80a00 fixed error with dashboard home page 2020-06-11 17:49:28 +02:00