5765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nielsandriesse	5907b1f5ab	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev	2020-08-19 13:39:51 +10:00
nielsandriesse	c35c08340d	Fix delivery receipts	2020-08-19 13:39:02 +10:00
Anton Chekulaev	2f09440355	Merge fixes.	2020-08-19 13:38:49 +10:00
Niels Andriesse	3d6cd7eff3	Merge pull request #286 from Bilb/minor-string-fixes ... Copy Improvements	2020-08-19 13:00:53 +10:00
Audric Ackermann	1d6b3b3e7a	change backquote to simple quote and Invite Friends to Invite Contacts	2020-08-19 12:17:08 +10:00
Niels Andriesse	e87fbe479a	Merge pull request #285 from loki-project/crashes ... Crash Fixes	2020-08-19 12:15:29 +10:00
nielsandriesse	e1841db991	Fix crash	2020-08-19 12:15:02 +10:00
nielsandriesse	38464bf1f7	Fix crash	2020-08-19 11:53:04 +10:00
Anton Chekulaev	d30465c6ed	Merge branch 'dev' into light-theme	2020-08-19 11:49:49 +10:00
Anton Chekulaev	720afa8fbe	Resource and style cleanup.	2020-08-19 11:48:16 +10:00
nielsandriesse	ac2e4d2ea1	Merge branch 'dev' into crashes	2020-08-19 11:47:35 +10:00
Niels Andriesse	7fc168dfa1	Merge pull request #284 from loki-project/androidx ... Raise Deployment Target & Migrate to AndroidX	2020-08-19 11:46:28 +10:00
nielsandriesse	a5abfc2755	Fix crash	2020-08-19 11:40:34 +10:00
nielsandriesse	75881273d5	Fix crash	2020-08-19 11:36:54 +10:00
nielsandriesse	15d7a073f9	Hopefully fix file loading crash	2020-08-19 11:29:52 +10:00
nielsandriesse	3a1a99b183	Update dependencies	2020-08-19 10:42:46 +10:00
nielsandriesse	6de5b25e97	Only externally define versions that are used multiple times	2020-08-19 10:18:02 +10:00
nielsandriesse	96736a8095	Raise deployment target and migrate to AndroidX	2020-08-19 10:06:26 +10:00
nielsandriesse	6e2cbb23cc	Exclude existing group members from the add members screen	2020-08-18 15:40:24 +10:00
nielsandriesse	a73acae952	Fix home screen layout bug	2020-08-18 13:27:53 +10:00
Niels Andriesse	dadfd17632	Merge pull request #276 from RyanRory/bug-fix ... Fix bugs in the Bug Report 1/2	2020-08-18 13:10:24 +10:00
Niels Andriesse	e84a49bd38	Merge pull request #282 from loki-project/closed-group-editing-2 ... Closed Group Editing	2020-08-18 10:26:39 +10:00
nielsandriesse	43909c3501	Disable member list button	2020-08-18 10:22:21 +10:00
nielsandriesse	f0aa843825	Tweak edit closed group screen layout	2020-08-18 10:05:24 +10:00
nielsandriesse	74dac84796	Implement remaining feedback	2020-08-18 09:34:22 +10:00
nielsandriesse	fdec8eae4b	Fill in stub	2020-08-18 09:01:55 +10:00
nielsandriesse	5b641f4415	Minor refactoring	2020-08-18 08:55:17 +10:00
nielsandriesse	18870b7e7b	Remove unused code	2020-08-18 08:29:03 +10:00
nielsandriesse	d2ea5b32bd	Merge branch 'dev' into closed-group-editing-2	2020-08-17 15:08:03 +10:00
nielsandriesse	5fb569030a	Disable SSKs for now	2020-08-17 14:39:13 +10:00
nielsandriesse	9d9affe4f9	Fix group ID handling	2020-08-17 14:29:24 +10:00
Anton Chekulaev	e4d2e572ca	User cannot remove himself from the edit closed group activity.	2020-08-17 12:12:25 +10:00
Anton Chekulaev	b6b5282a51	Edit closed group activity follows the same data validation as create closed group activity.	2020-08-17 11:10:31 +10:00
Anton Chekulaev	64f3bfd41d	Closed group protocol stub update method.	2020-08-17 10:53:02 +10:00
Anton Chekulaev	3e05a616ce	Edit closed group activity layout refactoring.	2020-08-14 19:26:56 +10:00
Anton Chekulaev	f7923cd8a4	Merge branch 'dev' into editgroup	2020-08-14 17:47:48 +10:00
Anton Chekulaev	f5ff045b5d	Select contacts activity cleanup.	2020-08-14 17:08:28 +10:00
Anton Chekulaev	d9599b984a	User count validation for edit closed group activity.	2020-08-14 16:48:56 +10:00
Anton Chekulaev	15d463161a	Create closed group activity refactoring.	2020-08-14 15:23:06 +10:00
Anton Chekulaev	6664c2baa7	Edit closed group activitiy cleanup.	2020-08-14 14:52:15 +10:00
Niels Andriesse	317b85561a	Merge pull request #277 from loki-project/localization ... Improved Chinese (Simplified) Translation	2020-08-14 09:14:54 +10:00
nielsandriesse	f875924682	Improve Chinese (simplified) translation	2020-08-14 08:51:46 +10:00
Anton Chekulaev	f88558a719	Merge branch 'dev' into editgroup	2020-08-13 17:26:45 +10:00
Niels Andriesse	b5ecb8fd99	Merge pull request #275 from loki-project/shared-sender-keys ... Shared Sender Keys	2020-08-13 10:47:03 +10:00
nielsandriesse	865f4b90ad	Disable SSKs for now	2020-08-13 10:45:24 +10:00
nielsandriesse	cb1aad425a	Fix group leaving	2020-08-13 09:31:04 +10:00
nielsandriesse	2f0135a413	Fix group ID handling	2020-08-13 08:49:17 +10:00
nielsandriesse	bbc7acfcaf	Fix info messages	2020-08-12 16:07:55 +10:00
nielsandriesse	12a6bc724d	Don't send read receipts in groups	2020-08-12 14:06:18 +10:00
nielsandriesse	c88d0f0520	Open group after it's created	2020-08-12 12:22:16 +10:00