Commit Graph

1343 Commits

Author SHA1 Message Date
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop'
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
2023-09-05 07:50:45 +00:00
Jorge Rincon ba1a3da03a #10065 fixed checkbox switch style 2023-09-04 10:03:53 +02:00
Gorka Sanchez 6102cb5015 Merge branch 'ent-11423-nueva-herramienta-graph-analytics' into 'develop'
Ent 11423 nueva herramienta graph analytics

See merge request artica/pandorafms!6327
2023-08-31 10:30:27 +00:00
miguel angel rasteu bb3a45050f Merge branch 'develop' into ent-10637-mejora-informe-grupo 2023-08-24 12:38:23 +02:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Rafael Ameijeiras 1bca8b0006 Merge branch 'ent-11819-cambios-en-wizard-de-las-consolas-visuales' into 'develop'
Ent 11819 cambios en wizard de las consolas visuales

See merge request artica/pandorafms!6338
2023-08-23 05:54:46 +00:00
miguel angel rasteu feac240905 #10637 Resolve conflicts 2023-08-22 11:49:23 +02:00
miguel angel rasteu 19fb83cd92 #11051 Fix css conflict 2023-08-21 13:16:53 +02:00
miguel angel rasteu 6cbb332a8a #10701 Fix css conflict 2023-08-21 09:16:22 +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 5e91d8a340 Merge branch develop into ent-11315-anadir-filtrado-al-wizard-de-servicios 2023-08-18 09:38:05 +02:00
Daniel Cebrian 74ed3d6c2b Merge branch 'develop' into ent-11316-simplificar-vistas-de-soporte 2023-08-18 08:26:45 +02:00
Jonathan 53bf10acc0 #11819 wizard visual console update 2023-08-14 14:54:15 +02:00
Pablo Aragon 28b8eeca61 11423-Graph analytics (WIP) 2023-08-10 09:13:48 +02:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
Jonathan 774ab78a5b #11836 fix style pandora.css fonts 2023-08-04 13:24:23 +02:00
Rafael Ameijeiras 3cfa60b38a Merge branch 'ent-11219-fallo-en-traducciones' into 'develop'
Ent 11219 fallo en traducciones

See merge request artica/pandorafms!6305
2023-08-04 09:38:01 +00:00
Rafael Ameijeiras b2821c0db3 Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop'
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola

See merge request artica/pandorafms!6249
2023-08-04 06:34:35 +00:00
miguel angel rasteu 135c6835bd #11713 fix title buttons 2023-08-03 12:51:09 +02:00
miguel angel rasteu fddc709aee #11219 Fix transaltes 2023-08-02 14:48:02 +02:00
Rafael Ameijeiras 75b311ad97 Merge branch 'ent-11768-texto-del-modal-de-save-filter-se-muestra-mal' into 'develop'
Ent 11768 texto del modal de save filter se muestra mal

See merge request artica/pandorafms!6287
2023-07-31 13:10:53 +00:00
miguel angel rasteu 1937c3fa00 #11713 Fix style 2023-07-31 10:06:12 +02:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +02:00
Rafael Ameijeiras f7df38a0c4 Merge branch 'ent-11174-graficas-descolocadas-en-diagnostic-info' into 'develop'
Ent 11174 graficas descolocadas en diagnostic info

See merge request artica/pandorafms!6147
2023-07-28 05:14:18 +00:00
Jorge Rincon 03feeebbdf #11768 Fixed the style of the checkbox in the modal save filter 2023-07-27 11:09:24 +02:00
miguel angel rasteu 2b20b7f8ee #11386 Fix modal 2023-07-27 10:47:51 +02:00
Pablo Aragon b45a563308 Merge branch 'develop' into ent-11174-graficas-descolocadas-en-diagnostic-info 2023-07-27 08:44:06 +02:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
miguel angel rasteu a651a296e5 #10701 Add icon 2023-07-26 08:03:32 +02:00
Rafael Ameijeiras 161ad1b6f7 Merge branch 'ent-11764-refactorizacion-visual-del-formulario-de-filtro-de-la-vista-de-logs' into 'develop'
Ent 11764 refactorizacion visual del formulario de filtro de la vista de logs

See merge request artica/pandorafms!6280
2023-07-26 05:05:01 +00:00
Rafael Ameijeiras d046e82208 Merge branch 'ent-11644-desaparece-selector-en-bulk-operations-en-nodo-centralizado' into 'develop'
Ent 11644 desaparece selector en bulk operations en nodo centralizado

See merge request artica/pandorafms!6168
2023-07-25 11:04:38 +00:00
Pablo Aragon 5732997d4a 11764-Log viewer, view agent 2023-07-25 12:26:40 +02:00
Rafael Ameijeiras ce9d5218e7 Merge branch 'ent-11724-bug-del-boton-show-hide-de-campos-sensibles' into 'develop'
Ent 11724 bug del boton show hide de campos sensibles

See merge request artica/pandorafms!6238
2023-07-25 07:50:19 +00:00
Daniel Cebrian 62a70dee2c #11326 added new section and validated if exist plugin 2023-07-24 18:42:27 +02:00
miguel angel rasteu a1965de2ea #11386 Fix sound alert modal 2023-07-24 12:25:06 +02:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +02:00
Jorge Rincon 844f61cc73 #11315 Change type of select to select_from_sql 2023-07-18 09:34:14 +02:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02: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
Daniel Cebrian 9012b897f9 #9686 added status in centralized mode 2023-07-13 11:59:10 +02:00
miguel angel rasteu 8332dce850 #11724 Fix show hide button 2023-07-12 13:15:46 +02:00
Diego Muñoz-Reja 3c3889e343 Merge branch 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos' into 'develop'
Ent 11161 campo innecesario y no solicitado al cambiar contrasena de usuario 3 errores distintos

See merge request artica/pandorafms!5887
2023-07-11 07:56:21 +00:00