963 Commits

Author SHA1 Message Date
Jose Gonzalez
4a535b14a2 Fully integrated principal action-buttons 2023-02-15 13:43:42 +01:00
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
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