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

2312 Commits

Author SHA1 Message Date
LucasGGamerM
665a0176b9 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/layout/fragment_splash.xml
 2023-04-14 14:27:42 -03:00
sk
15fcb0e25d fix alt badge padding and margin 2023-04-13 23:17:46 +02:00
sk
3ad46926f1 Merge remote-tracking branch 'upstream/master' 2023-04-13 21:46:45 +02:00
LucasGGamerM
74f2bb4707 feat: add remote lookups to the PaginatedAccountListFragment 2023-04-13 16:08:26 -03:00
LucasGGamerM
76a85af0d7 fix: make remoteLookups not resolve other instance's data 
This was done because unauthenticated users cannot access them.
 2023-04-13 16:04:19 -03:00
LucasGGamerM
5d7363585a feat: add remote lookup functions in UiUtils 
This will help when getting remote status's interactions, and remote accounts' followers and follows
 2023-04-13 15:08:41 -03:00
Grishka
9e116bec97 Merge branch 'master' into m3_redesign 
# Conflicts:
#	mastodon/build.gradle
 2023-04-12 19:41:39 +03:00
LucasGGamerM
8b27e6de33 fix: long click boost button actions on customlocaltimelines 
Before, you just couldnt reblog something with the unlisted visibility directly from the custom local timelines, now you can! And there are some small adjustments to the behavior.
 2023-04-12 13:32:22 -03:00
Grishka
4ef18f1f4a Add touch interaction for the SplashFragment art 2023-04-12 19:20:23 +03:00
LucasGGamerM
4c698cf217 feat: make confirm reblog setting consistent on customlocaltimelines 
Make it so there is also a confirmation to reblog on custom local timelines
 2023-04-12 13:12:57 -03:00
LucasGGamerM
05217b7712 refactor: move confirm reblog setting to behavior tab 2023-04-12 13:10:21 -03:00
LucasGGamerM
64e681c227 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/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	metadata/de-DE/changelogs/83.txt
#	metadata/en-US/changelogs/83.txt
 2023-04-12 13:04:31 -03:00
Grishka
eef33266fc Remove unused code and strings 2023-04-12 18:34:28 +03:00
LucasGGamerM
2cea6a9df5 Merge branch 'master' of https://github.com/LucasGGamerM/moshidon 2023-04-10 15:17:14 -03:00
LucasGGamerM
d6d6155f2c refactor: move LatestNotificationID preference away from GlobalUserPreferences 
This is solely for the purpose of organization, as I think GlobalUserPreferences should only directly contain Global user preferences
 2023-04-10 15:14:47 -03:00
LucasGGamerM
f39690b7e5 Merge pull request #160 from FineFindus/fix/sign-in-flow 
fix: use BuilType defined REDIRECT_URI
 2023-04-10 07:34:19 -03:00
LucasGGamerM
0a1c42f90b feat: add nightly auto updater 2023-04-09 10:56:41 -03:00
FineFindus
a59587eb62 fix(auth): use BuildType depended redirect uri 2023-04-09 15:46:30 +02:00
FineFindus
7615723d4f refactor(auth): use REDIRECT_URI 2023-04-09 15:07:22 +02:00
LucasGGamerM
1f4970c0d2 fix: NPE when instance is null and attempts to get new notifications 
For some weird reason, someone saw a pixelfed instance return null as the instance, causing a crash on the updateNotificationsBadge method. This reminds me of why java is such a shit language
 2023-04-08 15:53:40 -03:00
LucasGGamerM
e9833baaa4 Merge pull request #157 from FineFindus/fix/notification-id 
fix(notification): overwriting IDs
 2023-04-07 21:30:21 -03:00
Grishka
42a7c324fa Merge branch 'master' into m3_redesign 2023-04-07 23:16:53 +03:00
Grishka
924ea2d03a Fix #557 2023-04-07 22:58:04 +03:00
Grishka
4f8d8f0c8d Welcome fragment redesign again 
# Conflicts:
#	mastodon/src/main/res/values/strings.xml
#	mastodon/src/main/res/values/styles.xml
 2023-04-07 22:44:28 +03:00
Grishka
849888d128 Welcome fragment redesign again 2023-04-07 22:40:00 +03:00
sk
df93a1a845 increase max height 2023-04-07 18:42:18 +02:00
sk
41a70a353c distinct default languages 
closes sk22#487
 2023-04-07 18:21:23 +02:00
sk
0ef30f82a7 fix disappearing no-alt indicator 
closes sk22#484
 2023-04-07 17:16:45 +02:00
sk
be60e78ea6 improve external share behavior 2023-04-07 16:58:02 +02:00
sk
0a04c9357c Revert "display reblog popup by default" 
This reverts commit 21c4cef397.

okay, so, i think i'll keep reblog as a default. i fear that exposing everyone
to an overwhelming menu (you literally have to *decide* for a visibility!)
when just pressing reblog might not be a good idea. i'll just have "confirm
before reblogging" as an option in the settings instead
https://floss.social/@megalodon/110157968813469351
 2023-04-07 16:20:29 +02:00
sk
21c4cef397 display reblog popup by default 2023-04-07 16:04:35 +02:00
sk
4b2fcd760a add option to confirm before reblog 
closes sk22#456
 2023-04-07 15:29:43 +02:00
sk
9824b5fb56 allow boosting with every visibility 
closes sk22#486
 2023-04-06 20:24:40 +02:00
FineFindus
dd4bad706b fix(notification): saved used ids 2023-04-05 19:54:26 +02:00
LucasGGamerM
5d253a39b2 refactor: move the auto-updater settings to match megalodon 2023-04-03 17:10:27 -03:00
LucasGGamerM
e84a92fedc feat: add link to up-to-date nightly build in settings 2023-04-03 17:09:07 -03:00
LucasGGamerM
6bc6aca17e refactor: remove the auto updater from nightly builds 2023-04-03 16:49:25 -03:00
LucasGGamerM
9bcae3f893 Revert "fix: actually fixing the crash on change of themes on nightly builds" 
This reverts commit 6d094af6d5.
 2023-04-02 20:00:15 -03:00
LucasGGamerM
6d094af6d5 fix: actually fixing the crash on change of themes on nightly builds 2023-04-02 19:52:44 -03:00
LucasGGamerM
bcac023d33 feat: add a toggle for swapping between reblog and bookmark notification actions 2023-04-01 15:32:01 -03:00
LucasGGamerM
7459181fa9 feat: make uniform notification icons setting false by default 
I set these as true by default when merging because I liked the Mo, now lets make it false by default because Its cooler
 2023-04-01 14:22:18 -03:00
LucasGGamerM
7d43105925 refactor: remove unused imports in MainActivity 2023-03-31 16:24:09 -03:00
LucasGGamerM
20b6d15c2e feat: add auto-updater to the nightly flavor 2023-03-30 14:37:05 -03:00
Grishka
72d72d443e Limit aspect ratio to 9:20 2023-03-30 18:53:59 +03:00
LucasGGamerM
ded9b70483 refactor: moving settings around and fixing a small bug with the publish button text button 
Yes, I am doing 2 things in the same commit. Anyhow, this should make for a settings page reordering and a better cohesion with the settings sub parts. This should be a stepping stone to the new settings subfragments system
 2023-03-27 15:59:38 -03:00
Grishka
7b0a3f0f96 More media layout optimizations 2023-03-27 04:04:16 +03:00
FineFindus
a4d07d4307 fix: recents URL not showing after open in share menu 2023-03-25 20:24:34 +01:00
LucasGGamerM
903e844aad Merge pull request #136 from FineFindus/fix/missing-recents-url 
fix(recent-url): show settings URL
 2023-03-25 14:48:06 -03:00
FineFindus
05f9ae8d76 fix(hometimeline): scroll up on tapping new post button 2023-03-25 17:55:15 +01:00
FineFindus
314afed9de fix(recent-url): show settings URL 2023-03-25 17:32:10 +01:00