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

441 Commits

Author SHA1 Message Date
José González ca0763f379 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' of https://brutus.artica.es:8081/artica/pandorafms into ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager 2022-06-29 10:20:31 +02:00
José González ef3dd0e741 Improved error message 2022-06-29 10:20:17 +02:00
José González 2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' 
# Conflicts:
#   pandora_console/index.php
 2022-06-28 14:39:37 +00:00
edu.corral a0f7c9e6a2 ent-9067 fixed notification system 2022-06-16 16:19:33 +02:00
edu.corral 4ee4590690 ent-9067 notifications fixed 2022-06-16 13:02:49 +02:00
José González e86d8b761d Refactor and improve code and added dialog for show error 2022-06-07 13:40:35 +02:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
fbsanchez 81b1454b2e minor fixes 2022-01-26 17:34:56 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Maya 182b99b4d9 Fixed CRSF in SAML 2022-01-11 13:10:47 +01:00
fbsanchez 7ebd6a5f74 php8 warnings cleanup 2022-01-11 12:08:41 +01:00
fbsanchez 54576be543 Warn if different MR on centralised environments 2021-12-16 17:46:45 +01:00
Daniel Maya c8a11543e8 #8111 Fixed X-Frame-Options 2021-10-18 16:36:10 +02:00
Calvo bd1e50dd48 Removed automatic assignation of PHP configuration variables 2021-09-15 12:20:40 +02:00
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