8806 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrew	13fce6e562	Merge branch 'dev' into prefix-conversation	2024-03-22 16:22:45 +10:30
Andrew	ebf4f02370	Fix disappearing messages option explanation	2024-03-20 14:28:21 +10:30
Andrew	92c2d574ae	Fix HomeActivityTests	2024-03-20 13:01:44 +10:30
Andrew	d083b19a12	Merge branch 'dev' into on	2024-03-16 14:27:18 +10:30
Andrew	a000ad3cbc	Remove blank space	2024-03-16 00:26:00 +10:30
Andrew	0a10f94fd7	Use new strings 3	2024-03-15 23:52:09 +10:30
Andrew	8a1dcd4261	Fix caret color	2024-03-15 23:37:54 +10:30
Andrew	d1c2750de6	Use new strings 2	2024-03-15 12:37:59 +10:30
Andrew	a67b5f51b9	Use new strings 1	2024-03-15 12:37:49 +10:30
Andrew	4279c4b456	Merge branch 'dev' into on	2024-03-15 10:24:52 +10:30
Andrew	eb98ce961c	Add text selection colors	2024-03-14 14:28:56 +10:30
Andrew	c72f37a9ac	Refactor outlinedTextFieldColors	2024-03-14 13:16:50 +10:30
Andrew	01f6d75968	Add shield icon to Recovery Password Title	2024-03-14 12:56:16 +10:30
Andrew	98e336faee	Remove up button on loading activity	2024-03-14 11:30:50 +10:30
Andrew	4cac496edf	Extract strings	2024-03-13 13:42:05 +10:30
Andrew	ca0206409c	Add QR errors	2024-03-13 13:14:14 +10:30
Andrew	8fc83213ba	Simplify /MnemonicCodec	2024-03-13 13:13:34 +10:30
Andrew	36edca855c	Merge pull request #1430 from bemusementpark/fix-null-display-name ... Fix NPE on null display name	2024-03-13 11:19:09 +10:30
0x330a	3dee7ec6bd	fix: disappearing viewmodel tests (#1432)	2024-03-13 11:31:08 +11:00
Andrew	0dde7297b8	Fix multiple loading activities launched	2024-03-12 20:12:18 +10:30
Andrew	0e7f95dede	Fix camera unbind	2024-03-12 20:11:46 +10:30
Andrew	3cba05e668	Fix NPE on null display name	2024-03-12 11:32:47 +10:30
0x330a	7bcf823740	build: update build number	2024-03-04 17:28:21 +11:00
0x330a	ecc8f6e26f	Merge remote-tracking branch 'upstream/dev'	2024-03-04 17:07:06 +11:00
Andrew	9ceaa97978	Fix tab theming	2024-03-04 16:23:57 +11:00
0x330a	e68290b572	fix: use the visible message view's context instead of the UserDetailsBottomSheet context which is null before showing (#1425)	2024-03-04 15:45:32 +11:00
Andrew	88f4f219f6	Cleanup	2024-03-01 20:23:39 +10:30
Andrew	673e53e4c7	Deduplicate QR success	2024-03-01 19:56:29 +10:30
Andrew	9e270c7ac0	Handle scan recovery phrase QR	2024-03-01 18:46:24 +10:30
Andrew	2555b34d8e	Add QR code outline	2024-03-01 17:24:03 +10:30
Andrew	505d839924	Hide keyboard on open qr tab	2024-03-01 14:24:48 +10:30
Andrew	437d0de5e1	Add camera to QR tab	2024-03-01 11:47:54 +10:30
alansley	b21cdab0e4	Minor cleanup	2024-03-01 11:56:33 +11:00
Andrew	79cfde1924	Add QR camera permissions	2024-02-29 19:33:45 +10:30
Andrew	ab62d8f333	Add Recovery Phrase tab	2024-02-29 14:56:30 +10:30
Andrew	7a1b5749aa	Fade in Copied on copy password	2024-02-28 22:25:51 +10:30
0x330a	f88eab7323	build: update build number	2024-02-28 18:26:28 +11:00
0x330a	b62656b1be	feat: add new config enabled timestamp	2024-02-28 17:54:00 +11:00
0x330a	af1f2983c7	Merge remote-tracking branch 'upstream/master' ... # Conflicts: # libsession/src/main/java/org/session/libsession/messaging/messages/ExpirationConfiguration.kt	2024-02-28 17:52:35 +11:00
0x330a	c2ab92e14d	feat: add new config enabled timestamp	2024-02-28 17:52:02 +11:00
0x330a	1aec56b936	feat: add new config enabled timestamp	2024-02-28 17:51:15 +11:00
0x330a	a4c99799a2	build: update build version	2024-02-28 17:33:56 +11:00
0x330a	ae3ac3c16d	Merge branch 'dev'	2024-02-28 17:30:26 +11:00
Andrew	8432227f38	Rebuild Disappearing Messages	2024-02-28 16:24:00 +10:30
Andrew	a4008af36b	gradle	2024-02-28 14:38:20 +10:30
Andrew	76f8e9867b	Remove logs in UpdateMessageBuilder	2024-02-28 14:25:05 +10:30
Andrew	22460df15e	Fix expiry not added to community invites	2024-02-28 13:34:32 +10:30
Andrew	c2ec2cb358	Add string resources to LandingScreen	2024-02-27 16:23:42 +10:30
Andrew	51f2c3557d	Remove log	2024-02-27 16:20:41 +10:30
Andrew	1c38fc000a	Push empty convos to bottom and hide thread date when unknown	2024-02-27 10:36:13 +10:30