8927 Commits

Author SHA1 Message Date
Harris
51061cac0e Merge remote-tracking branch 'upstream/dev' into identity_key_encryption 2021-06-08 11:53:38 +10:00
nielsandriesse
411a0dee6f Update build number 1.10.13 2021-06-08 08:38:43 +10:00
nielsandriesse
9568a907fe Clean 2021-06-07 16:43:54 +10:00
nielsandriesse
5761ce959b Fix layout issue 2021-06-07 16:36:05 +10:00
nielsandriesse
7e6cd7c86f Add date breaks 2021-06-07 16:06:37 +10:00
nielsandriesse
2b21f199ea Apply message corner radii 2021-06-07 15:48:22 +10:00
nielsandriesse
34522ede95 Apply inter-message spacing 2021-06-07 15:37:21 +10:00
Harris
f10a99ce41 fix: don't put encrypted in encrypted 2021-06-07 15:23:20 +10:00
Niels Andriesse
2a1b14c954
Merge pull request #596 from Brice-W/minor-fix
Fix Typo
2021-06-07 14:51:53 +10:00
Brice-W
14d401b27a fix 2021-06-07 14:46:54 +10:00
nielsandriesse
e1345a8774 Implement conversation item context menu interaction 2021-06-07 14:04:55 +10:00
Harris
596b02cfaf fix: don't double encrypt on save 2021-06-07 12:00:21 +10:00
Harris
91aefb7c87 feat: upgrade to keystore sealed identity key preferences 2021-06-07 11:53:17 +10:00
nielsandriesse
4ecfd1f230 Re-implement conversation item context menu 2021-06-07 11:37:20 +10:00
nielsandriesse
c0d80d68df Clean 2021-06-07 10:39:22 +10:00
nielsandriesse
d465fecf4c Populate conversation menu 2021-06-07 09:48:01 +10:00
nielsandriesse
3bf5a50439 Fix readability issues & simplify code 2021-06-04 16:32:19 +10:00
Niels Andriesse
7ea399b55d
Merge pull request #525 from Brice-W/zombie-handling-update
Closed Group Fixes
2021-06-04 16:26:53 +10:00
nielsandriesse
3a4ab06df4 Implement basic action mode menu 2021-06-04 15:10:58 +10:00
nielsandriesse
36ba931402 Refactor conversation screen action bar setup 2021-06-04 14:55:53 +10:00
nielsandriesse
db09a50995 Fix animation glitch 2021-06-04 14:27:25 +10:00
nielsandriesse
e0809e5eda Add swipe to reply icon 2021-06-04 14:21:08 +10:00
nielsandriesse
37a0263670 Implement swipe to reply gesture 2021-06-04 13:15:43 +10:00
Brice-W
1d0b61cf89 fix to avoid zombies to be cleared when new group update received 2021-06-04 12:20:21 +10:00
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