Commit graph

12063 commits

Author SHA1 Message Date
Niels Andriesse 54de8bc221 Update version number 2019-09-13 11:18:58 +10:00
Niels Andriesse b4403defbf Update build number 2019-09-13 10:22:54 +10:00
gmbnt 57891b1f2a
Merge pull request #50 from loki-project/moderator
Moderator Tags
2019-09-12 15:08:00 +10:00
Niels Andriesse a9926f91c9 Undo accidental commit 2019-09-12 15:07:15 +10:00
Niels Andriesse af39b35da7 Clean & implement moderator tags UI 2019-09-12 15:06:20 +10:00
Mikunj f0fda330de Removed old moderator logic. 2019-09-12 14:10:52 +10:00
Mikunj cd6ad75ee6 Added new moderator polling. 2019-09-12 14:10:52 +10:00
Niels Andriesse 052c9176c2 Implement copy public key action for group chats 2019-09-12 13:30:07 +10:00
Niels Andriesse 295bc57a99 Include public key with display names 2019-09-12 11:22:42 +10:00
Niels Andriesse fc1c48f282 Fix deletion permission bug 2019-09-12 10:38:10 +10:00
gmbnt 4c19442221
Merge pull request #49 from loki-project/bug-fix
Stop polling upon deleting group chat.
2019-09-12 10:07:16 +10:00
Niels Andriesse 99e8aa5803 Clean 2019-09-12 10:06:42 +10:00
Niels Andriesse d780c95683 Merge branch 'dev' of github.com:loki-project/loki-messenger-ios into bug-fix 2019-09-12 10:02:15 +10:00
Niels Andriesse f7b66f05a0 Fix group chat quote display name 2019-09-11 16:25:33 +10:00
Niels Andriesse f205767b98 Implement sending quotes in group chats 2019-09-11 14:07:51 +10:00
Niels Andriesse 5569e87485 Implement receiving quotes in group chats 2019-09-11 11:53:47 +10:00
Mikunj f7039809a7 Stop polling upon deleting group chat.
Also don't create poller if thread has been deleted.
2019-09-11 10:40:17 +10:00
Niels Andriesse c780023d63 Fix quote UI 2019-09-11 10:34:51 +10:00
Niels Andriesse aa7ff398db Add beta terms label 2019-09-11 09:58:20 +10:00
Niels Andriesse 4eda27dcc0 Re-enable settings for group conversations 2019-09-10 16:26:45 +10:00
Niels Andriesse 6b0454317e Re-enable search for regular conversations 2019-09-10 15:47:34 +10:00
gmbnt 6f18ddfbb8
Merge pull request #45 from loki-project/profile-icons
Jazz Icons
2019-09-10 13:28:06 +10:00
Niels Andriesse 06804c566c Update Pods 2019-09-10 13:27:26 +10:00
Niels Andriesse 1338fcda21 Clean 2019-09-10 13:26:58 +10:00
Niels Andriesse be00f8c6ad Merge branch 'dev' of github.com:loki-project/loki-messenger-ios into profile-icons 2019-09-10 13:11:16 +10:00
Mikunj 47d5b9bda4 Fix case where user doesn't accept friend request automatically after deleting the conversation. 2019-09-10 09:59:10 +10:00
Niels Andriesse 16be4c32ef Hide link preview cancel button 2019-09-10 09:49:15 +10:00
Mikunj aed740ea3e Merge commit 'dd7e325d39d51662fa8af39b756475300e4b85b4' into profile-icons 2019-09-10 09:14:44 +10:00
Niels Andriesse dd7e325d39 Fix desktop compatibility 2019-09-09 16:51:18 +10:00
Mikunj 05b2e2305b Fix friend requests being accepted straight away when receiving messages in group chats. 2019-09-09 16:23:40 +10:00
Mikunj 0e5ea89fda Merge branch 'dev' into profile-icons 2019-09-09 15:54:08 +10:00
Mikunj 8a3bef0738 Fix link preview crash. 2019-09-09 15:41:43 +10:00
Mikunj 03479fdef1 Friend request fixes. 2019-09-09 15:15:53 +10:00
Mikunj 43a20879e6 Merge branch 'dev' into profile-icons 2019-09-09 13:26:32 +10:00
Niels Andriesse a6aac19c32 Fix RSS feed UI bug 2019-09-06 16:30:40 +10:00
Niels Andriesse 3f6df9a6e5 Fix translations 2019-09-06 15:19:20 +10:00
Niels Andriesse b145186054 Fix incorrect file path 2019-09-06 15:16:45 +10:00
Niels Andriesse 0590e2eb42 Fix various UI issues 2019-09-06 15:16:25 +10:00
Mikunj 4e521bba83 Fixed minor edge case 2019-09-06 12:28:43 +10:00
gmbnt a92db64cd0
Merge pull request #47 from loki-project/link-previews
Link Previews
2019-09-06 12:06:20 +10:00
Niels Andriesse fdb624369c Fix regression 2019-09-06 12:04:28 +10:00
Niels Andriesse 1e0f820eb8 Fix QR code screen UI 2019-09-06 11:58:38 +10:00
Niels Andriesse e0661ec661 Clean up link preview UI 2019-09-06 11:43:13 +10:00
Mikunj 640977267e Minor fix. 2019-09-06 11:34:01 +10:00
Niels Andriesse da00c04a2c Implement link previews for group conversations 2019-09-06 11:28:17 +10:00
Mikunj f230c2ac2c Fix incorrect color handling. 2019-09-06 11:08:13 +10:00
Mikunj b080c7dab9 Fix incorrect RNG implementation 2019-09-06 10:40:11 +10:00
Niels Andriesse a3a64218f9 Implement link previews for regular conversations 2019-09-06 09:35:01 +10:00
Mikunj 1cba6f1ce4 Fix minor hue correction 2019-09-05 15:15:27 +10:00
Mikunj 7b5ce79ddb Fix build. 2019-09-05 14:09:09 +10:00