tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-01 07:08:55 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,402 Commits 34 Branches 30 Tags
Commit Graph

1103 Commits

Author SHA1 Message Date
fbsanchez
4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Jose Gonzalez
1e1ae95635 Fix issue with collapse icon 2022-02-10 10:28:43 +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
67d9c6daa6 Added message 2022-01-12 17:16:02 +01:00
Daniel Maya
080c5e2793 Fixed reset password 2022-01-12 12:19:41 +01:00
fbsanchez
c3639a22fb vc php8 2022-01-11 14:36:05 +01:00
fbsanchez
7ebd6a5f74 php8 warnings cleanup 2022-01-11 12:08:41 +01:00
Daniel Rodriguez
650607067e Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop' 
Include modules not init in total monitors count on tactical view

See merge request artica/pandorafms!4309
 2021-11-15 11:00:07 +00:00
José González
bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez
c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
fbsanchez
1cb2f77945 WIP NCM 2021-10-08 15:12:23 +02:00
Jose Gonzalez
8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
José González
9c508e05c1 Fix visual issue with position 2021-08-23 10:04:34 +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
Calvo
a8c0ba8e78 Include modules not init in total monitors count on tactical view 2021-07-19 13:20:00 +02:00
fbsanchez
760522aeff Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 11:03:09 +02:00
fbsanchez
3e8e78a4b4 Minor style fix maintenance page 2021-06-28 11:01:05 +02:00
fbsanchez
36f6ad4ee2 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 
Conflicts:
	pandora_console/include/styles/meta_dashboards.css
 2021-06-28 10:37:49 +02:00
fbsanchez
92d84e4cda some minor style fix 2021-06-25 11:05:26 +02:00
Luis
497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
fbsanchez
de03486134 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-23 09:48:01 +02:00
fbsanchez
390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +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
f4bf9027b1 Merge branch 'ent-7389-Vulnerabilidad-Cross-Site-Scripting-Consola' into 'develop' 
Ent 7389 vulnerabilidad cross site scripting consola

See merge request artica/pandorafms!4096
 2021-06-21 10:18:37 +00:00
José González
00d4f0c57d Clean code and fix issue with lateral main menu 2021-06-16 15:29:28 +02:00
José González
39f3e1987e Fixed bye bye 2021-06-16 10:15:53 +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
Marcos Alconada
665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez
4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada
2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
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
José González
52bad0e53c Added CSRF validation 2021-05-21 13:59:54 +02: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
Daniel Maya
5dd5a9aeee Fixed Cross-Site Scripting 2021-05-04 12:54:21 +02: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