2450 Commits

Author SHA1 Message Date
Daniel Cebrian
27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
Jose Gonzalez
5925cb0b2c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 17:50:57 +01:00
Jose Gonzalez
2dbc2e801f Minor icon fixes 2023-03-07 17:24:36 +01:00
Pablo Aragon
3ecbf1e4fa Alerts 2023-03-07 16:17:01 +01:00
Pablo Aragon
d529e6f384 Alerts 2023-03-07 15:59:36 +01:00
Daniel Maya
6b9175ea0d Merge branch 'develop' into ent-9662-second-round 2023-03-07 15:05:28 +01:00
Jose Gonzalez
4ea1d697dc Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:00:40 +01:00
Jose Gonzalez
d4125be1b6 Fix visual issue with radios 2023-03-07 15:00:34 +01:00
Matias Didier
d206471673 Merge branch 'ent-10347-vista-tactica-de-grupo' into 'develop'
Ent 10347 vista tactica de grupo

See merge request artica/pandorafms!5572
2023-03-07 13:55:57 +00:00
Jonathan
8dbcffaa8b Buttons and view report 2023-03-07 14:15:02 +01:00
vgilc
7c0259be78 Merge branch 'ent-10518-nuevo-menu-metaconsola' into 'develop'
Draft: Ent 10518 nuevo menu metaconsola

See merge request artica/pandorafms!5573
2023-03-07 13:00:17 +00: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 Cebrian
fdc73be979 Merge branch 'develop' into ent-10347-vista-tactica-de-grupo 2023-03-07 13:19:52 +01:00
Jose Gonzalez
b68fe38102 Controls improve 2023-03-07 11:15:01 +01:00
Pablo Aragon
62afce562f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 08:28:22 +01:00
Pablo Aragon
5aac1a6152 Alerts 2023-03-07 08:28:10 +01:00
Jose Gonzalez
d9913818cb Private Enterprise Numbers minor fixes 2023-03-06 23:47:05 +01:00
alejandro.campos@artica.es
f47e2dda8c handling synchronizer instantiation when metaconsole is merging 2023-03-06 17:27:21 +01:00
Jose Gonzalez
e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
Jose Gonzalez
3c1c14576e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-06 11:34:10 +01:00
Jose Gonzalez
a4655c221d Added action-button class 2023-03-06 11:34:03 +01:00
Pablo Aragon
f77f635b8d div>ul>li styles 2023-03-06 10:09:21 +01:00
Pablo Aragon
9c5203885e IPAM 2023-03-06 09:23:30 +01:00
Jose Gonzalez
c13b77aea9 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-06 09:22:02 +01:00
Jose Gonzalez
7a2e929d3e CSS styles for services 2023-03-06 09:21:48 +01:00
Pablo Aragon
6ae86b4c39 Sound events. Login SAML 2023-03-06 08:21:04 +01:00
daniel
08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
daniel
ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
Jose Gonzalez
9ad97ee267 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 14:51:07 +01:00
Jose Gonzalez
6846961ff0 Icon updates 2023-03-03 14:50:47 +01:00
daniel
95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
Jose Gonzalez
df6dddb586 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 13:52:49 +01:00
Jose Gonzalez
128dc9c42c Visual console changes 2023-03-03 13:52:28 +01:00
Daniel Cebrian
7562a9253a #10347 refactoring and add link to events in graph 2023-03-03 13:13:49 +01:00
Jonathan
8d31603e44 Custom Graphs visual changes 2023-03-03 10:12:24 +01:00
Daniel Maya
ccb0d69edd #10518 Added new menu 2023-03-03 09:15:51 +01:00
daniel
310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Jose Gonzalez
18076d27cc Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 17:25:00 +01:00
Jose Gonzalez
7a11ce4145 Visual Consoles 2023-03-02 17:24:52 +01:00
Pablo Aragon
816f0f4770 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 17:10:01 +01:00
Pablo Aragon
0e9f7331db Ipam 2023-03-02 17:08:47 +01:00
daniel
6545bdbaf1 fixed styles 2023-03-02 14:25:52 +01:00
Daniel Cebrian
dc6256058f #10347 added list agents in tactical view groups 2023-03-02 13:48:14 +01:00
Jose Gonzalez
9a295cf974 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 12:59:47 +01:00
Jose Gonzalez
d65852e9aa Visual console 2023-03-02 12:59:40 +01:00
daniel
6c87ec3c99 fixed styles 2023-03-02 11:29:47 +01:00
Daniel Cebrian
a4a5650a01 #10347 added modal in heatmap agent 2023-03-02 11:10:37 +01:00
daniel
a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
Daniel Cebrian
ea51399460 #10347 create view tactic for groups with monitoring and alerts 2023-03-01 17:27:32 +01:00
Diego Muñoz-Reja
2057cf8d47 Merge branch 'ent-9666-nuevo-widget-event-cardboard' into 'develop'
Ent 9666 nuevo widget event cardboard

See merge request artica/pandorafms!5533
2023-03-01 15:49:47 +00:00