TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-20 23:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,020 Commits 46 Branches 892 Tags 484 MiB
Commit Graph

8020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nielsandriesse
d20f81bd2e Merge branch 'dev' into ui 2021-06-01 10:08:10 +10:00
nielsandriesse
d3776ae0e6 Enable data extraction notifications 2021-06-01 10:07:37 +10:00
nielsandriesse
b000be9037 Add isControlMessage convenience variable 2021-06-01 10:02:20 +10:00
nielsandriesse
7710a2c32f Distinguish between control messages and visible messages 2021-06-01 09:48:02 +10:00
nielsandriesse
7ab9d3d8dc Clean remaining message record classes 2021-05-31 16:26:46 +10:00
nielsandriesse
7e9116df9c Clean up MessageRecord 2021-05-31 16:20:46 +10:00
nielsandriesse
1952b0e3be Clean up DisplayRecord 2021-05-31 15:53:25 +10:00
nielsandriesse
7ca940c6aa Merge branch 'dev' into ui 2021-05-31 14:52:12 +10:00
nielsandriesse
b8a85c35c4 Update version number 1.10.12 2021-05-31 14:31:36 +10:00
Niels Andriesse
44ba6384a4
Merge pull request #593 from hjubb/json_deserialisation_fix 
Fix Message Deletion Bug
 2021-05-31 14:30:18 +10:00
nielsandriesse
502d485235 Hook up message body 2021-05-31 14:29:11 +10:00
Harris
2bdb4d18a2 fix: property name for json deserialisation 2021-05-31 14:24:43 +10:00
nielsandriesse
b346a85d57 Add basic conversation screen components 2021-05-31 14:06:02 +10:00
nielsandriesse
1e1e3bf0e8 Update version number 1.10.11 2021-05-31 13:13:50 +10:00
nielsandriesse
e1f3362c2a Fix crash 2021-05-31 13:13:25 +10:00
nielsandriesse
f872c2b9be Prepare for OGS timestamp handling changes 2021-05-31 11:23:37 +10:00
Niels Andriesse
eac0e62e5b
Merge pull request #582 from iArchitSharma/patch-1 
Update README
 2021-05-31 08:25:18 +10:00
Niels Andriesse
b9e2b665e8
Merge pull request #586 from iArchitSharma/patch-2 
Full Hindi Translation
 2021-05-31 08:24:46 +10:00
Archit Sharma
f2a8d50a4d
All Hindi Translation done 2021-05-28 19:56:20 +07:00
Archit Sharma
f771674a08
Fixed typo 2021-05-28 18:46:54 +07:00
nielsandriesse
1262f80a1f Clean up ProfilePictureView 2021-05-28 16:09:15 +10:00
Niels Andriesse
de5d8506cf
Merge pull request #574 from RyanRory/ONS-name-1 
ONS Stage 1
 2021-05-28 15:35:55 +10:00
ryanzhao
e8c52961aa minor fix 2021-05-28 15:14:05 +10:00
ryanzhao
4f7d26d86e debug for new encryption 2021-05-28 12:04:37 +10:00
ryanzhao
a81c17057f Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-28 11:22:58 +10:00
ryanzhao
497405fe50 clean 2021-05-28 11:22:46 +10:00
ryanzhao
c0d4dd741c debug 2021-05-28 11:22:06 +10:00
nielsandriesse
0ef576da73 Update version number 1.10.10 2021-05-28 11:02:55 +10:00
nielsandriesse
e16322977b Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev 2021-05-28 11:01:41 +10:00
nielsandriesse
c6976ca3cd Fix naming confusion 2021-05-28 11:00:49 +10:00
Niels Andriesse
b9461c09f0
Merge pull request #573 from hjubb/fix_message_deletion_ids 
Fix Incorrect Open Group Deletion Usage
 2021-05-28 10:59:16 +10:00
Harris
4a8ce784b8 fix: no longer using the wrong deletion IDs for open group deletions 2021-05-28 10:50:07 +10:00
Ryan ZHAO
a66d2c97e0 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 16:52:12 +10:00
Ryan ZHAO
93dfbcaae2 clean 2021-05-27 16:51:59 +10:00
Ryan ZHAO
592825dcc6 implement get session id from ons name api 2021-05-27 16:23:15 +10:00
Niels Andriesse
193454beec Update build number 1.10.9 2021-05-27 16:19:20 +10:00
Niels Andriesse
bd9db0d248
Merge pull request #521 from hjubb/storage_access_warning 
Don't Use Legacy External Storage
 2021-05-27 16:18:10 +10:00
Niels Andriesse
e71760d08f Update build number 2021-05-27 16:08:13 +10:00
Niels Andriesse
2441d86b32 Make member ordering consistent 2021-05-27 16:07:54 +10:00
Niels Andriesse
ed87961850
Merge pull request #568 from hjubb/improve_background_jobs 
More Efficient Thread Trimming & Database Cleanup
 2021-05-27 16:04:47 +10:00
jubb
72569327a9 Merge remote-tracking branch 'upstream/dev' into improve_background_jobs 2021-05-27 15:45:07 +10:00
jubb
bcff8af159 Merge remote-tracking branch 'upstream/dev' into storage_access_warning 2021-05-27 15:43:59 +10:00
Niels Andriesse
5d262a4bba Update version number 2021-05-27 15:43:44 +10:00
Niels Andriesse
49ee9b9991 Delete unnecessary transaction 2021-05-27 15:39:46 +10:00
Ryan ZHAO
0e89d88459 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 15:32:00 +10:00
Ryan ZHAO
e6cdd3ee0e add logic and UI in create private chat view 2021-05-27 15:31:48 +10:00
Niels Andriesse
877bd68b2d
Merge pull request #570 from oxen-io/performance 
Batch Conversation Updates
 2021-05-27 15:21:14 +10:00
Niels Andriesse
85120b57ea Batch conversation updates 2021-05-27 15:05:15 +10:00
jubb
468b8f25c5 refactor: improve docs 2021-05-27 11:06:47 +10:00
jubb
e389044f25 refactor: remove test logs 2021-05-27 11:05:47 +10:00