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

2368 Commits

Author SHA1 Message Date
Daniel Cebrian 7c201d2855 #10194 new structure for general tactical view 2023-09-21 17:58:18 +02:00
Rafael Ameijeiras 56cb2c3232 Merge branch 'ent-12060-quitar-subrayado-curvo-en-las-pestanas-de-eventos' into 'develop' 
Ent 12060 quitar subrayado curvo en las pestanas de eventos

See merge request artica/pandorafms!6453
 2023-09-21 15:45:50 +00:00
Jonathan aea61a6144 #12060 fix border radius sound events 2023-09-20 11:57:16 +02:00
Daniel Cebrian b85d622d51 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-18 16:52:57 +02:00
Daniel Rodriguez 6ecd8ca899 Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop' 
Draft: Ent 10065 post filtros de eventos privados

See merge request artica/pandorafms!6318
 2023-09-18 07:55:18 +00:00
Jonathan 5f35bbc1c0 #12060 fix line active 2023-09-14 13:01:54 +02:00
Rafael Ameijeiras 69030a9e3b Merge branch 'ent-12010-header-de-los-welcome-tips-se-corta' into 'develop' 
Ent 12010 Header de los Welcome Tips se corta

See merge request artica/pandorafms!6445
 2023-09-13 12:46:07 +00:00
Daniel Cebrian 1a9b770a9e #12010 fixed header modal 2023-09-12 12:42:40 +02:00
Daniel Cebrian 1cd5d1b0fa #11965 new view hardening 2023-09-12 10:45:23 +02:00
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
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
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 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
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
Pablo Aragon ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +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 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
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 Cebrian 496afbc973 #11326 reorganized tables 2023-08-08 08:46:56 +02:00