owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,756 Commits 32 Branches 206 Tags
3eee865620036e65297fa638fcc067da578367b6
Commit Graph

3756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
LucasGGamerM
2969a3e4fd Including @FineFindus on the changelog 2023-01-01 19:41:42 -03:00
LucasGGamerM
e1fcf44aa6 Adding more stuff onto the changelog 1.1.4+fork.82.moshinda 2023-01-01 19:28:26 -03:00
LucasGGamerM
ddbfe9de57 Changelog for 82 and updating screenshots 2023-01-01 19:25:17 -03:00
LucasGGamerM
b2ee1527af Bump version number 2023-01-01 19:17:40 -03:00
LucasGGamerM
c94706745f Merge pull request #17 
German translation
 2023-01-01 19:13:13 -03:00
LucasGGamerM
8aef61ff09 Second iteration of the bot icon 2023-01-01 19:12:29 -03:00
Tobias S
5d6e245ec2 Merge branch 'LucasGGamerM:master' into master 2023-01-01 22:13:11 +01:00
dontobi
8dd4d1a41d German translation 2023-01-01 22:12:36 +01:00
LucasGGamerM
10f9230139 First iteration of the bot account tag 2023-01-01 18:06:26 -03:00
LucasGGamerM
32c94c8948 Merge remote-tracking branch 'origin/master' 2023-01-01 17:24:23 -03:00
LucasGGamerM
4b947dd1f9 Merge pull request #16 
feat(profile) add icon to bot accounts
 2023-01-01 17:24:06 -03:00
LucasGGamerM
93a7d86f78 Merge branch 'development' 
# Conflicts:
#	mastodon/src/main/res/values-de-rDE/strings_sk.xml
 2023-01-01 17:21:32 -03:00
LucasGGamerM
6ed3a57c58 Rebranding Megalodon to Moshidon. 
Here is the command in case anyone is interested
find values* -type f -exec sed -i 's/Megalodon/Moshidon/g' {} \;
 2023-01-01 17:16:45 -03:00
LucasGGamerM
ecdba3898f Merge pull request #15 
German translation fix
 2023-01-01 17:14:36 -03:00
LucasGGamerM
d82a9b25cf Revert "Revert "match navigation bar color with toolbar"" 
This reverts commit 0fdae0c775.
 2023-01-01 17:12:29 -03:00
LucasGGamerM
da4849e526 Removing unnecessary needAppRestart on the relocatePublishButton setting 2023-01-01 17:11:33 -03:00
LucasGGamerM
da1b47ea0d Adds a whole lot of icons for the relocated publish button 2023-01-01 17:09:49 -03:00
LucasGGamerM
a617693f93 Add a drafts icon on the relocated publish button 2023-01-01 16:53:31 -03:00
LucasGGamerM
f4c573a95e Readding the relocated publish button 2023-01-01 16:28:04 -03:00
LucasGGamerM
d3476c1473 Deleting metadata 2023-01-01 10:49:48 -03:00
LucasGGamerM
d58247d996 Editing the padding and making the 3 dot menu invisible 2023-01-01 10:49:34 -03: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
LucasGGamerM
ee441d5b4a Glory! it finally works! 2022-12-31 21:46:37 -03:00
LucasGGamerM
97a5c6f5cb Bringing back the verify for updates button 2022-12-31 21:27:12 -03:00
LucasGGamerM
b6566a2bcc It works now? 2022-12-31 21:23:50 -03:00
LucasGGamerM
af389f7a47 Its as broken as it was before 2022-12-31 20:35:29 -03:00
LucasGGamerM
45577fc423 The settings page is unfucked again 2022-12-31 20:24:14 -03:00
sk
c00b9b3035 fix empty space when no text 2022-12-31 20:05:12 -03:00
sk
f17879783c tweak scroll height/timing 2022-12-31 20:05:08 -03:00
sk
08dfcdf508 Revert "match navigation bar color with toolbar" 
This reverts commit 43d334259b.
 2022-12-31 20:05:03 -03:00
sk
c97e8fffc4 add option to reduce motion 2022-12-31 20:04:53 -03:00
sk
120585954f peek original post before scrolling 2022-12-31 20:00:12 -03:00
sk
247669644c display original post when replying 
closes sk22#193
 2022-12-31 20:00:05 -03:00
sk
ff15bdeaea change interact with strings 2022-12-31 20:00:02 -03:00
ihor_ck
8b67320e20 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
 2022-12-31 19:59:00 -03:00
gallegonovato
48828ed1b7 Translated using Weblate (Spanish) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/es/
 2022-12-31 19:58:53 -03:00
Linerly
1e615db77e Translated using Weblate (Indonesian) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/id/
 2022-12-31 19:58:47 -03:00
Choukajohn
629416ef2f Translated using Weblate (French) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
 2022-12-31 19:58:40 -03:00
ihor_ck
d6b1c88085 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (121 of 121 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
 2022-12-31 19:58:34 -03:00
Linerly
3b7079be17 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (121 of 121 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
 2022-12-31 19:58:34 -03:00
Choukajohn
48d26017b6 Translated using Weblate (French) 
Currently translated at 100.0% (121 of 121 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
 2022-12-31 19:58:34 -03:00
gallegonovato
8bdbe1c4d7 Translated using Weblate (Spanish) 
Currently translated at 100.0% (121 of 121 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
 2022-12-31 19:58:33 -03:00
bubblineyuri
4093443bf8 Translated using Weblate (German) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
 2022-12-31 19:58:32 -03:00
bubblineyuri
c6709aba56 Translated using Weblate (German) 
Currently translated at 100.0% (121 of 121 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
 2022-12-31 19:58:24 -03:00