Commit Graph

1095 Commits

Author SHA1 Message Date
Rafael Ameijeiras b052711c92 Merge branch 'ent-11697-arreglar-menu-sin-click-to-display' into 'develop'
Draft: Ent 11697 arreglar menu sin click to display

See merge request artica/pandorafms!6230
2023-08-01 12:32:37 +00:00
Jonathan cf1e274456 #11697 fix menu display lateral 2023-08-01 13:54:48 +02:00
Jonathan 3b38824ca7 #11697 arrow left menu collapse 2023-08-01 13:06:43 +02:00
miguel angel rasteu cf7b123eb0 #11795 Prevent XSS attack in site news page 2023-07-28 12:36:10 +02:00
Daniel Rodriguez c2d7c10442 Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop'
remove legacy visual console

See merge request artica/pandorafms!6140
2023-07-26 11:09:44 +00:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop'
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
2023-07-17 05:57:29 +00:00
Jonathan 6ef21fc3a1 #11697 menu display lateral on collapse and tokem 2023-07-11 13:50:45 +02:00
Daniel Cebrian d993674c12 Merge branch 'develop' into ent-11567-ventana-about 2023-07-06 11:30:45 +02:00
Jorge Rincon 12c538421a #11543 added the pandora FMS logo in black 2023-07-05 09:53:05 +02:00
miguel angel rasteu 0bd6125841 #11051 Add notifications filter 2023-07-04 13:33:29 +02:00
Jorge Rincon d25a5e2b89 #11543 Added login screen changes in white mode 2023-07-03 17:37:01 +02:00
miguel angel rasteu 8ad4e8261e #10563 Fix config enable feedback 2023-07-03 10:22:22 +02:00
miguel angel rasteu 5f864d53a8 #11051 Add action to mark all notification as read 2023-07-03 09:18:30 +02:00
Gorka Sanchez 28f99d2c27 Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop'
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres

See merge request artica/pandorafms!5713
2023-06-30 11:39:50 +00:00
miguel angel rasteu ac92b5979c #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-06-30 08:35:37 +02:00
Daniel Cebrian cc20640acd #11316 new modal help 2023-06-26 09:19:26 +02:00
alejandro.campos@artica.es 77ff766f84 remove legacy visual console 2023-06-19 15:25:37 +02:00
Daniel Cebrian 01d48c7ba4 #11567 new about window in operation 2023-06-19 15:09:30 +02:00
alejandro.campos@artica.es c208df980e limited access to nodes when merging 2023-06-16 11:50:52 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Jonathan ebdc735bd4 #10598 V2 wizard welcome 2023-06-02 13:32:47 +02:00
Diego Muñoz-Reja 9f542a42f0 Merge branch 'ent-11317-fallo-al-loguear-con-usuario-solo-informes' into 'develop'
Ent 11317 fallo al loguear con usuario solo informes

See merge request artica/pandorafms!5942
2023-05-25 15:23:33 +00:00
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
miguel angel rasteu 390f18e963 #11317 Fix ACL Check 2023-05-23 10:53:08 +02:00
Daniel Maya 4a7899f476 #11278 Fixed login with saml 2023-05-23 09:24:31 +02:00
Pablo Aragon 7cf69ae101 11058-New welcome message 2023-05-08 08:49:35 +02:00
Daniel Rodriguez 38d2d66469 Merge branch 'ent-10597-pantalla-de-error-de-sistemas-no-mergeados' into 'develop'
Ent 10597 pantalla de error de sistemas no mergeados

See merge request artica/pandorafms!5705
2023-05-04 17:15:16 +00:00
Jonathan 477dc1d14d #10597 add logo pandora maintenance 2023-05-04 16:28:51 +02:00
miguel angel rasteu dc41e1c377 fix if in header and declare correctly a value 2023-04-13 11:36:13 +02:00
miguel angel rasteu c26db22fa5 #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-04-13 11:07:09 +02:00
Pablo Aragon 2d8d501fe8 10918-Fix login background & text 2023-04-12 17:21:18 +02:00
Jonathan c7b62c587b #10597 logo pandora deactivated 2023-04-12 13:39:48 +02:00
daniel c315a7f8c5 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-31 13:31:39 +02:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop'
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
2023-03-31 07:33:26 +00:00
daniel d6a1155dbb fixed styles 2023-03-31 08:45:54 +02:00
Daniel Maya 2035d9831b #10378 permanent closed menu 2023-03-30 13:02:36 +02:00
Pablo Aragon 7ada30c9b1 10718 & 10821 2023-03-29 12:12:56 +02:00
Daniel Cebrian 075d0a1c4f #10441 added version file in css 2023-03-24 12:06:40 +01:00
Pablo Aragon f32c886167 10712-login 2023-03-23 11:51:21 +01:00
Pablo Aragon d6bf16f536 10712-Login 2023-03-22 18:57:36 +01:00
Pablo Aragon b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +01:00
Pablo Aragon e8744b5d12 10712-New login 2023-03-21 13:31:11 +01:00
Pablo Aragon b922b50688 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 11:34:00 +01:00
Pablo Aragon 6b140445c3 10712-New login 2023-03-17 11:33:50 +01:00
daniel 5921e61ad8 fixed styles 2023-03-16 16:32:18 +01:00
Jose Gonzalez b428e77e7c User management for meta 2023-03-14 13:11:57 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida'
# Conflicts:
#   pandora_console/pandoradb.sql
2023-03-10 10:41:08 +00:00
daniel 8736629954 fixed styles 2023-03-10 08:38:44 +01:00
daniel 63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
daniel dba1554d74 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/general/login_page.php
2023-03-07 08:04:45 +01:00
Pablo Aragon 6ae86b4c39 Sound events. Login SAML 2023-03-06 08:21:04 +01:00
Jonathan 3b36a15b4d Merge branch 'develop' into ent-10294-enumeracion-usuarios-en-errores-login-pandora-fms 2023-03-06 08:18:52 +01:00
Jose Gonzalez 128dc9c42c Visual console changes 2023-03-03 13:52:28 +01:00
Jonathan dd1b58b83a Reporting Custom Graphs change visual 2023-03-02 14:35:01 +01:00
Jose Gonzalez 7958793e1a Service 2023-03-01 12:37:17 +01:00
Daniel Maya 586b6e5883 #9662 fixed menu 2023-02-27 09:39:34 +01:00
Jose Gonzalez 0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
2023-02-22 12:35:34 +01:00
Jose Gonzalez 7a1d7f9087 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 17:23:01 +01:00
Jose Gonzalez 91393d7ce5 Ticket 10431 Header icons added 2023-02-20 17:22:42 +01:00
Daniel Maya a615d2d98f #9662 minor fixed 2023-02-20 17:08:36 +01:00
Daniel Maya c6e32e278b #9662 fixed favourites 2023-02-20 16:41:54 +01:00
Jose Gonzalez 5ae99154bb Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 11:48:12 +01:00
Jose Gonzalez 47c2b62029 Improve login page 2023-02-20 11:47:56 +01:00
Pablo Aragon e95e6acd0c 9662-Fix double authentication login 2023-02-20 11:27:20 +01:00
Pablo Aragon fd77ee1a14 9662-Fix double authentication login 2023-02-20 11:16:07 +01:00
Pablo Aragon bf307adb01 10483-Fixed csrf token on login after logout 2023-02-20 10:47:00 +01:00
Pablo Aragon 4ee6cf7e28 9662-Fix login meta 2023-02-20 09:54:48 +01:00
Pablo Aragon 46a4ee9af2 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 12:53:12 +01:00
Pablo Aragon a065f4578c 9662-Login 2023-02-17 12:52:13 +01:00
Daniel Maya 320b87b77e menu bug fixes 2023-02-17 10:10:47 +01:00
Jose Gonzalez 1520b8c62f Menu improvements 2023-02-16 14:37:30 +01:00
Jose Gonzalez 4a535b14a2 Fully integrated principal action-buttons 2023-02-15 13:43:42 +01:00
Daniel Cebrian bdd6d2bb15 #9073 added control session 2023-02-14 11:18:39 +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
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