Niels Andriesse
6b3aa86324
Minor refactoring
2021-05-17 15:19:36 +10:00
Brice-W
e40609f6a8
clean
2021-05-17 14:19:37 +10:00
Brice-W
059a84f3ce
Merge branch 'dev' of https://github.com/loki-project/session-android into error-handling-group-creation
2021-05-17 14:18:09 +10:00
Brice-W
ff50d2f1fd
error handling if something goes wrong when creating a group
2021-05-17 14:16:04 +10:00
Niels Andriesse
cf3f0fbe57
Minor refactoring
2021-05-17 13:57:18 +10:00
Niels Andriesse
5fd99cd8f1
Fix indentation
2021-05-17 13:50:53 +10:00
Niels Andriesse
33e77dde1e
Fix group deletion
2021-05-17 13:46:17 +10:00
Niels Andriesse
b248b5c52b
Fix build
2021-05-17 13:37:12 +10:00
jubb
eee3824ca0
refactor: running the remove unused resources command and cleaning up strings
2021-05-17 11:56:14 +10:00
Niels Andriesse
11e223f5d8
Merge branch 'dev' into open-group-invitations
2021-05-17 11:42:27 +10:00
Niels Andriesse
0afca61a69
Merge pull request #533 from oxen-io/v2-file-server
...
Use V2 File Server for Uploading
2021-05-17 11:24:45 +10:00
Niels Andriesse
9074355b4e
Fix attachment pointer conversion
2021-05-17 11:23:49 +10:00
Niels Andriesse
361be28223
Fix group deletion
2021-05-17 10:49:27 +10:00
beantaco
4b225c1456
Add new Japanese translations
2021-05-14 10:26:47 +00:00
beantaco
d61b1c05f0
Fix some Japanese translations
...
- In message details, "Disappears" (meant as message lifetime) is translated to "寿命" (lifetime).
- Translation of "decentralized" is changed from "分散型" (distributed) to "非中央集中型".
- "Session ID を入力してください" (translation of "Enter Session ID" tab) is too long and was not expressed in command form. -> "Session ID を入力する"
- "パス" (the translation of "path") could be a translation of "pass" and its meaning is ambiguous, so is changed to "経路" (route).
- "お知らせ" (also a translation of "news" and "announcement") is changed to "通知" (notification), making translation of "notification" more consistent.
2021-05-14 10:26:41 +00:00
Niels Andriesse
3e75ed3cc4
Merge branch 'dev' into v2-file-server
2021-05-14 16:19:57 +10:00
Niels Andriesse
9ab58c2f0c
Clean
2021-05-14 16:05:35 +10:00
Niels Andriesse
92acb50ea7
Merge pull request #537 from hjubb/image_sending_og_fixes
...
Open Group Image Sending Fixes
2021-05-14 15:58:24 +10:00
jubb
8b5134b9ef
fix: fixes the failing insertions possibly composite PK related
2021-05-14 15:55:38 +10:00
Niels Andriesse
3cb2d6c9f4
Update version number
2021-05-14 15:54:07 +10:00
Niels Andriesse
faa8c9443f
Hardcode community guidelines
2021-05-14 15:17:16 +10:00
Niels Andriesse
6e5f75d472
Fix build
2021-05-14 13:53:41 +10:00
Niels Andriesse
9699126ac9
Update copy
2021-05-14 13:52:24 +10:00
Niels Andriesse
816e44a7ec
Update copy
2021-05-14 13:52:05 +10:00
Niels Andriesse
72540aa787
Cancel jobs when thread is deleted
2021-05-14 13:51:47 +10:00
Niels Andriesse
446ff908ba
Clean up RetrieveProfileAvatarJob
2021-05-14 13:51:35 +10:00
Niels Andriesse
43c5fce526
Make chips look better
2021-05-14 13:51:18 +10:00
Niels Andriesse
c9157d33c4
Update copy
2021-05-14 13:31:26 +10:00
Niels Andriesse
2b2756c5e7
Update copy
2021-05-14 13:30:52 +10:00
Niels Andriesse
5eed7a3cdd
Clean
2021-05-14 13:13:02 +10:00
Niels Andriesse
ed9d1c7471
Cancel jobs when thread is deleted
2021-05-14 13:09:40 +10:00
Ryan ZHAO
c82a76b912
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
2021-05-14 11:04:36 +10:00
Ryan ZHAO
c4cd74fca0
fix icons in bottom sheets don't follow the theme color
2021-05-14 11:04:28 +10:00
Brice-W
91c3ec6c7d
Merge branch 'dev' of https://github.com/loki-project/session-android into error-handling-group-creation
2021-05-14 10:56:55 +10:00
Niels Andriesse
88b4388e06
Clean up RetrieveProfileAvatarJob
2021-05-14 10:56:47 +10:00
Brice-W
f5a99b43c7
Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-invitations
2021-05-14 10:32:12 +10:00
Brice-W
8dd606cbb3
join open group code executed in a coroutine so it's not blocking the UI
2021-05-14 10:26:38 +10:00
Niels Andriesse
133bcac17c
Make chips look better
2021-05-14 10:09:12 +10:00
Niels Andriesse
54b93e56a0
Update version number
2021-05-14 08:58:11 +10:00
Niels Andriesse
649bfee647
Fix HTTP utility
2021-05-14 08:56:54 +10:00
Niels Andriesse
61c210837e
Clean
2021-05-14 08:56:25 +10:00
Niels Andriesse
1efd516eaf
Fix HTTP utility
2021-05-14 08:56:08 +10:00
Ryan ZHAO
1d5f7957ab
clean
2021-05-13 16:20:55 +10:00
Niels Andriesse
a2c886468d
Clean
2021-05-13 16:14:54 +10:00
Brice-W
b562aa5738
set notification text
2021-05-13 15:59:24 +10:00
Niels Andriesse
ea71d285b7
Clean
2021-05-13 15:42:14 +10:00
Niels Andriesse
d9348c5442
Remove weird roundabout way of doing decryption
2021-05-13 15:27:08 +10:00
Brice-W
e1b8f10eec
resend invitation if send has failed
2021-05-13 14:57:14 +10:00
Brice-W
2f0509a03b
join open group from received invitation
2021-05-13 14:29:29 +10:00
Ryan ZHAO
7b8a025947
Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname
2021-05-13 14:25:19 +10:00