owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,930 Commits 32 Branches 206 Tags
62ac3458b548534cf8a293a42f2e135b8f2bed6c
Commit Graph

5930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sk
0a32c217d8 Merge branch 'main' into pr/FineFindus/557 2023-06-10 21:47:26 +02:00
Eugen Rochko
5dfa9237ad New translations short_description.txt (Persian) 2023-06-10 21:44:47 +02:00
sk
573ff75498 update ancestor when deleting post 2023-06-10 21:32:41 +02:00
sk
87c37df370 insert replied directly below status 
closes sk22#558
 2023-06-10 20:57:01 +02:00
LucasGGamerM
4e21b60087 Merge branch 'master' of https://github.com/LucasGGamerM/moshidon 2023-06-10 14:31:17 -03:00
LucasGGamerM
7c786e55a5 fix: fix follow button on ProfileFragment 2023-06-10 14:30:29 -03:00
sk22
7fb0944e66 Translated using Weblate (German) 
Currently translated at 100.0% (301 of 301 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
 2023-06-10 16:59:16 +00:00
sk
35c8a3d121 change strings 2023-06-10 18:59:05 +02:00
sk
9e58413d1a Merge remote-tracking branch 'weblate/main' 2023-06-10 18:54:32 +02:00
sk
90e60aef84 change auto-reveal cw wording 
closes sk22#562
 2023-06-10 18:53:38 +02:00
sk
8547ce05ed change auto-reveal cw wording 
closes sk22#562
 2023-06-10 18:52:01 +02:00
gicorada
0825faee5c Translated using Weblate (Italian) 
Currently translated at 100.0% (297 of 297 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/it/
 2023-06-10 16:42:23 +00:00
Linerly
d43a697df7 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (297 of 297 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
 2023-06-10 16:42:23 +00:00
Choukajohn
3b742c4391 Translated using Weblate (French) 
Currently translated at 100.0% (297 of 297 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
 2023-06-10 16:42:23 +00:00
ihor_ck
a43a396043 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (297 of 297 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
 2023-06-10 16:42:23 +00:00
Choukajohn
bcb4fac553 Translated using Weblate (French) 
Currently translated at 100.0% (297 of 297 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
 2023-06-10 16:42:23 +00:00
LucasGGamerM
51294bbb14 build(nightly): compile appkit dependency with workflow 2023-06-10 11:18:15 -03:00
LucasGGamerM
5dcda4f37a feat: merge megalodon's always reveal equal spoilers in threads/discussions 2023-06-10 11:00:34 -03:00
LucasGGamerM
33d725acb4 refactor: use isRemote instead of reloadWhenClicked 
Why are my variable naming abilities be so awful?
 2023-06-10 10:44:56 -03:00
LucasGGamerM
fb78ac1243 feat: use megalodon's setting item and strings for remote followers 2023-06-10 10:33:30 -03:00
LucasGGamerM
ccfa614dc7 fix(boost-button): fix it not updating its state on non-boostable items 2023-06-10 10:26:54 -03:00
LucasGGamerM
bc7f614573 refactor: fix compilation problems by refactoring old code 2023-06-09 18:52:08 -03:00
LucasGGamerM
7700288dbe fix: fix compilation problems with isScrolledToTop method not being implemented 2023-06-09 18:31:45 -03:00
LucasGGamerM
e2c62aa76b Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Account.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/display_item_footer.xml
#	mastodon/src/main/res/values/dimens.xml
 2023-06-09 18:09:23 -03:00
sk
35bf858a83 auto-reveal equal spoilers in threads 2023-06-09 14:54:03 +02:00
sk
870bfaf08c don't use switch for android ids 2023-06-09 14:50:21 +02:00
sk
c4238fb19b keep revealed states when reloading 
closes sk22#561
 2023-06-09 13:27:25 +02:00
sk
ba7aeb358b fix thread status not clickable if filter revealed 
closes sk22#554
 2023-06-09 12:50:10 +02:00
sk
6f3fd4d454 fix opening browser twice 
closes sk22#559
 2023-06-09 12:47:32 +02:00
Eugen Rochko
c890195567 New translations strings.xml (Swedish) 2023-06-08 22:57:52 +02:00
Eugen Rochko
b50a327b17 New translations strings.xml (Swedish) 2023-06-08 17:47:06 +02:00
sk
97547f334f returning optionals for the optional god 
closes sk22#555
 2023-06-08 15:31:58 +02:00
sk
1ab953d819 fix spoiler button being hidden while editing 
closes sk22#553
 2023-06-08 15:03:04 +02:00
FineFindus
dbe7eb25ff Merge branch 'main' into feat/hide-non-boostable-boosts 2023-06-08 10:35:12 +02:00
FineFindus
45ecec09f5 feat: hide boost count on non-boostable statuses 2023-06-08 10:33:27 +02:00
FineFindus
9b4556d293 refactor: move boostable check to status 2023-06-08 10:33:27 +02:00
LucasGGamerM
161c19b628 fix(account-sheet): fix wrong coloring for add account drawawble 2023-06-07 21:26:15 -03:00
sk
307d483a56 add comment 2023-06-07 21:59:56 +02:00
sk
9612248695 remove unused imports 2023-06-07 21:51:17 +02:00
sk
1f63401e5b fix pixelfed post editing 2023-06-07 21:50:50 +02:00
sk
d35ec18a88 increase akkoma scheduled posts compatibility 2023-06-07 21:12:38 +02:00
sk
b93b1847c3 increase pixelfed compatibility 2023-06-07 21:12:30 +02:00
sk
cd46ed565f open browser if login redirects to website 2023-06-07 21:11:20 +02:00
sk
4a0e4edef8 load more if screen isn't full yet 2023-06-07 20:28:56 +02:00
sk
2ea7333daa only reload main status when refreshing 
closes sk22#552
 2023-06-07 18:45:50 +02:00
sk
fa7a66809d change profile loading error behavior 2023-06-07 16:09:41 +02:00
sk
71884ab760 don't show wrong relationship with remote accounts 2023-06-07 15:50:30 +02:00
sk
f31205c670 generalize lookup error handling 2023-06-07 15:45:22 +02:00
sk
0091ae87ce fix issues with external share 
closes sk22#550
 2023-06-07 15:17:44 +02:00
LucasGGamerM
c196dc563f fix(follow-more): fix follow more fragment pointing to edit profile 
This was probably made to be used on the create new account procedure, and it was being reused on the Home tab long click action. As we don't have an account creation procedure on Moshidon, we can just stop pointing to the OnboardingProfileSetup fragment
 2023-06-06 19:38:04 -03:00