sk
|
a5f98f5c50
|
fix follow request list issues
closes #153
|
2022-12-17 16:35:41 +01:00 |
|
LucasGGamerM
|
82b7633650
|
Renaming stuff
|
2022-12-16 19:13:11 -03:00 |
|
LucasGGamerM
|
bce2367cfc
|
Making material you default for devices that support it. For devices that dont, still setting purple as the main theme.
|
2022-12-16 12:07:29 -03:00 |
|
sk
|
390ecc48fb
|
Refactoring a string for easier translation
|
2022-12-16 11:44:18 -03:00 |
|
LucasGGamerM
|
4362490539
|
Fixing the instance thing again
|
2022-12-16 11:17:43 -03:00 |
|
LucasGGamerM
|
f5d225fc3e
|
Still broken
|
2022-12-16 11:16:10 -03:00 |
|
LucasGGamerM
|
063e9287fd
|
A little better. Some refactoring done.
|
2022-12-16 11:09:42 -03:00 |
|
LucasGGamerM
|
ba376908cd
|
Get instance things. Still figuring out the merge
|
2022-12-16 11:03:24 -03:00 |
|
sk
|
caddf0021c
|
A bunch of stuff. I dont know wtf I am doing
|
2022-12-16 10:54:50 -03:00 |
|
sk
|
e5da24a44d
|
add red theme
|
2022-12-16 14:41:53 +01:00 |
|
Grishka
|
90645f4d90
|
Adding stuff from upstream
|
2022-12-16 10:30:42 -03:00 |
|
LucasGGamerM
|
1316fcae22
|
Fixing compile problems. Adding another one
|
2022-12-16 10:23:45 -03:00 |
|
sk
|
d63e5af8d0
|
use custom instead of app name
|
2022-12-16 14:21:54 +01:00 |
|
LucasGGamerM
|
27dee7297b
|
Changing things back to default
|
2022-12-16 10:13:26 -03:00 |
|
sk
|
13ecba40ae
|
use default posting language from server
|
2022-12-16 10:08:19 -03:00 |
|
sk
|
abdce64b99
|
for pink shall remain the default
also, save color name as a string
|
2022-12-16 14:00:43 +01:00 |
|
sk
|
9a47530ab8
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-16 02:52:55 +01:00 |
|
sk
|
ed1d9165e1
|
use default posting language from server
|
2022-12-16 02:14:06 +01:00 |
|
sk
|
ef421dd5dd
|
set material3 theme as default
|
2022-12-16 02:02:48 +01:00 |
|
LucasGGamerM
|
4621787e34
|
Imma just wait until @sk22 works on this again
|
2022-12-15 15:24:47 -03:00 |
|
LucasGGamerM
|
10ad35a285
|
Deleting the entries for the default language, as I will instead get them from the server
|
2022-12-15 15:05:22 -03:00 |
|
LucasGGamerM
|
d10145a6ba
|
Removing this function call because its useless as i will get the default language from the server, and not from this.
|
2022-12-15 15:03:33 -03:00 |
|
LucasGGamerM
|
c9792ced32
|
Merge remote-tracking branch 'origin/fork' into fork
|
2022-12-15 15:01:21 -03:00 |
|
LucasGGamerM
|
a3fb09a33c
|
Tis broken. Just need to fix MastodonLanguage.java getDefaultLanguge. I am still trying to figure out where it is stored
|
2022-12-15 14:56:11 -03:00 |
|
Grishka
|
e0febda372
|
Minor fixes
|
2022-12-15 20:16:32 +03:00 |
|
Grishka
|
166401ea18
|
Signup flow redesign
|
2022-12-15 19:41:38 +03:00 |
|
sk
|
c950b6e6c1
|
simplify code
|
2022-12-15 17:03:17 +01:00 |
|
LucasGGamerM
|
2dc884b1bb
|
Making material you setting work fine. Its ready for release
|
2022-12-15 16:44:16 +01:00 |
|
LucasGGamerM
|
6d875fd890
|
It now properly sets a default on every change. Not the final implementation yet
|
2022-12-14 20:39:02 -03:00 |
|
LucasGGamerM
|
5d87fb7b67
|
MastodonLanguage util side done
|
2022-12-14 20:15:29 -03:00 |
|
LucasGGamerM
|
4cbb59850b
|
Superduper buggy. But the preferences side is done, so make sure to merge this commit as well @sk22
|
2022-12-14 19:59:53 -03:00 |
|
LucasGGamerM
|
94ac5b9bb7
|
Merge branch 'feature/language-selector' into fork
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/res/values/strings.xml
|
2022-12-14 19:03:15 -03:00 |
|
LucasGGamerM
|
97d81eb1b2
|
Rebranding
|
2022-12-13 12:36:06 -03:00 |
|
sk
|
ffa21b26af
|
add custom login fragment
|
2022-12-13 12:24:39 -03:00 |
|
LucasGGamerM
|
f3f5e4a887
|
Revert "Revert "Fix #443 again""
This reverts commit f63bbeee79.
|
2022-12-13 12:02:30 -03:00 |
|
LucasGGamerM
|
7aabc1fa76
|
Revert "Revert "This is quite brokey""
This reverts commit 0231903868.
|
2022-12-13 12:02:28 -03:00 |
|
LucasGGamerM
|
dcb5e36041
|
Revert "Revert "Fix #443""
This reverts commit e0c072ab9c.
|
2022-12-13 12:02:21 -03:00 |
|
LucasGGamerM
|
e0c072ab9c
|
Revert "Fix #443"
This reverts commit 65dbbb3d61.
|
2022-12-13 12:00:55 -03:00 |
|
LucasGGamerM
|
0231903868
|
Revert "This is quite brokey"
This reverts commit f352c20ed9.
|
2022-12-13 12:00:55 -03:00 |
|
LucasGGamerM
|
f63bbeee79
|
Revert "Fix #443 again"
This reverts commit b34e34de51.
|
2022-12-13 12:00:55 -03:00 |
|
sk
|
ac3176c0d8
|
Merge branch 'external-share-include-subject'
|
2022-12-13 09:18:42 +01:00 |
|
sk
|
021fc9e5a0
|
add empty line after subject
closes #149
|
2022-12-13 09:18:18 +01:00 |
|
sk
|
a48c11332c
|
Merge branch 'feature/translate-button'
|
2022-12-13 09:15:34 +01:00 |
|
sk
|
93bccc02bf
|
add missing language null check
fix #143
|
2022-12-13 09:15:15 +01:00 |
|
LucasGGamerM
|
ab00ad68f1
|
Fixed the lists tab order. This should partially fix #3
|
2022-12-12 20:43:42 -03:00 |
|
LucasGGamerM
|
d1e77efa1c
|
Revert "Adding a tab on the tabbar and showing lists. Its still an early alpha though"
This reverts commit bfd87cf94e.
|
2022-12-12 20:40:11 -03:00 |
|
LucasGGamerM
|
de00353864
|
Revert "Why doesnt this work"
This reverts commit be3c12dfb3.
|
2022-12-12 20:40:10 -03:00 |
|
LucasGGamerM
|
feec459d47
|
Revert "Fixed the lists tab order. This should partially fix #3"
This reverts commit 1f51331f67.
|
2022-12-12 20:40:10 -03:00 |
|
LucasGGamerM
|
ad68d7e4f2
|
Revert "The placeholders are now there."
This reverts commit 0ca9c536cd.
|
2022-12-12 20:40:10 -03:00 |
|
LucasGGamerM
|
cf27c6bbf3
|
Revert "The placeholders are better. But the api thing isnt working"
This reverts commit a3267f6cd3.
|
2022-12-12 20:40:10 -03:00 |
|