Commit Graph

347 Commits

Author SHA1 Message Date
RichardG867
cc9b2064d9 Merge branch 'v3.7' into v3.11 2026-02-26 12:20:16 -03:00
RichardG867
b33b798281 Merge branch 'v3.6' into v3.7 2026-02-26 12:20:15 -03:00
RichardG867
874859a2a6 Merge branch 'v3.5' into v3.6 2026-02-26 12:20:14 -03:00
RichardG867
ff97afbeea Merge branch 'v3.4' into v3.5 2026-02-26 12:20:13 -03:00
RichardG867
09eb3a8381 Merge branch 'v3.3' into v3.4
# Conflicts:
#	conf.py
2026-02-26 12:20:07 -03:00
RichardG867
9edf0c3b45 Merge branch 'v3.2' into v3.3 2026-02-26 12:19:15 -03:00
RichardG867
df791c63d3 Merge branch 'v3.0' into v3.2 2026-02-26 12:19:10 -03:00
RichardG867
94c6baba58 Add favicon file 2026-02-26 12:17:51 -03:00
RichardG867
2688c7069b Add favicon 2026-02-26 12:14:24 -03:00
RichardG867
0f7ea07388 Merge branch 'v3.7' into v3.11 2025-10-03 11:52:47 -03:00
RichardG867
59237779fe Merge branch 'v3.6' into v3.7 2025-10-03 11:52:03 -03:00
RichardG867
437523f4e9 Discord integration on Apple Silicon 2025-10-03 11:50:47 -03:00
RichardG867
7f582b0dea Merge branch 'v3.5' into v3.6 2025-10-03 11:50:07 -03:00
RichardG867
14f84b1933 Discord integration architectures fix 2025-10-03 11:49:55 -03:00
RichardG867
a9b1b4bd8f Merge branch 'v3.7' into v3.11 2025-08-21 15:33:41 -03:00
RichardG867
d290277cf3 Merge branch 'v3.6' into v3.7 2025-08-21 15:33:40 -03:00
RichardG867
a1ac95107f Merge branch 'v3.5' into v3.6 2025-08-21 15:33:39 -03:00
RichardG867
fb35a0c0b9 Merge branch 'v3.4' into v3.5 2025-08-21 15:32:35 -03:00
RichardG867
1569802f25 PCjr sidecar flag 2025-08-21 15:32:18 -03:00
RichardG867
d85815daed Merge branch 'v3.7' into v3.11 2025-08-01 16:49:53 -03:00
RichardG867
3bb1c326ea Merge branch 'v3.6' into v3.7 2025-08-01 16:49:52 -03:00
RichardG867
ba281c3e10 Merge branch 'v3.5' into v3.6 2025-08-01 16:49:50 -03:00
RichardG867
2da3d4fe2c Merge branch 'v3.4' into v3.5 2025-08-01 16:49:50 -03:00
RichardG867
0405074dc1 Merge branch 'v3.3' into v3.4 2025-08-01 16:49:49 -03:00
RichardG867
bd26b6513b Merge branch 'v3.2' into v3.3 2025-08-01 16:49:38 -03:00
RichardG867
82d26b4455 Merge branch 'v3.0' into v3.2 2025-08-01 16:46:14 -03:00
RichardG867
f97bd7ed7a There never was a device Settings button 2025-08-01 16:42:59 -03:00
RichardG867
0295fa6b2c Merge branch 'v3.7' into v3.11 2025-06-29 23:33:00 -03:00
RichardG867
f87e324276 Merge branch 'v3.6' into v3.7 2025-06-29 23:32:57 -03:00
RichardG867
28963bb7ed Merge branch 'v3.5' into v3.6 2025-06-29 23:32:54 -03:00
RichardG867
90d5cad9aa Merge branch 'v3.4' into v3.5 2025-06-29 23:32:51 -03:00
RichardG867
f154418923 Merge branch 'v3.3' into v3.4 2025-06-29 23:32:49 -03:00
RichardG867
8220961157 Merge branch 'v3.2' into v3.3 2025-06-29 23:32:46 -03:00
RichardG867
47bffcacf1 pcap appimage notice 2025-06-29 23:32:35 -03:00
RichardG867
ecc02a37ef Merge branch 'v3.7' into v3.11
# Conflicts:
#	settings/network.rst
2025-06-29 23:09:07 -03:00
RichardG867
07f4b6c5af Merge branch 'v3.6' into v3.7 2025-06-29 23:07:42 -03:00
RichardG867
8f1d57e927 Merge branch 'v3.5' into v3.6 2025-06-29 23:07:38 -03:00
RichardG867
71ca79498f Merge branch 'v3.4' into v3.5 2025-06-29 23:07:33 -03:00
RichardG867
d2a1ea7bf8 Merge branch 'v3.3' into v3.4 2025-06-29 23:07:30 -03:00
RichardG867
2cf3b6dafb Merge branch 'v3.2' into v3.3 2025-06-29 23:07:27 -03:00
RichardG867
8b89e9c198 Merge branch 'v3.0' into v3.2 2025-06-29 23:07:19 -03:00
RichardG867
f79fc9aa55 Delegate missing pcap to the more detailed page 2025-06-29 23:07:01 -03:00
RichardG867
9264786d5f Clear a small merge incident 2025-04-16 17:39:40 -03:00
RichardG867
09bf51a859 Merge branch 'v3.7' into v3.11 2025-04-16 17:38:03 -03:00
RichardG867
8dc8945cba Merge branch 'v3.6' into v3.7
# Conflicts:
#	usage/menubar.rst
2025-04-16 17:37:49 -03:00
RichardG867
4da1f70238 Merge branch 'v3.5' into v3.6
# Conflicts:
#	usage/menubar.rst
2025-04-16 17:37:18 -03:00
RichardG867
5e972405b5 Merge branch 'v3.4' into v3.5
# Conflicts:
#	usage/menubar.rst
2025-04-16 17:35:25 -03:00
RichardG867
42dceca2ab Merge branch 'v3.3' into v3.4 2025-04-16 17:34:31 -03:00
RichardG867
a2e678d032 Remove Qt UI MT-32 notice 2025-04-16 17:34:06 -03:00
RichardG867
0342499179 Merge branch 'v3.2' into v3.3
# Conflicts:
#	usage/menubar.rst
2025-04-16 17:33:40 -03:00