Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,228 Commits 31 Branches 161 Tags 107 MiB
Commit Graph

1228 Commits

Author SHA1 Message Date
sk a3b6decb72 Merge remote-tracking branch 'upstream/master' into upstream-release 2023-01-17 02:23:25 +01:00
Gregory K ab3a98fd60
Merge pull request #439 from Poussinou/patch-1 
Update README.md
 2023-01-15 22:15:30 +03:00
Grishka 6e6fdbccd5 Fix #484 2023-01-15 11:40:06 +03:00
Grishka 1764e5f3d1 Paginate trending posts 2023-01-15 11:09:53 +03:00
Grishka 836c493951 Fix #499 2023-01-12 00:40:50 +03:00
Grishka d667b8fa98 Fix #498 2023-01-11 13:06:40 +03:00
Gregory K 6a1032cd61
Merge pull request #492 from tylersaunders/mastodon-photopicker 
Update ComposeFragment to use the photopicker.
 2023-01-11 12:49:19 +03:00
Tyler Saunders 557d535e5a
Update ComposeFragment to use the photopicker. 
The android platform has a great photopicker, and this change checks
for the current device's sdk version, and uses the photopicker if it's
available on the device.

For pre Android R sdkrev2 devices, the experience remains unchanged.
 2023-01-03 17:21:22 +00:00
Gregory K 60517b00f3
Merge pull request #491 from mishnz/master 
Second fix for MIME64 inconsistency in serverKey.
 2023-01-02 14:23:23 +03:00
mishnz faf5e8e82b Merge branch 'master' of https://github.com/mishnz/mastodon-android 2023-01-03 00:16:12 +13:00
mishnz 7264982761 serverKey assignment was missing, corrected. 2023-01-03 00:15:45 +13:00
mishnz fedf74258f
Merge branch 'mastodon:master' into master 2023-01-03 00:06:53 +13:00
mishnz def4960be6 Second fix for MIME64 inconsistency in serverKey. 
The previous fix https://github.com/mastodon/mastodon-android/pull/486 would break any connections to any instances using WEB_SAFE MIME64 encoding on the serverKey, which actually appears to be the usual case.
This update reverts to the previous logic, but also converts standard MIME64 characters ('/' and '+') to their WEB_SAFE equivalents.
This ensures the standard case of WEB_SAFE BASE64 serverKeys and the anomolous case of DEFAULT BASE64 keys both work.
 2023-01-02 23:56:52 +13:00
Eugen Rochko 525cc69c70
Merge pull request #486 from mishnz/master 
The Mastodon server does not currently use URL_SAFE encoding on its s…
 2023-01-01 10:01:17 +01:00
mishnz 7ed1b164b5 The Mastodon server does not currently use URL_SAFE encoding on its serverKey. Using URL_SAFE in this client means the client will crash for any server that uses a key that generates a Mime64 string containing a "+" or "/". This change removes the URL_SAFE logic. See: https://github.com/mastodon/mastodon-android/issues/483 2023-01-01 18:50:09 +13:00
sk aafb08d7b3 Merge remote-tracking branch 'upstream/master' into upstream-release 2022-12-22 01:32:45 +01:00
Gregory K a5fa44213d
Merge pull request #474 from sk22/fix-wrong-visibility-on-edit 
Only load default status visibility if not editing
 2022-12-21 11:25:14 +03:00
sk 68e9d9d91c only load default visibility if not editing 
fix mastodon#306
 2022-12-21 09:24:09 +01:00
Grishka d9df150cf8 Fix #472 2022-12-20 12:14:56 +03:00
Grishka 6f2e5a63d7 This is officially the first Xiaomi workaround in this app 🎉 
#469
 2022-12-19 20:27:56 +03:00
sk 2433d457b6 Merge remote-tracking branch 'upstream/master' into upstream-release 2022-12-17 21:50:33 +01:00
Grishka e0febda372 Minor fixes 2022-12-15 20:16:32 +03:00
Grishka 069d141451 Fix crash in ComposeFragment::onSaveInstanceState in release builds 
fixes #452, fixes #453, fixes #457
 2022-12-15 20:02:26 +03:00
Grishka 166401ea18 Signup flow redesign 2022-12-15 19:41:38 +03:00
sk 9ad0bc2454 fix upstream branch 2022-12-09 14:23:40 +01:00
sk b79c769001 Merge remote-tracking branch 'upstream/master' into upstream-release 2022-12-09 03:16:47 +01:00
Gregory K b79ba71228
Merge pull request #445 from sk22/better-inline-emoji-search 
Improve inline emoji search
 2022-12-08 23:22:24 +03:00
Grishka 2903874dbc Splash fragment redesign 2022-12-08 23:22:10 +03:00
Poussinou 0dcdda75be
fix typo in README 2022-12-08 12:45:28 +09:30
Grishka 202a5f9581 Fix #443 again 2022-12-08 01:48:23 +03:00
sk 622c6d503d improve inline emoji search 
closes #131
closes mastodon#219
 2022-12-07 16:34:52 +01:00
Grishka e10faeefc4 Update languages 2022-12-06 19:18:51 +03:00
Grishka 65dbbb3d61 Fix #443 2022-12-06 18:44:17 +03:00
Grishka fa69868ca1 Merge branch 'l10n_master' 2022-12-06 18:33:35 +03:00
Eugen Rochko 9c18de7b90 New translations strings.xml (Icelandic) 2022-12-06 15:26:12 +01:00
Eugen Rochko 61bd19f6ff New translations strings.xml (Icelandic) 2022-12-06 14:24:50 +01:00
Eugen Rochko ba0689aef7 New translations strings.xml (German) 2022-12-05 21:20:13 +01:00
Eugen Rochko ad54e6bb4b New translations full_description.txt (German) 2022-12-05 20:15:33 +01:00
Eugen Rochko f15fcb43da New translations strings.xml (German) 2022-12-05 20:15:32 +01:00
Eugen Rochko f2557b7815 New translations strings.xml (Thai) 2022-12-05 15:50:40 +01:00
Eugen Rochko a2726f5b61 New translations strings.xml (Vietnamese) 2022-12-05 15:50:39 +01:00
Eugen Rochko a30f5bdee8 New translations strings.xml (Russian) 2022-12-05 12:12:10 +01:00
Eugen Rochko 4cef005286 New translations strings.xml (German) 2022-12-04 21:26:22 +01:00
Eugen Rochko 58a05681fe New translations strings.xml (Turkish) 2022-12-04 20:14:06 +01:00
Eugen Rochko 2589faf499 New translations full_description.txt (Hungarian) 2022-12-04 12:08:30 +01:00
Eugen Rochko a5bdf34289 New translations strings.xml (French) 2022-12-04 10:30:25 +01:00
Eugen Rochko 09fdd7f492 New translations strings.xml (Turkish) 2022-12-04 06:23:19 +01:00
Eugen Rochko 519d8b887d New translations strings.xml (Filipino) 2022-12-03 23:52:40 +01:00
Eugen Rochko a2f2263bf7 New translations strings.xml (Swedish) 2022-12-03 23:52:39 +01:00
Eugen Rochko 5b73b10b34 New translations strings.xml (Russian) 2022-12-03 23:52:38 +01:00