Commit graph

608 commits

Author SHA1 Message Date
Ryan ZHAO ca723a3796 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 12:01:22 +10:00
Ryan ZHAO 30c7a4c1bb fix nickname in group creating & editing 2021-05-20 12:01:08 +10:00
Niels Andriesse 039b667f59
Merge pull request #546 from hjubb/fix_missing_deps
Use Maven Central Instead of Bintray
2021-05-20 11:53:08 +10:00
Ryan ZHAO 38ed5c2187 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 11:15:24 +10:00
Niels Andriesse 6ac534482f Update version number 2021-05-20 09:04:55 +10:00
nielsandriesse 747a27ddda Add file server instability modal 2021-05-19 15:25:36 +10:00
Harris 99e6382f2e refactor: use lazysodium version on maven central instead of bintray (no longer available) 2021-05-19 15:12:35 +10:00
nielsandriesse e79d23c910 Add "Help us Translate Session" button 2021-05-19 13:47:04 +10:00
nielsandriesse 588f9ed8cd Remove entirely untranslated languages 2021-05-19 13:27:08 +10:00
Niels Andriesse 984add5d09
Merge pull request #544 from hjubb/fix_resources
Remove Unused Resources + Updating Translations
2021-05-19 11:28:20 +10:00
nielsandriesse 7ba116c1df Switch to new open group manager 2021-05-19 11:12:29 +10:00
Harris 84e8418d57 Merge remote-tracking branch 'upstream/dev' into origin/fix_resources 2021-05-19 10:57:47 +10:00
nielsandriesse f8ed7690ca Refactor OpenGroupManager 2021-05-19 10:56:23 +10:00
nielsandriesse fda66d3f5d Refactor V2 open group poller 2021-05-19 10:03:31 +10:00
nielsandriesse 80c90fa53d Remove incorrectly maintained & unused value 2021-05-19 09:03:49 +10:00
nielsandriesse 2a3d06e485 Fix duplicate message handling 2021-05-19 08:56:44 +10:00
jubb 3acbbc1229 refactor: add latest translations (and repeats) 2021-05-18 16:43:45 +10:00
Niels Andriesse 6243443262 Move files 2021-05-18 16:11:38 +10:00
Niels Andriesse 4078a9c4b5 Move files 2021-05-18 16:03:47 +10:00
Niels Andriesse ab83e49f93 Remove duplicated/unused code 2021-05-18 15:55:24 +10:00
Niels Andriesse 918e1ea3cf
Merge pull request #542 from Brice-W/error-handling-group-creation
Improved Group Creation Error Handling
2021-05-18 15:05:32 +10:00
Niels Andriesse 68225e00be Clean 2021-05-18 14:45:37 +10:00
Niels Andriesse 7c3bee036c Speed up Gradle sync 2021-05-18 14:18:16 +10:00
Niels Andriesse 8a20c46bd4 Fix missing compile target 2021-05-18 14:08:21 +10:00
jubb ac198bd705 refactor: add in missing resource and removing broken folders preventing build 2021-05-18 14:05:45 +10:00
Niels Andriesse cd1171ba84 Clean up app Gradle file 2021-05-18 13:34:40 +10:00
Niels Andriesse 81b0530163 Clean up libsession Gradle file 2021-05-18 13:27:51 +10:00
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 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 6b3aa86324 Minor refactoring 2021-05-17 15:19:36 +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 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