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
|
848f60229a
|
updates on 2FA all users feature
|
2020-10-06 17:02:58 +02:00 |
artica
|
b3da2803a4
|
Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
|
2019-01-30 16:18:44 +01:00 |
Daniel Maya
|
44231b6515
|
Fixed bug in qr
|
2017-03-16 16:14:11 +01:00 |
Alejandro Gallardo Escobar
|
30f24ff583
|
Modifications on the ajax calls to gain compatibility
|
2014-12-11 17:00:55 +01:00 |
|
Alejandro Gallardo Escobar
|
3c1dbbdc73
|
File with double auth utilities to be accessed by ajax
|
2014-12-11 16:10:15 +01:00 |