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 |
|
alejandro-campos
|
ab61cf1fc5
|
changed console and audit log locations
|
2020-06-08 10:48:48 +02:00 |
|
Daniel Rodriguez
|
3546bbfc73
|
Merge branch 'ent-5725-Vulnerabilidad' into 'develop'
fix vulnerability in password recovery
See merge request artica/pandorafms!3175
|
2020-05-20 16:41:42 +02:00 |
Daniel Barbero Martin
|
78e5438e54
|
Fixed error time refresh initial page CV
|
2020-05-20 12:30:19 +02:00 |
Tatiana Llorente
|
1f16abd4bd
|
Ent 5701 quitar feature de chat
|
2020-05-08 15:39:24 +02:00 |
|
alejandro-campos
|
9a66359b3c
|
fix vulnerability in password recovery
|
2020-04-20 18:00:20 +02:00 |
|
daniel
|
709201bf23
|
dashboards
|
2020-03-26 12:29:38 +01:00 |
|
alejandro-campos
|
c44b595c8a
|
fixed vulnerability
|
2020-01-22 17:20:13 +01:00 |
|
alejandro-campos
|
8c046ecdc6
|
fix bug when accessing certain views as home screen
|
2019-11-13 11:24:25 +01:00 |
|
Tatiana Llorente
|
a15350b7cb
|
deleted calls to a function that does not exist logoff_db() - #4639
|
2019-09-26 12:36:08 +02:00 |
|
marcos.alconada
|
9310fd8dc1
|
add deleted condition
|
2019-08-13 13:58:44 +02:00 |
|
fbsanchez
|
5cfad4587d
|
Revert "Update index.php metaconsole redirection"
This reverts commit 56ef03c27d
|
2019-07-12 12:17:26 +02:00 |
|
fbsanchez
|
56ef03c27d
|
Update index.php metaconsole redirection
|
2019-07-12 11:36:37 +02:00 |
|
fbsanchez
|
c386a29b80
|
Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url
|
2019-07-12 09:38:28 +02:00 |
Alejandro Fraguas
|
a752cbd2fe
|
Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml-3' into 'develop'
changed condition for saml no access
See merge request artica/pandorafms!2593
|
2019-07-10 16:32:41 +02:00 |
|
Daniel Rodriguez
|
96fbca35a4
|
Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop'
Created black theme - #4194
See merge request artica/pandorafms!2564
|
2019-07-10 11:47:21 +02:00 |
|
marcos.alconada
|
5b6e7d13cd
|
changed condition for saml no access
|
2019-07-09 18:13:46 +02:00 |
|
Alejandro Fraguas
|
26c606b0d5
|
Merge branch 'ent-3090-Personalizacion-saml-2' into 'develop'
Added more parameters to SAML configuration
See merge request artica/pandorafms!2506
|
2019-07-09 13:18:12 +02:00 |
|
marcos.alconada
|
09e5feef05
|
add message no acces saml without saml.php file
|
2019-07-08 17:02:28 +02:00 |
|
Alejandro Fraguas
|
8242bf34b8
|
Revert "Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop'"
This reverts merge request !2562
|
2019-07-05 14:55:22 +02:00 |
|
fbsanchez
|
84cdbefebd
|
cleanup and fix in location reload
|
2019-07-02 16:22:23 +02:00 |