TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,977 Commits 46 Branches 892 Tags 481 MiB
680140d128
Commit Graph

6977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Andriesse
b0e54d7e9f Update build number 2021-05-18 10:28:30 +10:00
jubb
573760769c Merge remote-tracking branch 'upstream/dev' into fix_resources 
# Conflicts:
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-ja/strings.xml
 2021-05-18 10:09:26 +10:00
Niels Andriesse
47ff53d559 Remove SignalServiceMessageReceiver 2021-05-18 09:54:16 +10:00
Niels Andriesse
c1548a4e51 Move files 2021-05-18 09:50:16 +10:00
Niels Andriesse
dc8938c269 Move protos 2021-05-18 09:44:06 +10:00
Niels Andriesse
c124f86f6b Move protos 2021-05-18 09:36:20 +10:00
Niels Andriesse
961972a723 Move protos 2021-05-18 09:34:45 +10:00
Niels Andriesse
fa205c8915 Fix packages 2021-05-18 09:29:10 +10:00
Niels Andriesse
c9ebcc580f Move files 2021-05-18 09:26:08 +10:00
Niels Andriesse
40d2fd25d9 Move files 2021-05-18 09:21:56 +10:00
Niels Andriesse
ce3b32c03e Move files 2021-05-18 09:17:22 +10:00
Niels Andriesse
a88322a033 Move files 2021-05-18 09:12:33 +10:00
jubb
0f435ca040 refactor: remove more unnecessary strings from libsession's values 2021-05-17 17:29:39 +10:00
Niels Andriesse
77f0a54aec Update version number 2021-05-17 15:49:44 +10:00
Niels Andriesse
e598d73539
Merge pull request #516 from Brice-W/media-saving 
Fix Saving Media Files
 2021-05-17 15:47:18 +10:00
Niels Andriesse
2172152219
Merge pull request #538 from beantaco/japanese 
More Japanese Translations
 2021-05-17 15:23:45 +10:00
Niels Andriesse
62e96705a4
Merge pull request #540 from oxen-io/open-group-invitations 
Open Group Invitations
 2021-05-17 15:22:07 +10:00
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