oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity
5546 commits 3 branches 878 tags 462 MiB
Commit graph

5546 commits

This branch
This branch
All branches
Author SHA1 Message Date
nielsandriesse fd4ed74892 Merge remote-tracking branch 'ryan/fix-optimized-message-notifier' into dev 2020-07-13 11:52:32 +10:00
nielsandriesse da8bbbc9cf Merge branch 'desktop-protocol-changes' into dev 2020-07-13 11:44:35 +10:00
Niels Andriesse 36dc394ecf
Merge pull request #255 from loki-project/localization 
Integrate French Translation
 2020-07-13 11:32:23 +10:00
nielsandriesse 25ad0bf558 Fix alignment 2020-07-13 11:31:05 +10:00
nielsandriesse efd4b91825 Integrate French translation 2020-07-13 11:22:44 +10:00
ryanzhao caabf4c1bf fix logic error of isCaughtUp 2020-07-10 15:36:23 +10:00
nielsandriesse bd5ec9f401 Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev 2020-07-10 15:24:24 +10:00
nielsandriesse 4e5607f7be Fix crash & friend request handling bug 2020-07-10 15:23:24 +10:00
nielsandriesse bc71bf50aa Fix crash & friend request handling bug 2020-07-10 15:19:12 +10:00
Niels Andriesse 2a57b94bde
Merge pull request #251 from loki-project/localization 
Integrate German Localization
 2020-07-10 14:24:13 +10:00
nielsandriesse 7afb763576 Maintain code style consistency 2020-07-10 14:00:04 +10:00
nielsandriesse 718a3b81f8 Make things fit 2020-07-10 13:41:37 +10:00
Mikunj 69bcfe6c02 Minor fixes 2020-07-10 13:39:05 +10:00
nielsandriesse 31ba4cbb19 Integrate German translation 2020-07-10 13:18:48 +10:00
nielsandriesse bfb260ef53 Add debug assertions 2020-07-10 11:43:45 +10:00
nielsandriesse b3351d7297 Update for desktop protocol changes 2020-07-10 11:09:00 +10:00
nielsandriesse 5a64e1cf3a Make session handling logic consistent with desktop 2020-07-10 09:46:14 +10:00
nielsandriesse 4799c13816 Clean up ahead of protocol changes 2020-07-08 17:05:26 +10:00
nielsandriesse 3124a59269 Merge branch 'fix-notification-spam' into dev 2020-07-08 11:31:07 +10:00
nielsandriesse d09171213d Clean 2020-07-08 11:30:00 +10:00
nielsandriesse 0bec4df0e7 Merge branch 'fix-link-previews' into dev 2020-07-08 10:51:44 +10:00
nielsandriesse a4c5ec823d Reword comment 2020-07-08 10:51:32 +10:00
nielsandriesse 4e672d5b49 Clean 2020-07-08 10:48:09 +10:00
ryanzhao 34f2def122 Drop banned proxy to fix link previews 2020-06-29 14:15:20 +10:00
ryanzhao 2a88de3f61 move old message notifier to optimized message notifier 2020-06-26 16:18:19 +10:00
ryanzhao 871d707460 add optimized message notifier 2020-06-26 16:17:53 +10:00
ryanzhao 7cc60e6173 add flag in public chat poller for catching up 2020-06-26 16:17:15 +10:00
ryanzhao 6fcc26cc22 update local session id and stop polling if local session id has changed 2020-06-25 09:33:44 +10:00
nielsandriesse 106c22d9d2 Update version number 2020-06-23 15:47:03 +10:00
Niels Andriesse d9dfca4d07
Merge pull request #238 from KeeJef/dev 
Add a Space After Inserting a Mention
 2020-06-23 14:26:24 +10:00
nielsandriesse 079f7599f0 Preload device links to make message sending quicker 2020-06-23 13:39:33 +10:00
Niels Andriesse df24a6d8a6
Merge pull request #239 from loki-project/crashes 
Fix Common Crashes
 2020-06-23 12:27:34 +10:00
nielsandriesse b8454f3db2 Fix crash 2020-06-23 12:23:58 +10:00
nielsandriesse e352b2284e Fix crash 2020-06-23 12:17:49 +10:00
nielsandriesse 2189729f45 Fix crash 2020-06-23 12:15:58 +10:00
nielsandriesse 90a8a36486 Fix crash 2020-06-23 12:13:27 +10:00
nielsandriesse c446ba6e58 Fix crash 2020-06-23 12:10:20 +10:00
nielsandriesse 21fab09d6c Fix message action inconsistencies 2020-06-23 11:59:51 +10:00
Haafingar 40bfae9042 fix group member edit icons, improve design 2020-06-22 15:49:18 +10:00
Kee Jefferys 6874cd5bfd Add mention blankspace 2020-06-22 14:05:12 +10:00
Haafingar 6d615fbb9d fix name editing 2020-06-22 13:58:27 +10:00
Haafingar 91af472d3b Add 'add members' functionality and cleanup, refactor 2020-06-22 13:58:27 +10:00
Haafingar 50799d9d90 Load in groupID and process menu options 2020-06-22 13:58:27 +10:00
Haafingar 86b8f90aaf Further UI changes 2020-06-22 13:57:45 +10:00
Haafingar e0c8ae54b6 add edit name UI 2020-06-22 13:57:45 +10:00
Haafingar cd7fd5d51a Design menu layout, build adapters and activities 2020-06-22 13:57:45 +10:00
nielsandriesse 927bcce764 Remove redundant code 2020-06-22 09:02:01 +10:00
Niels Andriesse ee00a4ec50
Merge pull request #237 from KeeJef/dev 
Style All Mentions the Same
 2020-06-22 08:59:49 +10:00
Niels Andriesse bb69780661
Merge pull request #236 from loki-project/protocol 
Update for Upcoming Desktop Protocol Changes
 2020-06-22 08:47:26 +10:00
Kee Jefferys 9db11df567 Style mentions the same 2020-06-19 11:56:00 +10:00