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

7963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LucasGGamerM
9e27e21e78 fix(settings): remove duplicate filters item and use fluent icon for Privacy and reach settings 2023-10-01 12:01:48 -03:00
Eugen Rochko
f43352b790 New translations strings.xml (Indonesian) 2023-10-01 16:30:51 +02:00
Grishka
c5b52b2781 Fix default server not loading sometimes 2023-10-01 12:17:21 +03:00
Grishka
b91840fb95 Another attempt to fix ZoomPanView crash v2.1.5 2023-10-01 07:16:21 +03:00
LucasGGamerM
2f8b6acd58 fix(notifications-badge): use correct coloring for inner number 2023-09-30 19:23:01 -03:00
LucasGGamerM
ce9dda4e6e Merge pull request #268 from Henry-Hiles/master 
Change badge color and add manual workflow
 2023-09-30 19:12:50 -03:00
LucasGGamerM
63338a139a refactor(filter-predicate): move client filters to its own function. Also allows for Client filters to completely hide posts 2023-09-30 19:05:50 -03:00
LucasGGamerM
49c2365120 feat(notification-filter): only show on everything tab 2023-09-30 19:05:50 -03:00
Henry Hiles
df06cdb0bb Update nightly-builds.yml 2023-09-30 15:37:42 -04:00
Henry Hiles
fda89a8d36 Change color 2023-09-30 15:35:21 -04:00
sk
1988849b26 Merge remote-tracking branch 'upstream/master' 2023-09-30 21:21:47 +02:00
Grishka
fc10fbffb0 Clear fragment stack instead of restarting activity 
grishka/appkit#13
 2023-09-30 21:53:02 +03:00
LucasGGamerM
3b74a183f8 Merge pull request #267 from Henry-Hiles/patch-1 
Fix typo
 2023-09-30 15:51:10 -03:00
Henry Hiles
41a639bb02 Fix typo 2023-09-30 14:33:21 -04:00
Eugen Rochko
e40841c128 New translations strings.xml (Portuguese, Brazilian) 2023-09-30 20:26:54 +02:00
sk
a21a74a8e7 bonk version v2.1.4+fork.100 2023-09-30 19:26:15 +02:00
LucasGGamerM
8a6c9881e4 fix(translate-button): fix button opacity when loading translation 
cc: @sk22
 2023-09-30 14:25:41 -03:00
sk
20e5d2a545 Merge remote-tracking branch 'upstream/l10n_master' 2023-09-30 19:24:52 +02:00
butterflyoffire
7da363fb87 Translated using Weblate (Arabic) 
Currently translated at 80.3% (310 of 386 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ar/
 2023-09-30 17:23:53 +00:00
sk
c46f78272d Merge remote-tracking branch 'weblate/main' 2023-09-30 19:23:42 +02:00
Tyler Baker
95685d4de8 Feature: Support filtering custom emoji in reaction view (#836) 
* Support filtering custom emojis in reaction keyboard.

* Move creation of EditText to conditional block.

* Clear unused comment

* Update requests variable when publishing filter results so the images displayed will be correct.

* Combine text fields in emoji reaction keyboard, create new initializer for EmojiCategory so it can be copied properly.

* Performance optimization and fixed a typo in filter.

* improve layout

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-09-30 19:21:36 +02:00
LucasGGamerM
d0c5a2ed2e Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/res/layout/display_item_poll_option.xml
#	mastodon/src/main/res/menu/profile_own.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values/strings_sk.xml
 2023-09-30 14:11:39 -03:00
LucasGGamerM
3fceeec362 fix: make hashtag timeline header work properly 2023-09-30 14:10:12 -03:00
FineFindus
cbee0fe72e fix: show individual chips (#838) 2023-09-30 19:04:04 +02:00
FineFindus
6d085ae6f0 fix: show multiline poll options (#837) 
* fix: show multiline poll options

* fix resources not found exception

* don't force height on poll options

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-09-30 19:03:17 +02:00
LucasGGamerM
12cbb7518f fix: make app not crash when opening a hashtag 2023-09-30 13:44:49 -03:00
LucasGGamerM
5220a98082 fix: make app compile again 2023-09-30 13:39:54 -03:00
LucasGGamerM
b9bf1e6601 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.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/discover/SearchFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
#	mastodon/src/main/res/layout/display_item_text.xml
#	mastodon/src/main/res/menu/hashtag_timeline.xml
#	mastodon/src/main/res/values/styles.xml
 2023-09-30 13:32:50 -03:00
LucasGGamerM
4de7211523 Fix notifications replies visibility/language not being consistent with replied status (#831) 
* fix(notifications): make reply visibility consistent with status being replied to

* fix(notifications): make reply language consistent with status being replied to
 2023-09-30 18:30:53 +02:00
FineFindus
05f7a44bd5 fix(timeline/gap): use plurals for time (#829) 
Co-authored-by: sk <sk22@mailbox.org>
 2023-09-30 18:30:18 +02:00
Jacoco
1079f600bc Revert "Fix media layout with unknown sizes" (#827) 
This reverts commit a014fe9443.
 2023-09-30 18:25:52 +02:00
FineFindus
72580dadd0 feat: display blocks and mutes list (#821) 
* feat: add mutes fragment

* feat: add blocks fragment

* refactor: add query params

* rename "mutes" and "blocks"

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-09-30 18:24:24 +02:00
LucasGGamerM
16e04a5a0e feat(notification-filters): basically done with the UI 
Its still missing the under the hood implementation though
 2023-09-30 13:08:10 -03:00
Eugen Rochko
98a02e874b New translations strings.xml (Vietnamese) 2023-09-30 15:05:49 +02:00
butterflyoffire
d219d7aa4b Translated using Weblate (Arabic) 
Currently translated at 78.2% (302 of 386 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ar/
 2023-09-30 03:45:04 +00:00
alextecplayz
68a9fe8376 Translated using Weblate (Romanian) 
Currently translated at 100.0% (386 of 386 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ro/
 2023-09-30 03:45:04 +00:00
LucasGGamerM
098b0885a2 feat(notification-filters): start implementing this 
i am pushing to master because I am THUG LIFE. Jk, its because I wanna throw these strings on weblate
 2023-09-29 21:47:34 -03:00
LucasGGamerM
e8631e432a fix: fix toolbar oopsie 2023-09-29 19:15:53 -03:00
LucasGGamerM
03cb0b3c47 fix: fix missing app icon for stable builds 2.1.4+fork.102.moshinda 2023-09-29 17:14:39 -03:00
LucasGGamerM
53c454a59b build: fix oopsie where I forgot to increase the version code as well 2023-09-29 16:57:43 -03:00
sk
f2f8620312 fix menu item icons and state 2023-09-29 21:45:41 +02:00
LucasGGamerM
d21ae9d94e build: bump version 2023-09-29 16:35:23 -03:00
LucasGGamerM
453f082822 Merge remote-tracking branch 'megalodon_weblate/main' 
# Conflicts:
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	metadata/ar/short_description.txt
#	metadata/id/changelogs/67.txt
 2023-09-29 16:29:16 -03:00
LucasGGamerM
23843e9002 fix: use built-in appkit empty view styles entry and remove hack to apply colors to the empty view texts 2023-09-29 16:23:33 -03:00
LucasGGamerM
232d2e7e6d build: upgrade to appkit 1.2.14 2023-09-29 16:23:33 -03:00
LucasGGamerM
e9d73cbe32 build(CI): use LucasGGamerM's appkit repo 2023-09-29 16:17:14 -03:00
sk
4ee229ea79 Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream 2023-09-29 20:59:12 +02:00
sk
c261214e49 implement new translation 2023-09-29 18:46:26 +02:00
LucasGGamerM
4bb0597edf Merge remote-tracking branch 'mastodon/master' 
# Conflicts:
#	mastodon/build.gradle
 2023-09-29 07:56:14 -03:00
Eugen Rochko
b06df8c3d0 New translations strings.xml (Galician) 2023-09-29 07:53:31 +02:00