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
7084 commits 3 branches 878 tags 462 MiB
Commit graph

7084 commits

This branch
This branch
All branches
Author SHA1 Message Date
nielsandriesse
23100962e3 Clean 2021-06-02 10:12:49 +10:00
nielsandriesse
19550f7be9 Merge branch 'dev' into ui 2021-06-02 10:00:36 +10:00
Niels Andriesse
25d8d27163
Merge pull request #595 from oxen-io/localization 
Update Translations
 2021-06-02 09:59:46 +10:00
nielsandriesse
86ccc3767e Update translations 2021-06-02 09:53:02 +10:00
nielsandriesse
15d864cd2a Update documentation 2021-06-02 09:38:22 +10:00
nielsandriesse
cf60e541e1 Merge branch 'dev' into ui 2021-06-02 09:20:50 +10:00
nielsandriesse
be96c1b772 Merge branch 'master' of github.com:loki-project/loki-messenger-android into dev 2021-06-02 09:20:38 +10:00
Niels Andriesse
e117a3d2a2
Update bug_report 2021-06-02 09:19:30 +10:00
Niels Andriesse
c8e3174288
Update ISSUE_TEMPLATE 2021-06-02 09:18:34 +10:00
Niels Andriesse
356efb6c9e
Merge pull request #594 from oxen-io/add-code-of-conduct-1 
Create CODE_OF_CONDUCT.md
 2021-06-02 09:16:44 +10:00
Kee Jefferys
3932d2fddd
Create CODE_OF_CONDUCT.md 2021-06-01 17:16:34 +10:00
nielsandriesse
8b084c89b9 Implement conversation activity toolbar 2021-06-01 16:17:14 +10:00
nielsandriesse
dc4a7d0761 Apply correct message bubble margins 2021-06-01 15:43:37 +10:00
nielsandriesse
958cd54b75 Stub views for different message types 2021-06-01 14:56:58 +10:00
nielsandriesse
3b18b0985b Add date break header 2021-06-01 14:38:52 +10:00
nielsandriesse
e177fc4689 Fix outgoing message layout 2021-06-01 14:28:14 +10:00
nielsandriesse
7f3b714401 Add VisibleMessageContentView 2021-06-01 13:26:57 +10:00
nielsandriesse
a23cfbc11d Implement parts of the visible message view 2021-06-01 13:01:03 +10:00
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 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 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 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