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

2438 Commits

Author SHA1 Message Date
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
Daniel Cebrian 2a56b63f2a #11965 new filters for hardening 2023-09-08 14:06:33 +02:00
Daniel Cebrian a8b107bb92 #11965 new structure for hardening 2023-09-07 17:08:27 +02:00
Daniel Cebrian 133c1676c0 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-07 15:28:55 +02:00
Daniel Cebrian e3050c2933 #11965 change css in hardening 2023-09-06 15:09:42 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +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
Daniel Cebrian 12ebf45f87 #11965 adjust css for column with 70% in hardening 2023-09-04 16:04:26 +02:00
Daniel Cebrian 586a5523b6 #11965 added new screen auditing 2023-09-04 11:07:33 +02:00
Jorge Rincon ba1a3da03a #10065 fixed checkbox switch style 2023-09-04 10:03:53 +02:00
Rafael Ameijeiras 6e60eeb09b Merge branch 'ent-11490-nuevo-widget-group-status-map' into 'develop' 
Ent 11490 Nuevo widget: group status map

See merge request artica/pandorafms!6252
 2023-09-04 07:05:49 +00:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
miguel angel rasteu c2e6dd378d #11206 Fix buttons 2023-08-31 13:36:26 +02:00
miguel angel rasteu 2c62de02f7 Fix conflict 2023-08-31 12:49:48 +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
Daniel Cebrian d90f2b8cad #11965 new view audit and hardening in menu 2023-08-31 10:47:18 +02:00
Daniel Cebrian 1fa0bc0ab1 #11965 new section security in menu 2023-08-29 15:09:41 +02:00
Daniel Cebrian dee5667783 Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-29 10:57:43 +02:00
miguel angel rasteu f5d20dc8eb #11206 Fix custom field view 2023-08-25 12:20:07 +02:00
miguel angel rasteu 1afed9f262 Merge branch 'develop' into ent-11206-anadir-la-custom-field-view-de-la-meta-a-los-nodos 2023-08-25 10:13:43 +02:00
miguel angel rasteu bb3a45050f Merge branch 'develop' into ent-10637-mejora-informe-grupo 2023-08-24 12:38:23 +02:00
Pablo Aragon 670cf7d9a7 11423-Graph analytics. Remove graphs & several changes 2023-08-24 12:27:06 +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
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Pablo Aragon c0933e8b15 11423-Graph analytics 2023-08-23 11:51:29 +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
Pablo Aragon bfa09367d4 11423-Graph analytics. Share function 2023-08-22 15:28:05 +02:00
miguel angel rasteu feac240905 #10637 Resolve conflicts 2023-08-22 11:49:23 +02:00
miguel angel rasteu 384fb8d115 #11206 Resolve conflicts 2023-08-22 11:21:10 +02:00
miguel angel rasteu 0194fbaa59 #11206 Fix custom field view 2023-08-22 11:16:17 +02:00
Pablo Aragon ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
miguel angel rasteu 817c3223be #11206 Fix custom field view 2023-08-21 15:11:13 +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 e96cb41992 #11206 Fix css conflict 2023-08-21 09:10:51 +02:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu a251046452 #11206 Fix conflict 2023-08-21 08:36:42 +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
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02: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 26a09987c0 #11316 fixed modal in black theme and header welcome in header 2023-08-18 08:48:33 +02:00
Daniel Cebrian 74ed3d6c2b Merge branch 'develop' into ent-11316-simplificar-vistas-de-soporte 2023-08-18 08:26:45 +02:00
Daniel Cebrian 5ee4dbee87 #11490 added new widget group status map 2023-08-16 16:11:35 +02:00
Pablo Aragon 63d3745794 11423-Graph analytics. Get filter data (WIP) 2023-08-16 15:12:31 +02:00
Pablo Aragon a10b526938 11423-Graph analytics. Get filter data (WIP) 2023-08-14 15:36:19 +02:00
Jonathan 53bf10acc0 #11819 wizard visual console update 2023-08-14 14:54:15 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Pablo Aragon 5ed9206f36 11423-Graph analytics. Drag&Drop (WIP) 2023-08-11 13:50:32 +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
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Daniel Cebrian 496afbc973 #11326 reorganized tables 2023-08-08 08:46:56 +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 019efcb124 Merge branch 'ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro' into 'develop' 
Ent 11668 noticias en consola tienen fondo blanco en tema oscuro

See merge request artica/pandorafms!6182
 2023-08-04 06:45:42 +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 c2cdbcce1b #11668 Fix black theme 2023-08-03 13:45:31 +02:00
miguel angel rasteu 1009404bfd Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro 2023-08-03 13:42:49 +02:00
miguel angel rasteu 135c6835bd #11713 fix title buttons 2023-08-03 12:51:09 +02:00
miguel angel rasteu 1dc24cdfb4 #11668 Fix black theme 2023-08-03 12:22:20 +02:00
miguel angel rasteu 2ced051f56 #11668 Fix modal 2023-08-03 09:43:06 +02:00
miguel angel rasteu fddc709aee #11219 Fix transaltes 2023-08-02 14:48:02 +02:00
Rafael Ameijeiras b23397ef82 Merge branch 'ent-11707-iconos-de-modulos-en-tree-view-estan-pegados-al-texto' into 'develop' 
Ent 11707 iconos de modulos en tree view estan pegados al texto

See merge request artica/pandorafms!6229
 2023-08-02 11:43:31 +00:00
Rafael Ameijeiras d96977b883 Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop' 
Ent 10562 nueva vista de detalle de alertas encoladas

See merge request artica/pandorafms!6273
 2023-08-02 08:26:50 +00: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 3b38824ca7 #11697 arrow left menu collapse 2023-08-01 13:06:43 +02:00
Jonathan f2328407b1 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-01 09:39:56 +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 ad24712eed resolved conflict 2 2023-07-31 09:48:42 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +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
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02: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 387d18a8af Merge branch 'ent-11057-meter-un-poco-de-borde-de-sombra-a-las-letras-de-login-para-que-se-vean-mejor' into 'develop' 
Ent 11057 meter un poco de borde de sombra a las letras de login para que se vean mejor

See merge request artica/pandorafms!6167
 2023-07-25 07:52:40 +00: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
Daniel Cebrian 247bcc1cf5 #11326 fixed bug and reorganized data 2023-07-21 19:38:06 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +02:00
alejandro.campos@artica.es 7b9170312c implemented pending alerts list for event server 2023-07-21 11:50:53 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00