Paul Hitt
|
1e0bf0ba1f
|
Merge branch 'fix/restore-the-parity-table' into 'main'
Put the parity table back
See merge request paulhitt/flamenet-messenger-android!98
|
2026-09-09 02:13:16 +00:00 |
|
Paul Hitt
|
37bfb84809
|
Merge branch 'chore/read-like-a-codebase' into 'main'
Read like a codebase
See merge request paulhitt/flamenet-messenger-android!97
|
2026-09-09 00:28:32 +00:00 |
|
Paul Hitt
|
8343b10c66
|
Merge branch 'fix/a-photo-must-not-turn-on-its-side' into 'main'
Photos must not turn on their side; the keyboard must not cover the chat
See merge request paulhitt/flamenet-messenger-android!96
|
2026-09-09 00:09:31 +00:00 |
|
Paul Hitt
|
04e06452b6
|
Merge branch 'feat/say-why-delivery-failed' into 'main'
Say why delivery failed, instead of only logging it (ios#21, #22, #23)
See merge request paulhitt/flamenet-messenger-android!95
|
2026-09-08 18:30:01 +00:00 |
|
Paul Hitt
|
fb0c11cd79
|
Merge branch 'revert/pre-purple-theme' into 'main'
Revert the purple/dark theme, back to the pre-purple palette
See merge request paulhitt/flamenet-messenger-android!94
|
2026-09-08 17:36:19 +00:00 |
|
Paul Hitt
|
bad7bc07ae
|
Merge branch 'release/0.11-rename' into 'main'
Publish as 0.11, with the code still climbing
See merge request paulhitt/flamenet-messenger-android!93
|
2026-09-08 00:17:34 +00:00 |
|
Paul Hitt
|
787704aa28
|
Merge branch 'release/0.12' into 'main'
Android 0.12
See merge request paulhitt/flamenet-messenger-android!92
|
2026-09-07 22:32:49 +00:00 |
|
Paul Hitt
|
6d88f4f44a
|
Merge branch 'fix/directory-address-and-refusal-copy' into 'main'
Read the contact's address from the directory, and name the refusals
See merge request paulhitt/flamenet-messenger-android!91
|
2026-09-07 21:48:30 +00:00 |
|
Paul Hitt
|
98125d1dbd
|
Merge branch 'feat/compose-a-reply' into 'main'
Compose a reply (android#16)
Closes #16
See merge request paulhitt/flamenet-messenger-android!90
|
2026-09-07 21:35:57 +00:00 |
|
Paul Hitt
|
0fab7cc6d3
|
Merge branch 'feat/files-and-wallet-in-the-bar' into 'main'
Files and Wallet are bar destinations, like iOS
See merge request paulhitt/flamenet-messenger-android!89
|
2026-09-07 19:41:31 +00:00 |
|
Paul Hitt
|
090ca7ed57
|
Merge branch 'feat/new-brand-icon' into 'main'
The launcher icon is the product's mark
See merge request paulhitt/flamenet-messenger-android!88
|
2026-09-07 13:34:31 +00:00 |
|
Paul Hitt
|
dd275939e3
|
Merge branch 'feat/android-report-a-story' into 'main'
Report a story on Android, which had no way to
See merge request paulhitt/flamenet-messenger-android!87
|
2026-09-07 01:56:06 +00:00 |
|
Paul Hitt
|
81ef0170c3
|
Merge branch 'feat/android-display-settings' into 'main'
Display settings, and one gap that is a missing feature rather than a toggle
See merge request paulhitt/flamenet-messenger-android!86
|
2026-09-07 01:56:03 +00:00 |
|
Paul Hitt
|
20d19e0de3
|
Merge branch 'feat/android-notification-settings' into 'main'
Notification settings, which Android never had
See merge request paulhitt/flamenet-messenger-android!85
|
2026-09-07 01:14:43 +00:00 |
|
Paul Hitt
|
c91e19300c
|
Merge branch 'feat/share-bridge-ui' into 'main'
Give sharing a bridge a way in
See merge request paulhitt/flamenet-messenger-android!84
|
2026-09-07 00:51:16 +00:00 |
|
Paul Hitt
|
4d915a237d
|
Merge branch 'feat/share-a-bridge-with-a-contact' into 'main'
Hand a contact the bridge you use (§6.19)
See merge request paulhitt/flamenet-messenger-android!83
|
2026-09-06 23:59:34 +00:00 |
|
Paul Hitt
|
9ab6384638
|
Merge branch 'release/0.11' into 'main'
Android 0.11
See merge request paulhitt/flamenet-messenger-android!82
|
2026-09-06 23:10:18 +00:00 |
|
Paul Hitt
|
10295e08f8
|
Merge branch 'ci/loud-advisory-at-e2e-head' into 'main'
Pair the e2e pin with a loud advisory at HEAD
See merge request paulhitt/flamenet-messenger-android!81
|
2026-09-06 21:37:15 +00:00 |
|
Paul Hitt
|
49947bd585
|
Merge branch 'fix/pin-the-vector-clone' into 'main'
Pin the vector clone, rather than reddening on someone else's merge
See merge request paulhitt/flamenet-messenger-android!80
|
2026-09-06 19:57:42 +00:00 |
|
Paul Hitt
|
5a648f33b5
|
Merge branch 'fix/ci-actually-runs-the-obfs4-suite' into 'main'
CI never ran the obfs4 suite, and replayed the others from a local cache
See merge request paulhitt/flamenet-messenger-android!79
|
2026-09-06 19:21:47 +00:00 |
|
Paul Hitt
|
96cbbb7746
|
Merge branch 'feat/obfs4-bridge-settings-ui' into 'main'
A settings screen for the bridge line, and a path for it to reach
See merge request paulhitt/flamenet-messenger-android!78
|
2026-09-06 19:13:20 +00:00 |
|
Paul Hitt
|
9bc7dcf762
|
Merge branch 'feat/obfs4-kotlin-elligator2' into 'main'
obfs4 for Android, part 1: Elligator2
See merge request paulhitt/flamenet-messenger-android!77
|
2026-09-06 18:09:36 +00:00 |
|
Paul Hitt
|
dff6eb29dd
|
Merge branch 'fix/instrumented-suite-catches-up' into 'main'
The on-device suite catches up with the app
See merge request paulhitt/flamenet-messenger-android!76
|
2026-09-06 18:09:16 +00:00 |
|
Paul Hitt
|
518c39682b
|
Merge branch 'fix/relay-probe-says-when-it-fails' into 'main'
"Checking what this server uses…" was also the failure state
See merge request paulhitt/flamenet-messenger-android!75
|
2026-09-05 22:25:12 +00:00 |
|
Paul Hitt
|
d2d5a0b496
|
Merge branch 'feat/report-a-message' into 'main'
Report a message, not just a story
See merge request paulhitt/flamenet-messenger-android!74
|
2026-09-05 18:35:11 +00:00 |
|
Paul Hitt
|
02edf3bc45
|
Merge branch 'ship/android-0-10' into 'main'
Android 0.10 — published
See merge request paulhitt/flamenet-messenger-android!73
|
2026-09-05 18:35:05 +00:00 |
|
Paul Hitt
|
1baa661b63
|
Merge branch 'fix/silent-signin-and-log-leaf' into 'main'
Sign-in that cannot finish now says so, and a missing log leaf heals
See merge request paulhitt/flamenet-messenger-android!72
|
2026-09-05 18:10:47 +00:00 |
|
Paul Hitt
|
ba47041d03
|
Merge branch 'ship/android-0-9' into 'main'
Android 0.9 — published
See merge request paulhitt/flamenet-messenger-android!71
|
2026-09-05 16:05:36 +00:00 |
|
Paul Hitt
|
155168a244
|
Merge branch 'ship/release-notes-gate' into 'main'
An APK no longer ships without a word about what changed in it
See merge request paulhitt/flamenet-messenger-android!70
|
2026-09-05 15:56:54 +00:00 |
|
Paul Hitt
|
76c548c727
|
Merge branch 'fix/files-uses-your-flamenet-passphrase' into 'main'
Files asks for your Flamenet passphrase, not a second secret
See merge request paulhitt/flamenet-messenger-android!69
|
2026-09-05 14:44:03 +00:00 |
|
Paul Hitt
|
94a28ea467
|
Merge branch 'fix/calls-say-when-the-key-changed' into 'main'
Say when a call was refused because the key changed (android#20)
See merge request paulhitt/flamenet-messenger-android!68
|
2026-09-05 14:43:07 +00:00 |
|
Paul Hitt
|
de968ac1aa
|
Merge branch 'test/label-lattice-interop' into 'main'
Expose the security lattice to the interop driver (relay#49)
See merge request paulhitt/flamenet-messenger-android!67
|
2026-09-05 10:40:23 +00:00 |
|
Paul Hitt
|
7d343c5222
|
Merge branch 'test/kotlin-content-interop' into 'main'
Kotlin content interop commands (e2e#4)
See merge request paulhitt/flamenet-messenger-android!66
|
2026-09-05 10:08:12 +00:00 |
|
Paul Hitt
|
6262ac46f9
|
Merge branch 'fix/unsend-tells-the-truth' into 'main'
"Unsend" did not unsend (android#18)
See merge request paulhitt/flamenet-messenger-android!65
|
2026-09-05 02:18:59 +00:00 |
|
Paul Hitt
|
99a33627a4
|
Merge branch 'test/group-pin-resolves' into 'main'
Prove a group pin resolves (relay#46)
See merge request paulhitt/flamenet-messenger-android!64
|
2026-09-05 00:42:43 +00:00 |
|
Paul Hitt
|
17dbb186a8
|
Merge branch 'docs/parity-pq-is-shipped' into 'main'
PARITY: post-quantum is shipped on both clients
See merge request paulhitt/flamenet-messenger-android!63
|
2026-09-05 00:30:05 +00:00 |
|
Paul Hitt
|
e5217f79ce
|
Merge branch 'fix/gradlew-test-on-a-clean-tree' into 'main'
Fix: ./gradlew test now passes on a clean tree (android#5)
See merge request paulhitt/flamenet-messenger-android!62
|
2026-09-04 23:18:12 +00:00 |
|
Paul Hitt
|
8c9fd8f09c
|
Merge branch 'test/inbound-edit-is-applied' into 'main'
Prove an inbound edit is applied (relay#46)
See merge request paulhitt/flamenet-messenger-android!61
|
2026-09-04 22:36:27 +00:00 |
|
Paul Hitt
|
93dd278434
|
Merge branch 'fix/purge-orphaned-attachments' into 'main'
Expired messages no longer leave their plaintext on disk (android#11)
See merge request paulhitt/flamenet-messenger-android!60
|
2026-09-04 22:29:55 +00:00 |
|
Paul Hitt
|
3caaa2172d
|
Merge branch 'docs/live-run-2026-09-04' into 'main'
PARITY: the file round trip is proven live
See merge request paulhitt/flamenet-messenger-android!59
|
2026-09-04 20:55:47 +00:00 |
|
Paul Hitt
|
e3d0c0c121
|
Merge branch 'test/live-file-transfer' into 'main'
A live test for the file round trip, and four published passwords
See merge request paulhitt/flamenet-messenger-android!58
|
2026-09-04 20:50:18 +00:00 |
|
Paul Hitt
|
c47533929e
|
Merge branch 'fix/node-equality-conflated-updates' into 'main'
Fix: promoting a link to the vault appeared to do nothing
See merge request paulhitt/flamenet-messenger-android!56
|
2026-09-04 20:50:11 +00:00 |
|
Paul Hitt
|
730a40141d
|
Merge branch 'feat/files-screen' into 'main'
Files on Android: set up, unlock, browse, add, folders, delete, promote
See merge request paulhitt/flamenet-messenger-android!52
|
2026-09-04 20:49:58 +00:00 |
|
Paul Hitt
|
3615f314b9
|
Merge branch 'feat/files-local-vault' into 'main'
The local Files vault in Kotlin
See merge request paulhitt/flamenet-messenger-android!51
|
2026-09-04 20:49:55 +00:00 |
|
Paul Hitt
|
54f9a1e0fa
|
Merge branch 'feat/files-engine' into 'main'
The Files vault crypto in Kotlin, pinned to the browser's vectors
See merge request paulhitt/flamenet-messenger-android!50
|
2026-09-04 20:49:52 +00:00 |
|
Paul Hitt
|
9c107b7c8d
|
Merge branch 'feat/files-label-lattice' into 'main'
The Files security lattice in Kotlin (labels, clearance)
See merge request paulhitt/flamenet-messenger-android!49
|
2026-09-04 20:49:49 +00:00 |
|
Paul Hitt
|
7bd8784d98
|
Merge branch 'feat/wallet-chain-client' into 'main'
Read a balance and a transaction history from a chain node (Android)
See merge request paulhitt/flamenet-messenger-android!47
|
2026-09-04 20:49:42 +00:00 |
|
Paul Hitt
|
958689b3eb
|
Merge branch 'feat/wallet-store' into 'main'
Create, import and store a wallet (Android engine)
See merge request paulhitt/flamenet-messenger-android!46
|
2026-09-04 20:49:39 +00:00 |
|
Paul Hitt
|
9d2dca803b
|
Merge branch 'feat/wallet-keys-and-address' into 'main'
Derive wallet addresses and sign with them (Android)
See merge request paulhitt/flamenet-messenger-android!45
|
2026-09-04 20:49:36 +00:00 |
|
Paul Hitt
|
8ea8341f03
|
Merge branch 'feat/wallet-engine-primitives' into 'main'
Wallet engine primitives in Kotlin: BIP-39, Base58, SLIP-0010
See merge request paulhitt/flamenet-messenger-android!44
|
2026-09-04 20:49:32 +00:00 |
|
Paul Hitt
|
8466fc1b57
|
Merge branch 'feat/apply-inbound-edits-and-pins' into 'main'
Apply inbound edits and pins instead of filing them as messages
See merge request paulhitt/flamenet-messenger-android!41
|
2026-09-04 20:49:22 +00:00 |
|
Paul Hitt
|
5afa147712
|
Merge branch 'feat/handle-a-wrong-clock' into 'main'
Handle a wrong clock (ios#45, Android half)
See merge request paulhitt/flamenet-messenger-android!38
|
2026-09-04 20:49:12 +00:00 |
|
Paul Hitt
|
e6e7d1cc73
|
Merge branch 'feat/app-lock-backoff' into 'main'
Back off on repeated app-lock attempts (ios#41, Android half)
See merge request paulhitt/flamenet-messenger-android!37
|
2026-09-04 20:49:09 +00:00 |
|
Paul Hitt
|
10dcb53fa6
|
Merge branch 'fix/tests-must-not-publish-credentials' into 'main'
A test run must not publish a credential (ios#62, Android half)
See merge request paulhitt/flamenet-messenger-android!36
|
2026-09-04 20:49:04 +00:00 |
|
Paul Hitt
|
4396c7e8cc
|
Merge branch 'revert/back-to-v8-working' into 'main'
Put the app back to the last state that worked
See merge request paulhitt/flamenet-messenger-android!33
|
2026-09-02 23:03:40 +00:00 |
|
Paul Hitt
|
1f126f2cee
|
Merge branch 'fix/a-403-is-not-an-expired-session' into 'main'
A 403 is not an expired session
See merge request paulhitt/flamenet-messenger-android!32
|
2026-09-02 22:37:23 +00:00 |
|
Paul Hitt
|
ac0ec2e56d
|
Merge branch 'feat/refuse-unsealed-sending' into 'main'
Count the sealed-to-unsealed fallback, and offer to refuse it
See merge request paulhitt/flamenet-messenger-android!29
|
2026-09-02 21:57:16 +00:00 |
|
Paul Hitt
|
1316996ac5
|
Merge branch 'feat/report-or-block-from-a-story' into 'main'
Report or block from a story
See merge request paulhitt/flamenet-messenger-android!28
|
2026-09-02 21:55:44 +00:00 |
|
Paul Hitt
|
ae7c234bf2
|
Merge branch 'feat/group-stories' into 'main'
Post a story to a group
See merge request paulhitt/flamenet-messenger-android!27
|
2026-09-02 21:54:01 +00:00 |
|
Paul Hitt
|
6b2896db86
|
Merge branch 'feat/story-reactions' into 'main'
React to a story with one tap
See merge request paulhitt/flamenet-messenger-android!24
|
2026-09-02 21:53:10 +00:00 |
|
Paul Hitt
|
b25481c262
|
Merge branch 'feat/multi-item-stories' into 'main'
Post several pictures as one story sequence
See merge request paulhitt/flamenet-messenger-android!26
|
2026-09-02 21:48:28 +00:00 |
|
Paul Hitt
|
861b14fcde
|
Merge branch 'feat/private-story-archive' into 'main'
Keep your own stories in a private archive
See merge request paulhitt/flamenet-messenger-android!25
|
2026-09-02 21:47:57 +00:00 |
|
Paul Hitt
|
ddd280092e
|
Merge branch 'feat/story-replies' into 'main'
Reply to a story, as a sealed direct message
See merge request paulhitt/flamenet-messenger-android!21
|
2026-09-02 21:46:58 +00:00 |
|
Paul Hitt
|
03c7855a88
|
Merge branch 'feat/save-your-own-story' into 'main'
Save a story you posted yourself, before it expires
See merge request paulhitt/flamenet-messenger-android!23
|
2026-09-02 21:44:34 +00:00 |
|
Paul Hitt
|
bf728727b0
|
Merge branch 'feat/text-and-link-stories' into 'main'
Post a story that is only words, or a link
See merge request paulhitt/flamenet-messenger-android!22
|
2026-09-02 21:43:56 +00:00 |
|
Paul Hitt
|
021dc2c24d
|
Merge branch 'feat/pin-a-message' into 'main'
Recognise a pinned message (§6.19)
See merge request paulhitt/flamenet-messenger-android!19
|
2026-09-02 20:06:59 +00:00 |
|
Paul Hitt
|
400c910615
|
Merge branch 'feat/search-across-conversations' into 'main'
Search inside messages, across every conversation
See merge request paulhitt/flamenet-messenger-android!16
|
2026-09-02 20:03:43 +00:00 |
|
Paul Hitt
|
5a0a061a34
|
Merge branch 'feat/per-message-timers' into 'main'
A timer on one message, not just the conversation (§6.17)
See merge request paulhitt/flamenet-messenger-android!15
|
2026-09-02 19:59:51 +00:00 |
|
Paul Hitt
|
1fa70b5840
|
Merge branch 'feat/mentions-in-groups' into 'main'
Recognise mentions in a group message (§6.18)
See merge request paulhitt/flamenet-messenger-android!18
|
2026-09-02 19:56:39 +00:00 |
|
Paul Hitt
|
d5c2db4e6e
|
Merge branch 'feat/screenshot-notice' into 'main'
Tell somebody when their disappearing message is screenshotted
See merge request paulhitt/flamenet-messenger-android!30
|
2026-09-02 19:52:14 +00:00 |
|
Paul Hitt
|
397f4fab04
|
Merge branch 'feat/group-messages-carry-a-mid' into 'main'
The transcript records a message id and a reply reference
See merge request paulhitt/flamenet-messenger-android!17
|
2026-09-02 19:50:47 +00:00 |
|
Paul Hitt
|
0dec029917
|
Merge branch 'feat/forward-without-provenance' into 'main'
Recognise a forwarded message (§6.16)
See merge request paulhitt/flamenet-messenger-android!14
|
2026-09-02 19:50:31 +00:00 |
|
Paul Hitt
|
00c043918f
|
Merge branch 'feat/drafts-that-survive' into 'main'
Keep a half-written message across a relaunch
See merge request paulhitt/flamenet-messenger-android!13
|
2026-09-02 19:50:14 +00:00 |
|
Paul Hitt
|
1fc1a561b3
|
Merge branch 'fix/live-signup-guard-must-skip-not-pass' into 'main'
A skipped live sign-up must report skipped, not passed
See merge request paulhitt/flamenet-messenger-android!31
|
2026-09-02 19:48:25 +00:00 |
|
Paul Hitt
|
602ee82a1e
|
Merge branch 'feat/mute-a-contacts-stories' into 'main'
Mute one contact's stories, without blocking them
See merge request paulhitt/flamenet-messenger-android!20
|
2026-09-02 19:48:08 +00:00 |
|
Paul Hitt
|
bf44c15266
|
Merge branch 'feat/edit-a-sent-message' into 'main'
Recognise an edit envelope so it is not drawn as a duplicate (§6.15)
See merge request paulhitt/flamenet-messenger-android!12
|
2026-09-02 19:47:52 +00:00 |
|
Paul Hitt
|
d1a438cdd2
|
Merge branch 'feat/signup-proof-of-work' into 'main'
Solve the sign-up puzzle when a relay asks for one
See merge request paulhitt/flamenet-messenger-android!11
|
2026-09-02 19:47:36 +00:00 |
|
Paul Hitt
|
0271c15ab3
|
Merge branch 'feat/email-verification-ui' into 'main'
Tell somebody their address needs confirming, and let them do it
See merge request paulhitt/flamenet-messenger-android!10
|
2026-09-02 19:47:20 +00:00 |
|
Paul Hitt
|
7958ebd8bb
|
Merge branch 'feat/signup-refusal-messages' into 'main'
Read the relay's refusal code, not just the HTTP status
See merge request paulhitt/flamenet-messenger-android!9
|
2026-09-02 19:47:05 +00:00 |
|
Paul Hitt
|
fa925819d2
|
Merge branch 'fix/v3-responder' into 'main'
Android 0.8 — sign-in identity, v3 responder, media scrubbing
See merge request paulhitt/flamenet-messenger-android!8
|
2026-09-01 22:09:24 +00:00 |
|
Paul Hitt
|
db6ad2a8ce
|
Merge branch 'release-0.7' into 'main'
Release 0.7 — group member lists leave the server
See merge request paulhitt/flamenet-messenger-android!7
|
2026-08-31 21:13:55 +00:00 |
|
Paul Hitt
|
7d823747df
|
Merge branch '9-refuse-production-target' into 'main'
A live suite cannot be pointed at production any more
See merge request paulhitt/flamenet-messenger-android!6
|
2026-08-31 18:47:49 +00:00 |
|
Paul Hitt
|
73d5472fae
|
Merge branch '4-announce-skips' into 'main'
Eighteen tests reported PASSED while running nothing
Closes #4
See merge request paulhitt/flamenet-messenger-android!5
|
2026-08-31 17:56:03 +00:00 |
|
Paul Hitt
|
cc51854fdd
|
Merge branch '2-v3-cross-engine' into 'main'
A v2 peer was being sent a post-quantum ratchet step, and v3 was never advertised
See merge request paulhitt/flamenet-messenger-android!4
|
2026-08-31 17:01:58 +00:00 |
|
Paul Hitt
|
0034a57389
|
Merge branch '3-sealed-groups-ui' into 'main'
The app never actually created a sealed group
Closes #3
See merge request paulhitt/flamenet-messenger-android!3
|
2026-08-31 15:24:58 +00:00 |
|
Paul Hitt
|
16ebf04d4c
|
Merge branch '2-pq-ratchet' into 'main'
Carry post-quantum through every ratchet step, not just the handshake
Closes #2
See merge request paulhitt/flamenet-messenger-android!2
|
2026-08-31 15:18:47 +00:00 |
|
Paul Hitt
|
9ae7b5473d
|
Merge branch '1-sealed-rosters-android' into 'main'
Sealed group membership changes, and secrets that survive a reinstall
Closes #1
See merge request paulhitt/flamenet-messenger-android!1
|
2026-08-31 15:12:30 +00:00 |
|
Paul Hitt
|
10ae4ec180
|
Merge branch 'chore/messenger-signing-key' into 'main'
Sign the messenger with its own key, not Files'
See merge request paulhitt/flamenet-messenger-ios!37
|
2026-08-25 23:55:24 +00:00 |
|
Paul Hitt
|
6ab4741f8c
|
Merge branch 'test/ios-followup-fixes' into 'main'
Six harness defects the full sweep found, and one of mine
See merge request paulhitt/flamenet-messenger-ios!36
|
2026-08-25 23:10:53 +00:00 |
|
Paul Hitt
|
3ef8de63b9
|
Merge branch 'test/ios-two-simulator-and-surface' into 'main'
One sign-up helper, because five copies had the same bug
See merge request paulhitt/flamenet-messenger-ios!35
|
2026-08-25 21:39:35 +00:00 |
|