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
7,753 Commits 46 Branches 892 Tags 484 MiB
Commit Graph

7753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brice-W
6fb461f7d8 reset zombie members list if group already exists 2021-06-04 11:24:01 +10:00
nielsandriesse
10ec35bd74 Fix conversation updating & stack messages from end 2021-06-04 09:58:04 +10:00
nielsandriesse
f4ca2f2726 Merge branch 'dev' into ui 2021-06-04 08:40:55 +10:00
nielsandriesse
d09d6aa0a7 Update version number 2021-06-04 08:38:55 +10:00
nielsandriesse
051dc698d7 Fix German translation 2021-06-04 08:37:30 +10:00
nielsandriesse
7b930ad08f Update translations 2021-06-04 08:35:38 +10:00
Brice-W
807e1042ca make update messages not selectable 2021-06-03 14:43:23 +10:00
Brice-W
2c7730260d fix case where closed group was impossible to delete 2021-06-03 14:08:13 +10:00
Brice-W
1a117b0189 Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update 2021-06-03 11:51:57 +10:00
nielsandriesse
9a0e5e7b6c Make room for triple dot menu 2021-06-02 13:28:02 +10:00
nielsandriesse
9397f02272 Add missing bind(_:) calls 2021-06-02 13:14:36 +10:00
nielsandriesse
dfd9bd89f9 Fix colors 2021-06-02 13:03:22 +10:00
nielsandriesse
43fbc3de55 Clean up create private chat screen 2021-06-02 11:34:30 +10:00
nielsandriesse
9888f23789 Fix ugly color 2021-06-02 11:00:40 +10:00
nielsandriesse
d8ba01cf5d Clean up join open group screen 2021-06-02 10:51:36 +10:00
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 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