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

1014 Commits

Author SHA1 Message Date
Jose Gonzalez d29661c87b Merge 2023-02-13 14:32:20 +01:00
Jose Gonzalez 2f547c620d Fix logout button 2023-02-13 14:25:34 +01:00
Daniel Maya f5044e5673 #9662 Added new user edit link and changed label 2023-02-13 13:16:51 +01:00
Daniel Maya 7d6ace0f98 #9662 Added icon about 2023-02-13 12:43:30 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Daniel Maya 44bee67f36 #9663 menu redesing 6 2023-02-13 09:31:33 +01:00
Jose Gonzalez 6a46af495d Fix issue with dev environment starting and added button fixed id parameter 2023-02-10 13:38:47 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Daniel Maya 08f0f3403a #9663 menu redesing 5 2023-02-10 11:48:32 +01:00
Jonathan d190c36a9e #10294 login user bloqued and attempts 2023-02-08 11:59:20 +01:00
Jonathan 1d7230e9ca #10294 error login no user register attemps 2023-02-07 17:24:40 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Jose Gonzalez b9992c5a67 Minor fixes for solve visual issues 2023-02-03 12:37:09 +01:00
Daniel Maya 1437c5a0e7 #9663 menu redesing 3 2023-02-02 13:28:48 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 60685cdccc Table fixes 2023-01-10 10:18:37 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Alejandro Campos 960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2022-12-15 14:05:27 +00:00
Alejandro Campos 867e1cc2b3 Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional' 
# Conflicts:
#   pandora_console/extras/mr/60.sql
 2022-12-13 11:42:41 +00:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
Daniel Maya fcd918d00b #9851 Fixed background image size 2022-11-24 15:49:11 +01:00
Daniel Maya ac910412a3 #9663 WIP menu redesing 2022-11-24 09:36:18 +01:00
alejandro.campos@artica.es cdddc07b86 changed mr 2022-11-23 12:22:19 +01:00
Luis 4729a21636 Update php_message.php 2022-11-23 07:43:41 +00:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com bf1a997498 Clean footer 2022-11-22 17:41:14 +01:00
Calvo 4feb99a5f3 Update messages to php8 2022-11-22 16:32:10 +01:00
Calvo 4e9bc2d6ef Update messages to php8 2022-11-22 16:31:09 +01:00
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01:00
alejandro.campos@artica.es 6a173664d4 Removed transactional server 2022-11-11 12:09:03 +01:00
jose.gonzalez@pandorafms.com 195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
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
jose.gonzalez@pandorafms.com 5e4bf4863c Adapted views 2022-10-26 12:02:56 +02:00
jose.gonzalez@pandorafms.com d0fa29d2de Adapted some buttons 2022-10-24 12:06:45 +02:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02: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
alejandro.campos@artica.es db88876748 fixed bug when disabling modules and disabled modules count 2022-08-30 14:58:19 +02:00
Daniel Barbero 2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 
Conflicts:
	pandora_console/godmode/menu.php
 2022-08-02 10:34:21 +02:00
Jimmy Olano 7b411ae0de Merge branch 'ent-9045-mensaje-de-error-por-falta-de-acceso-fallos-de-formato' into 'develop' 
Ent 9045 mensaje de error por falta de acceso fallos de formato

#9045 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9045

See merge request artica/pandorafms!5004
 2022-07-22 14:39:18 +00:00
Daniel Barbero Martin 84fbf0e3dd double refresh page events pandora_enterprise#9279 2022-07-18 16:44:31 +02:00
Daniel Barbero Martin 8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
edu.corral 81283e2626 ent-9045 error message 2022-07-04 10:46:55 +02:00
Daniel Maya 547962c83a Merge branch 'develop' into ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica 2022-06-29 17:27:25 +02:00
Daniel Rodriguez 4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop' 
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
 2022-06-23 10:07:24 +00:00
Daniel Barbero Martin 1bf1a83782 Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour 2022-06-15 19:49:31 +02:00
José González dc599d2fe6 Handle header image with community and with black theme 2022-06-13 16:23:37 +02:00
Daniel Rodriguez bf7941ddd2 Merge branch 'ent-7757-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual-dashboard' into 'develop' 
Service tree view with local scope parents

See merge request artica/pandorafms!4826
 2022-06-07 10:47:26 +00:00
Daniel Maya d6fc15f0bf #8763 Added filter groups 2022-06-06 11:14:09 +02:00
Daniel Rodriguez 7f34ec585e Merge branch 'ent-8641-Estilos-rotos-vista-inicial-Manage-Database-HA' into 'develop' 
Fix styles

See merge request artica/pandorafms!4801
 2022-06-03 09:00:57 +00:00
Daniel Maya 0d3b14da40 #9005 Added lts_name 2022-05-23 13:00:01 +02:00
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
Daniel Rodriguez 49cdcfa876 Merge branch 'ent-8840-Desplegable-autorefresh-invisible' into 'develop' 
Ent 8840 desplegable autorefresh invisible

See merge request artica/pandorafms!4824
 2022-05-12 12:43:57 +00:00
Daniel Maya 6771fc9b95 #8925 Fixed XSS 2022-05-03 11:36:06 +02:00
fbsanchez 2ab1aa601c Service tree view with local scope parents 2022-04-20 14:10:23 +02:00
Daniel Maya 1fcd64da26 #8840 changed invisible class 2022-04-19 15:23:12 +02:00
José González bfb44be775 Fix styles 2022-04-05 13:40:12 +02:00
Daniel Rodriguez 9f7dd951e5 Merge branch 'ent-8386-usuario-sin-acceso-a-servidores-ve-icono-con-info-de-servidores' into 'develop' 
Do not show servers header icon if user has no permission node

See merge request artica/pandorafms!4723
 2022-03-09 12:55:31 +00:00
José González d511d75b8d Merge branch 'develop' into 'ent-8112-icono-collapse-recortado' 
# Conflicts:
#   pandora_console/general/main_menu.php
 2022-03-08 08:53:00 +00:00
Calvo 3ef537ceb2 Do not show servers header icon if user has no permission node 2022-02-25 10:16:12 +01:00
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