4939 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mikunj	d58364c9b0	Disable input if we have a pending request to any other linked device and we're not friends with any of them	2019-10-23 15:31:58 +11:00
Mikunj	f24b191164	Re-enable multi-device	2019-10-23 15:31:58 +11:00
Mikunj	21e529c6c9	Forward messages from secondary devices to primary device.	2019-10-23 15:31:58 +11:00
Niels Andriesse	3c5ef19ca7	Enable file attachments	2019-10-23 14:18:11 +11:00
Niels Andriesse	d9ef6bc4c4	Enable voice message attachments	2019-10-23 14:01:39 +11:00
Niels Andriesse	bc750964a8	Fix Giphy link previews	2019-10-23 11:55:17 +11:00
Niels Andriesse	c9a03bbe8a	Update version number	2019-10-22 14:58:32 +11:00
gmbnt	0977ad7ba7	Merge pull request #36 from loki-project/attachments ... Attachments	2019-10-22 11:54:30 +11:00
Niels Andriesse	a08f4caccb	Fix camera button position	2019-10-22 11:25:00 +11:00
Niels Andriesse	4aa1eed979	Debug	2019-10-22 10:09:46 +11:00
Niels Andriesse	17ee4bf7a8	Ditch temporary link preview setup	2019-10-22 09:46:47 +11:00
Niels Andriesse	2d28707687	Switch over to new link preview system	2019-10-22 09:39:42 +11:00
Mikunj	0421794b41	Limit upload retries.	2019-10-22 08:41:57 +11:00
Niels Andriesse	6d0858cf35	Limit allowed characters in display names	2019-10-21 16:28:05 +11:00
Niels Andriesse	f7e01688b0	Disable device linking for now	2019-10-21 15:35:52 +11:00
Niels Andriesse	a978253e00	Fix indentation	2019-10-21 15:26:57 +11:00
Mikunj	e438d09a62	Update attachments for public group chats.	2019-10-21 13:49:38 +11:00
Mikunj	b12e6b838c	Disable attachments on non-friends.	2019-10-18 16:12:49 +11:00
Mikunj	8d6094ecd6	Fix crash when viewing media	2019-10-18 15:16:41 +11:00
Mikunj	fd9f1b712f	Get attachment logic to work.	2019-10-18 12:47:44 +11:00
Mikunj	c6f5adb447	Update attachments to use url.	2019-10-17 12:03:08 +11:00
Mikunj	c8238df8ff	Update checks to isFromUnkownContact.	2019-10-16 14:32:10 +11:00
gmbnt	e8e539c425	Merge pull request #35 from loki-project/custom-server ... Custom Public Chats	2019-10-16 09:19:20 +11:00
Niels Andriesse	a5b543c43c	Move add public chat button to home screen	2019-10-15 16:19:00 +11:00
Niels Andriesse	c2d4f4b58d	Fix mentions bug	2019-10-15 16:07:34 +11:00
Niels Andriesse	cbad885586	Add missing display name update & message fetch	2019-10-15 16:06:38 +11:00
Niels Andriesse	4a613df52d	Clean	2019-10-15 14:32:23 +11:00
Niels Andriesse	65f95839d9	Fix build	2019-10-15 13:51:18 +11:00
Niels Andriesse	08a1b0e947	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into custom-server	2019-10-15 13:42:44 +11:00
Niels Andriesse	a8c4fa22a3	Partially fix build	2019-10-15 13:39:17 +11:00
Niels Andriesse	9aafedd9e5	Clean	2019-10-11 16:40:50 +11:00
Niels Andriesse	e423ec8848	Change mentions approach	2019-10-11 16:37:28 +11:00
Mikunj	2f18c5bad2	Merge branch 'dev' into custom-server ... # Conflicts: # src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt	2019-10-11 15:40:09 +11:00
Mikunj	4657b79179	UI improvements.	2019-10-11 15:38:15 +11:00
Niels Andriesse	ca9032e109	Quick fix crash	2019-10-11 14:59:13 +11:00
Niels Andriesse	0f364fcea7	Render mentions in previews & refactor	2019-10-11 14:41:43 +11:00
Niels Andriesse	48d282a864	Require the user to pick a display name	2019-10-11 13:37:56 +11:00
Niels Andriesse	b425929da6	Render mentions in replies	2019-10-11 13:24:20 +11:00
Niels Andriesse	57bbad6fab	Debug	2019-10-11 12:02:02 +11:00
Mikunj	b676c25930	Add UI	2019-10-11 11:53:53 +11:00
Niels Andriesse	18eb3449ca	Debug	2019-10-11 11:42:01 +11:00
Niels Andriesse	7ea349ff00	Mention by display name rather than hex encoded public key	2019-10-11 11:13:34 +11:00
Mikunj	13d42f542c	Added public chat manager. ... Replace hard coded public chat server with dynamic one.	2019-10-11 09:36:52 +11:00
Niels Andriesse	3d78dac65c	Ensure that mention behavior is consistent cross-platform	2019-10-10 16:29:58 +11:00
gmbnt	20f303b2a2	Merge pull request #33 from loki-project/mentions ... Mentions V1	2019-10-10 15:41:00 +11:00
Niels Andriesse	8261f83484	Fix user selection view cell highlight color	2019-10-10 15:40:11 +11:00
Niels Andriesse	f0224f8ec6	Debug	2019-10-10 15:30:34 +11:00
Niels Andriesse	871f629e64	Debug	2019-10-10 15:00:14 +11:00
Niels Andriesse	25f1405512	Show user selection view dynamically	2019-10-10 14:44:08 +11:00
Niels Andriesse	9207e479a6	Implement user selection view	2019-10-10 13:53:02 +11:00