Commit Graph

1078 Commits

Author SHA1 Message Date
Matias Didier a2efb36f36 Merge branch 'ent-12622-token-enable-feedback-desactivado-no-hace-que-desaparezca-del-menu-de-ayuda' into 'develop'
Ent 12622 token enable feedback desactivado no hace que desaparezca del menu de ayuda

See merge request artica/pandorafms!6768
2024-01-18 08:41:58 +00:00
Rafael Ameijeiras 5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop'
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
2023-12-21 12:00:44 +00:00
daniel 855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
2023-12-19 09:39:24 +01:00
Jonathan 7ae77773e6 #12597 popup open 2023-12-18 11:28:09 +01:00
Jonathan fe9b35ed77 #12622 help only when feedback enable 2023-12-13 16:51:14 +01:00
daniel cc12c77008 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-13 10:39:48 +01:00
Jonathan c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00
Rafael Ameijeiras d072187a2c Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop'
fix error 500 and warnings pandora_enterprise#12605

See merge request artica/pandorafms!6738
2023-12-11 14:27:39 +00:00
Jonathan 28dc5cada0 #12596 new dialog on baner open version 2023-12-11 12:21:33 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
daniel f6f0f15731 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
	pandora_console/include/styles/pandora.css
2023-11-28 08:29:10 +01:00
Matias Didier 7bc998d230 Merge branch 'ent-12206-limitacion-cambio-de-contrasena-de-usuarios' into 'develop'
Ent 12206 limitacion cambio de contrasena de usuarios

See merge request artica/pandorafms!6542
2023-11-27 12:12:10 +00:00
daniel 868700f9f1 add sliced mode simple graph reports and CV pandora_enterprise#9640 2023-10-25 15:55:54 +02:00
Daniel Cebrian b1b7a1e57d #10194 fixed acl in view 2023-10-19 16:18:36 +02:00
Daniel Cebrian d54a6faede #10194 adjust bars 24 hrs in events and changed numbers 2023-10-16 20:47:47 +02:00
miguel angel rasteu 041a13cb49 #12206 User password change limitation to local 2023-10-09 16:03:04 +02:00
Daniel Cebrian 7c201d2855 #10194 new structure for general tactical view 2023-09-21 17:58:18 +02:00
Jonathan 192ec72b32 #12038 header link setup 2023-09-21 10:06:08 +02:00
Jonathan 23756e8495 #12038 header link setup 2023-09-21 08:46:09 +02:00
Pablo Aragon ba964dfb16 11817-Remove Network maps from autorefresh user list 2023-08-29 08:52:50 +02:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu 970cc997cc #11051 Fix conflict 2023-08-21 08:25:53 +02:00
Rafael Ameijeiras 1f9cd3a773 Merge branch 'ent-11316-simplificar-vistas-de-soporte' into 'develop'
Ent 11316 Simplificar vistas de soporte

See merge request artica/pandorafms!6173
2023-08-21 06:16:41 +00:00
Jorge Rincon 3b50481c28 Merge branch develop into ent-11543-pantalla-de-login-en-modo-blanco 2023-08-18 09:49:27 +02:00
Daniel Cebrian 26a09987c0 #11316 fixed modal in black theme and header welcome in header 2023-08-18 08:48:33 +02:00
Rafael Ameijeiras 976f07c1e9 Merge branch 'ent-11459-Mientras-dura-el-mergeo-en-Metaconsola-en-nodos-no-aparece-el-mensaje-indicando-que-no-estan-disponibles' into 'develop'
limited access to nodes when merging

See merge request artica/pandorafms!6129
2023-08-18 06:48:25 +00:00
Rafael Ameijeiras 81f7591cb6 Merge branch 'ent-11795-stored-cross-site-scripting-via-site-news-page' into 'develop'
Ent 11795 stored cross site scripting via site news page

See merge request artica/pandorafms!6290
2023-08-18 06:44:33 +00:00
Daniel Cebrian 74ed3d6c2b Merge branch 'develop' into ent-11316-simplificar-vistas-de-soporte 2023-08-18 08:26:45 +02:00
Jonathan 7eb8dccc44 #11836 text-warp to white-space 2023-08-04 14:04:08 +02:00
Jonathan e5f72058a7 #11836 fix style for error on #11219 2023-08-04 13:46:57 +02:00
Jonathan 2a4500bd16 #11836 fix style for error on #11219 2023-08-04 13:46:15 +02:00
Daniel Maya ae22b99835 Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second 2023-08-02 09:10:04 +02:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
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