33198 Commits

Author SHA1 Message Date
Jonathan
7704e4a1da clusterview margin title on view 2023-03-16 14:07:12 +01:00
Jonathan
ad5078fcc0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 13:31:22 +01:00
Jonathan
f417772642 TipsWindow blacktheme 2023-03-16 13:31:16 +01:00
Jose Gonzalez
9508d2d572 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 13:11:22 +01:00
Jose Gonzalez
8d7620e88d Setup updates 2023-03-16 13:11:11 +01:00
Pablo Aragon
de93dd1c6e Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 12:57:59 +01:00
Pablo Aragon
260caca63a 10021, 10224, 10652, 10414 2023-03-16 12:57:48 +01:00
Jose Gonzalez
3782fdaaf6 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 12:50:39 +01:00
Jose Gonzalez
7bd8f0cc0d Minor visual fix 2023-03-16 12:50:31 +01:00
Jonathan
b56cb0e78e log sources view hide on empty 2023-03-16 12:23:58 +01:00
Jonathan
fa06b4e8a3 datepicker fix logviewer 2023-03-16 12:22:14 +01:00
Jonathan
45a055573a Log viewer datepicker fixed 2023-03-16 11:59:38 +01:00
Jose Gonzalez
fd82e1a582 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 11:58:40 +01:00
Jose Gonzalez
21c263c7c4 Setup views 2023-03-16 11:58:35 +01:00
Jonathan
02ef024905 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 10:42:46 +01:00
Jonathan
3aba51d0ed Borders and colors PDFS 2023-03-16 10:42:39 +01:00
Jose Gonzalez
e474ec0915 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-16 09:43:38 +01:00
Jose Gonzalez
9ac04fba28 Netflow fix 2023-03-16 09:42:59 +01:00
artica
2767d24f60 Auto-updated build strings. 2023-03-16 01:00:18 +01:00
daniel
83f2f2d008 Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5605
2023-03-15 20:25:30 +00:00
daniel
63ad563bf2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-15 21:24:05 +01:00
daniel
39f342a982 fixed styles 2023-03-15 21:17:50 +01:00
Jose Gonzalez
2cf13b00a1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 17:43:47 +01:00
Jose Gonzalez
d2a807636e General Setup view 2023-03-15 17:43:35 +01:00
Alejandro Sánchez
8804cc46d5 Merge branch 'ent-9810-plugin-advanced-log-parser-no-funcionaba-en-windows-64bits' into 'develop'
fix to correctly take the path of the logs to be monitored.

See merge request artica/pandorafms!5608
2023-03-15 16:29:59 +00:00
alejandro
931610e774 fix to correctly take the path of the logs to be monitored. 2023-03-15 17:23:59 +01:00
Pablo Aragon
043db37c57 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 17:02:34 +01:00
Pablo Aragon
4d6029ba3f 10408-Manage agents, Agent view 2023-03-15 17:02:25 +01:00
Jose Gonzalez
e9526bf886 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 16:37:33 +01:00
Jonathan
9a21c40780 Background white PDFS 2023-03-15 16:35:49 +01:00
Jose Gonzalez
84fe5695d8 Visual styles Setup view 2023-03-15 16:34:18 +01:00
Jonathan
ac3816709c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 16:06:47 +01:00
Jonathan
30538265e8 Cluster wizzard visual fix 2023-03-15 16:06:42 +01:00
Pablo Aragon
797f43ff3c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 15:58:34 +01:00
Pablo Aragon
bed1e34fd2 Dashboards widgets 2023-03-15 15:58:28 +01:00
Jonathan
19b295060b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 13:53:34 +01:00
Jonathan
17ba51d2bf cluster view 2023-03-15 13:53:23 +01:00
Daniel Cebrian
c346aefeaa #10685 changed in system fav, tips and Tactical group view 2023-03-15 12:46:09 +01:00
Pablo Aragon
00a5e8e84b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 11:30:40 +01:00
Pablo Aragon
938e8cd777 Dashboards widgets 2023-03-15 11:30:22 +01:00
Jose Gonzalez
12f8b6dbba Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 11:15:09 +01:00
Jose Gonzalez
6ac41ed907 Icon added 2023-03-15 11:15:04 +01:00
Jonathan
8a7b60e983 PDF changes visual 2023-03-15 09:58:56 +01:00
Jose Gonzalez
bab3248d57 Monitor view with not normal at start 2023-03-15 08:56:15 +01:00
artica
b082910ca6 Auto-updated build strings. 2023-03-15 01:00:57 +01:00
daniel
4883debc02 Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5598
2023-03-14 17:20:22 +00:00
daniel
cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
	pandora_console/extras/mr/62.sql
2023-03-14 18:17:54 +01:00
Jose Gonzalez
49b5b8b253 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 18:15:35 +01:00
Jose Gonzalez
4f5d3ed924 Netflow meta 2023-03-14 18:15:31 +01:00
Jonathan
c2b8554713 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 17:28:24 +01:00