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

867 Commits

Author SHA1 Message Date
Daniel Rodriguez 3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop' 
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
 2021-05-27 16:21:48 +00:00
Marcos Alconada 87dd11f99c fixed visual error with update manager online open 2021-05-27 16:17:47 +00:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' 
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
 2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
marcos a47f99a455 fixed visual error HA 2021-04-26 08:36:02 +02:00
Daniel Rodriguez e6ad284b80 Merge branch 'ent-6999-No-aparece-la-cabecera-en-la-vista-de-clusterssi-no-hay-cluster-creado' into 'develop' 
add deafult header

See merge request artica/pandorafms!3829
 2021-04-06 17:32:31 +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 e7d509cc74 Merge remote-tracking branch 'origin' into ent-7031-Problemas-2FA 2021-03-11 13:18:30 +01:00
Daniel Barbero Martin 219ca1914d cambio de dominio 2021-03-09 16:02:05 +01:00
Jose Gonzalez 64ae964191 Fixed forced 2FA 2021-02-19 14:30:09 +01:00
marcos b44d998034 add deafult header 2021-02-10 16:27:29 +01:00
fbsanchez 0be3e0ab90 Event widget and some notices fixed 2021-02-10 15:00:23 +01:00
Daniel Rodriguez aee7ec4cb2 Merge branch 'ent-6897-estilos-rotos-metaconsola' into 'develop' 
Fixed broken styles in meta

See merge request artica/pandorafms!3743
 2020-12-24 10:30:01 +01:00
Luis Calvo d8900704ed Fixed broken styles in meta 2020-12-23 17:58:05 +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 ee84644163 Merge branch 'ent-6687-Instalador-en-metaconsola' into 'develop' 
fix check install meta

See merge request artica/pandorafms!3666
 2020-12-22 13:48:13 +01:00
Daniel Rodriguez 68c41ba704 Merge branch 'ent-6727-SAP-View-fallos' into 'develop' 
Fix

Closes pandora_enterprise#6727

See merge request artica/pandorafms!3627
 2020-12-22 12:42:16 +01:00
Daniel Rodriguez 2591d8874a Merge branch 'ent-6804-buscador-pandora-permite-acceder-politicas-open' into 'develop' 
Ent 6804 buscador pandora permite acceder politicas open

Closes pandora_enterprise#6804

See merge request artica/pandorafms!3688
 2020-12-17 17:05:26 +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 77acbb1d46 Fix 2020-12-02 15:56:18 +01:00
Jose Gonzalez 4760e0b20c Fix 2020-12-02 15:49:13 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin b9c2db9825 fix check install meta 2020-11-27 13:21:14 +01:00
Jose Gonzalez 1412591813 Fix 2020-11-18 12:37:39 +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
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
fbsanchez f6020e8791 Removed unwanted traces 2020-10-19 10:59:46 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
Daniel Rodriguez bf1d3f4af3 Merge branch 'ent-6278-SQL-Injection-ajax-cg_items' into 'develop' 
Solved ajax sql injection

Closes pandora_enterprise#6278

See merge request artica/pandorafms!3465
 2020-09-22 12:15:43 +02:00
Jose Gonzalez 1258a1a635 Solved ajax sql injection 2020-09-17 15:14:03 +02:00
Luis Calvo 8314a25830 Fixed custom login background on Edge and IE 2020-09-01 17:52:36 +02:00
Luis f7f5798ee6 Fixed modules per agent enterprise message 2020-08-07 11:33:42 +02:00
Alejandro Fraguas f79dd6db43 Merge branch 'ent-no-muestra-las-imagenes-en-el-modal-de-error-del-modulo-database-maintenance-en-metaconsola' into 'develop' 
5722-fixed image not found

See merge request artica/pandorafms!3263
 2020-07-13 13:22:41 +02:00
Daniel Rodriguez b18ace9ef6 Merge branch 'ent-5716-ventana-de-registrar-nodo-en-database-ha-queda-visible' into 'develop' 
Minor style fix

See merge request artica/pandorafms!3262
 2020-07-07 13:12:53 +02:00
Alejandro Fraguas a8bf9843ee Merge branch 'ent-5728-bug-standard-users-pandora-administrator' into 'develop' 
Fixed user list for UM

See merge request artica/pandorafms!3241
 2020-06-08 10:46:37 +02:00
marcos 4493e84529 fixed image not found 2020-06-02 09:48:59 +02:00
fbsanchez 531efcfefe Minor style fix 2020-06-01 15:32:56 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00