Alejandro Campos
|
a58bc3bf08
|
Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola'
# Conflicts:
# pandora_console/general/register.php
|
2022-10-27 09:47:49 +00:00 |
|
alejandro.campos@artica.es
|
76f7761373
|
fixes in double auth
|
2022-09-22 08:59:39 +02:00 |
edu.corral
|
133e4b87a5
|
ent #9422 2fa window close button
|
2022-09-20 10:11:27 +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 |
|
fbsanchez
|
c3232b0f2a
|
Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
|
2021-03-24 09:55:31 +01:00 |
Daniel Rodriguez
|
41ef1d41ff
|
Merge branch 'ent-7031-Problemas-2FA' into 'develop'
Fixed forced 2FA
Closes pandora_enterprise#7031
See merge request artica/pandorafms!3855
|
2021-03-12 09:13:59 +00:00 |
Marcos Alconada
|
d8a628b1c4
|
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
|
2021-03-11 14:40:23 +00:00 |
Jose Gonzalez
|
ba997dd13f
|
Fixed
|
2021-03-11 14:49:39 +01:00 |
|
Jose Gonzalez
|
64ae964191
|
Fixed forced 2FA
|
2021-02-19 14:30:09 +01:00 |
|
fbsanchez
|
0be3e0ab90
|
Event widget and some notices fixed
|
2021-02-10 15:00:23 +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 |
|
Jose Gonzalez
|
649442f794
|
Updated copyrights
|
2020-11-27 13:52:35 +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 |
|
marcos
|
96387a874f
|
remove console log
|
2020-11-18 10:38:49 +01:00 |
Daniel Maya
|
ea0e229951
|
Fixed license expired and license trial
|
2020-11-10 12:10:25 +01:00 |
|
marcos
|
848f60229a
|
updates on 2FA all users feature
|
2020-10-06 17:02:58 +02:00 |
|
fbsanchez
|
72b1fb2b16
|
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
Conflicts:
pandora_console/include/javascript/pandora.js
modified: pandora_console/general/register.php
modified: pandora_console/godmode/agentes/configurar_agente.php
modified: pandora_console/godmode/agentes/module_manager_editor.php
new file: pandora_console/include/ajax/welcome_window.php
new file: pandora_console/include/class/WelcomeWindow.class.php
modified: pandora_console/include/constants.php
modified: pandora_console/include/functions_config.php
modified: pandora_console/include/javascript/pandora.js
new file: pandora_console/include/styles/new_installation_welcome_window.css
|
2019-10-30 16:56:44 +01:00 |
|
marcos
|
57bfc364ae
|
add modal confirmation window
|
2019-10-28 18:57:10 +01:00 |
|
marcos
|
e725a0185b
|
cambios semi finales
|
2019-10-24 16:56:13 +02:00 |
|
marcos
|
ee97ed8a5e
|
segunda ronda
|
2019-10-21 18:36:02 +02:00 |
|
marcos
|
353246f9f6
|
first changed to welcome window
|
2019-10-18 10:30:19 +02:00 |
Daniel Barbero Martin
|
bd070b706b
|
fixed minor error
|
2019-07-11 12:45:52 +02:00 |
|
fbsanchez
|
30ce8f65e4
|
UM register, UM newsletter flow improved
|
2019-05-29 10:01:21 +02:00 |
|
fbsanchez
|
8f9c9fd156
|
removed trace from user_edit
|
2019-05-23 18:46:43 +02:00 |
|
fbsanchez
|
034480bf88
|
minor fixes
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
|
2019-05-16 12:28:46 +02:00 |
|
fbsanchez
|
e7dbb55392
|
Minor fixes
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
|
2019-05-16 12:00:49 +02:00 |
|
fbsanchez
|
d871b599ef
|
General fixes and UM comm updates
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
|
2019-05-14 23:49:01 +02:00 |
|
fbsanchez
|
53e9113b7e
|
UM notifications MR update
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
|
2019-05-14 17:15:28 +02:00 |
|
fbsanchez
|
ced1b32915
|
Configuration, Registration and newsletter wizards
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
|
2019-05-13 17:55:41 +02:00 |