4906 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mikunj	f7b2312f99	Merge commit '1ec1717c9984593b6b31c672bfe467ece002abb5' into private-group-chat	2020-02-04 08:31:50 +11:00
Mikunj	9d0f40a18f	Allow leaving from a secondary device.	2020-02-04 08:31:38 +11:00
Niels Andriesse	1ec1717c99	Fix typo	2020-02-03 21:08:09 +11:00
Niels Andriesse	8233be77e9	Merge branch 'closed-groups-ui' of github.com:loki-project/loki-messenger-android into private-group-chat	2020-02-03 21:02:00 +11:00
Mikunj	a61f9b4eb7	Don't set friend request on messages to ourselves	2020-02-03 16:00:05 +11:00
Mikunj	44a0a428f5	Don't send a friend request message to a group.	2020-02-03 13:53:58 +11:00
Mikunj	60aa7f6ae3	Fix friend request accept message showing up in group chats. ... Fix crash.	2020-02-03 12:08:11 +11:00
Mikunj	353f456ae2	Accept session request if it was sent by a member of our group or if it was sent by one of our friends.	2020-02-03 10:52:15 +11:00
Mikunj	d5420de0b7	Hookup group creation to activity	2020-02-03 10:23:24 +11:00
Mikunj	ea28bd2e6f	Merge branch 'closed-groups-ui' into private-group-chat	2020-02-03 08:46:18 +11:00
Mikunj	a7ea2f01a2	Don't use envelope to determine friend request	2020-01-31 16:15:04 +11:00
Mikunj	73ec256745	Merge branch 'dev' into private-group-chat	2020-01-31 15:33:59 +11:00
Mikunj	81b4259dab	Merge branch 'dev' into private-group-chat	2020-01-31 15:29:31 +11:00
gmbnt	42eb8ef9d1	Merge pull request #67 from loki-project/sealed-sender ... Sealed sender	2020-01-31 15:14:34 +11:00
Mikunj	9e7ad2eb76	Merge branch 'dev' into sealed-sender	2020-01-31 14:48:59 +11:00
gmbnt	8628f4c63e	Merge pull request #66 from loki-project/file-server-proxy ... File server and RSS feed proxy	2020-01-31 14:42:48 +11:00
Mikunj	8aa46aebec	Merge branch 'dev' into sealed-sender	2020-01-31 14:32:30 +11:00
Niels Andriesse	7610314165	Exclude linked devices from group member options	2020-01-31 14:23:53 +11:00
Mikunj	76c2fdf9d2	Added rss feed proxy	2020-01-31 14:09:11 +11:00
Niels Andriesse	998d03b258	Implement create closed group screen	2020-01-31 13:57:24 +11:00
Niels Andriesse	d7f1b86615	Remove legacy code	2020-01-31 12:50:25 +11:00
gmbnt	398aa59d48	Merge pull request #64 from loki-project/combine-repos ... Update build.gradle to work with repo combine	2020-01-31 11:31:03 +11:00
Niels Andriesse	cb8e9bda0e	Clean	2020-01-31 11:30:32 +11:00
Mikunj	5fa6e5a75c	Enable sealed sender by default	2020-01-30 10:07:29 +11:00
Mikunj	62d391085b	Stop relying on SignalServiceEnvelope and instead use SignalServiceContent to determine message sender and friend request	2020-01-30 10:07:29 +11:00
Mikunj	01f5ff7c86	Fix up build gradle.	2020-01-30 10:07:29 +11:00
Mikunj	c4ead7b1b0	Update build.gradle to work with repo combine	2020-01-30 10:02:16 +11:00
gmbnt	2fec819b48	Merge pull request #57 from loki-project/disable-sms ... Disable insecure sms option	2020-01-28 11:31:57 +11:00
Niels Andriesse	5afe402b95	Update build number	2020-01-28 11:17:12 +11:00
gmbnt	2781c30d7a	Merge pull request #55 from loki-project/session-restore ... Session restore	2020-01-28 11:14:31 +11:00
Niels Andriesse	3e0cf28d0a	Undo debug setup	2020-01-28 11:13:35 +11:00
Niels Andriesse	2823c0ce5d	Clean up UI	2020-01-28 11:13:07 +11:00
Niels Andriesse	2ea009b05b	Clean	2020-01-28 10:52:06 +11:00
Niels Andriesse	f91b493dd3	Clean	2020-01-28 10:38:47 +11:00
Niels Andriesse	30a8e97ac0	Clean	2020-01-28 10:38:28 +11:00
Niels Andriesse	e3c54c21d1	Merge branch 'dev' into session-restore	2020-01-28 10:36:46 +11:00
gmbnt	299d81f4dc	Merge pull request #63 from loki-project/proxy ... Snode proxy	2020-01-28 10:19:07 +11:00
Niels Andriesse	438b33d355	Clean	2020-01-28 10:18:18 +11:00
Niels Andriesse	460f25629b	Don't show seed reminder after restoring from seed	2020-01-28 09:30:26 +11:00
Niels Andriesse	4595b12833	Update build number	2020-01-24 10:02:08 +11:00
Niels Andriesse	25cd9e6cc7	Clean	2020-01-24 10:00:20 +11:00
Niels Andriesse	93e1cd7756	Fix public chat deletion	2020-01-24 09:59:37 +11:00
Niels Andriesse	60da6dc58c	Replace Loki Messenger → Session	2020-01-23 16:49:21 +11:00
Niels Andriesse	5bcf7940a0	Fix copy	2020-01-23 16:48:03 +11:00
Niels Andriesse	42b4ce1112	Commit missing file	2020-01-23 10:30:54 +11:00
Niels Andriesse	9b01282f61	Clean	2020-01-23 10:25:22 +11:00
Mikunj	f7197ca1de	Update how swarms are stored in the database.	2020-01-23 10:14:41 +11:00
Niels Andriesse	1e014a690f	Clean	2020-01-22 15:28:39 +11:00
Niels Andriesse	d0225bdffb	Fix notification display name	2020-01-22 15:11:14 +11:00
Niels Andriesse	61976ac363	Update build number	2020-01-22 13:43:45 +11:00