6770 commits

Author	SHA1	Message	Date
Niels Andriesse	af7ac45b82	Fix various multi device issues	2020-03-11 14:35:55 +11:00
Niels Andriesse	84ec8dffcd	Fix home screen profile picture not using master hex encoded public key	2020-03-11 11:49:19 +11:00
Niels Andriesse	0697c95426	Fix group conversation layout	2020-03-10 15:02:52 +11:00
Niels Andriesse	d2cbf32e35	Fix home screen settings button alignment	2020-03-06 15:59:23 +11:00
Niels Andriesse	a551f7c0ef	Use Crashlytics for internal testing	2020-03-06 11:54:20 +11:00
Niels Andriesse	eb26487d06	Fix new conversation button sizes	2020-03-05 15:01:46 +11:00
Ryan ZHAO	9d2cdef750	fix up unlinking	2020-03-04 15:12:22 +11:00
Ryan ZHAO	9a711a8a61	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into fix-syncing-for-multidevice	2020-03-04 09:26:11 +11:00
Niels Andriesse	4ed1197547	Add comment	2020-03-03 16:26:32 +11:00
Ryan ZHAO	abdbeda8db	finally right this time....	2020-03-03 16:20:17 +11:00
Ryan ZHAO	8a8634984a	deal with the conflicts the right way...	2020-03-03 16:19:24 +11:00
Ryan ZHAO	5bf9d0a68b	deal with the conflicts the right way....	2020-03-03 16:17:46 +11:00
Niels Andriesse	dad7194b50	Update version number	2020-03-03 16:06:34 +11:00
Ryan ZHAO	82bbc5369d	deal with confilcts	2020-03-03 16:05:04 +11:00
Ryan ZHAO	2c20b4381d	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into fix-syncing-for-multidevice	2020-03-03 15:59:00 +11:00
Niels Andriesse	2ef3eead3a	Fix build	2020-03-03 14:34:40 +11:00
Niels Andriesse	33172b3ad7	Fix fade	2020-03-03 14:33:22 +11:00
Ryan ZHAO	fcaff5dac7	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into dev	2020-03-03 14:32:16 +11:00
Niels Andriesse	142867abf9	Remove Session public chat notice	2020-03-03 11:07:25 +11:00
Niels Andriesse	115ad5d852	Add home screen fade, conversation button drag margin & fix crunchy icon	2020-03-03 11:02:41 +11:00
Niels Andriesse	e079f7ba13	Allow user to drag beyond new conversation buttons	2020-03-03 10:00:21 +11:00
Niels Andriesse	64188f74dc	Adjust fonts	2020-03-02 16:45:42 +11:00
Niels Andriesse	ab687a9cc6	Implement new conversation button redesign	2020-03-02 16:27:33 +11:00
Niels Andriesse	de204b3d90	Fix closed group screen title on iPhone 5s	2020-03-02 10:23:34 +11:00
Niels Andriesse	1a77ba51cf	Move file	2020-02-28 10:18:55 +07:00
Ryan ZHAO	b990420c6f	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into sync-open-group	2020-02-28 14:05:36 +11:00
Niels Andriesse	3479fc4333	Reduce code duplication	2020-02-28 09:58:45 +07:00
gmbnt	eebff42412	Merge pull request #104 from RyanRory/sync-closed-group ... Closed group functionality and synchronisation	2020-02-28 09:33:30 +07:00
Ryan ZHAO	f3c649e351	fix the issue of input disappearing after asking for permission of using camera or photo library	2020-02-26 14:11:33 +11:00
Ryan ZHAO	b013c417c3	enable sending sync open group messages	2020-02-25 15:42:38 +11:00
Ryan ZHAO	dfa238a287	wip: fix sync message	2020-02-24 11:52:54 +11:00
Ryan ZHAO	63aafe06a1	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into sync-closed-group	2020-02-21 15:11:20 +11:00
Ryan ZHAO	5c3c00243c	send sync messages with 2 contacts and 1 group each time	2020-02-21 15:11:07 +11:00
Niels Andriesse	e0ef9aac66	Clean	2020-02-21 10:40:44 +07:00
Niels Andriesse	60569bf4c3	Clean	2020-02-21 10:24:03 +07:00
gmbnt	53528184c3	Merge pull request #118 from RyanRory/pn-fix-attachment-issue ... Fix background tasks crashing when PN received	2020-02-21 14:15:06 +11:00
Niels Andriesse	a74dbf9a16	Clean	2020-02-21 10:07:28 +07:00
Niels Andriesse	1b3a1b55cc	Merge branch 'dev' into security	2020-02-21 09:56:35 +07:00
Ryan ZHAO	db2e6f8eec	clean	2020-02-21 11:08:16 +11:00
Niels Andriesse	bf54d78b99	Untie profile picture from auth token	2020-02-20 16:59:05 +11:00
Ryan ZHAO	abb3f2f9b5	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into pn-fix-attachment-issue	2020-02-20 16:14:23 +11:00
Ryan ZHAO	d6f2f6fee2	fix attachment download	2020-02-20 14:41:16 +11:00
Niels Andriesse	26ded1b80a	Clean up notification usage	2020-02-20 13:30:30 +11:00
Niels Andriesse	d99efa1c57	Fix unsafe user defaults usage	2020-02-19 16:45:38 +11:00
Ryan ZHAO	7ed960839e	fix input invisible after creating a closed group	2020-02-18 15:31:20 +11:00
Ryan ZHAO	a245595bc5	use master public key instead of user public key when adding self as a member and an admin	2020-02-18 14:01:48 +11:00
Ryan ZHAO	b206f2944e	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into sync-closed-group	2020-02-17 17:08:55 +11:00
Niels Andriesse	59b3491127	Quick fix crash	2020-02-17 16:46:13 +11:00
Ryan ZHAO	807c862078	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-ios into sync-closed-group	2020-02-17 14:51:28 +11:00
Niels Andriesse	595905ebd0	Forward declare LKSessionResetStatus & clean	2020-02-17 14:48:49 +11:00