LucasGGamerM
|
769293ce1a
|
Changing translate icon
|
2022-12-10 09:56:53 -03:00 |
|
LucasGGamerM
|
8d0fe18b70
|
Fixing the notification color, and app name
|
2022-12-10 09:33:36 -03:00 |
|
LucasGGamerM
|
6926432a6c
|
Bumping version number
1.1.4+fork.60.moshinda
|
2022-12-09 20:10:06 -03:00 |
|
LucasGGamerM
|
83f12b0840
|
Fixing the sk references. Readding them for easier translation
|
2022-12-09 19:58:33 -03:00 |
|
LucasGGamerM
|
290b7db7e4
|
This is unbrokey. Merged changes from upstream.
|
2022-12-09 19:35:15 -03:00 |
|
LucasGGamerM
|
f352c20ed9
|
This is quite brokey
|
2022-12-09 19:20:47 -03:00 |
|
LucasGGamerM
|
2ccbffa165
|
Merge branch 'main' into fork
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/logo.xml
# mastodon/src/main/res/layout/item_settings_color_picker.xml
# mastodon/src/main/res/menu/color_picker.xml
# mastodon/src/main/res/values-night/styles.xml
# mastodon/src/main/res/values-v27/colors.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/strings.xml
# mastodon/src/main/res/values/styles.xml
|
2022-12-09 19:08:35 -03:00 |
|
LucasGGamerM
|
06cd80a352
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
|
2022-12-09 18:35:52 -03:00 |
|
sk
|
e5fab4a555
|
update changelog, bump version
v1.1.4+fork.58
|
2022-12-09 21:25:24 +01:00 |
|
sk
|
abe28179ec
|
use saved default status visibility
|
2022-12-09 21:23:20 +01:00 |
|
sk
|
60d4e4d396
|
use default posting language
|
2022-12-09 21:15:11 +01:00 |
|
sk
|
435e73d718
|
Merge branch 'feature/language-selector'
|
2022-12-09 20:56:09 +01:00 |
|
sk
|
17dc0850d5
|
apply language when replying
|
2022-12-09 20:53:56 +01:00 |
|
sk
|
9667a32e44
|
save recently used languages
|
2022-12-09 20:48:51 +01:00 |
|
sk
|
4e6ba84bb3
|
implement language selector
|
2022-12-09 19:34:43 +01:00 |
|
LucasGGamerM
|
de97493e6a
|
Update README.md
|
2022-12-09 14:04:38 -03:00 |
|
LucasGGamerM
|
3a24ff0d15
|
Bumping version code
1.1.4+fork.59.moshinda
|
2022-12-09 13:44:46 -03:00 |
|
LucasGGamerM
|
c463a3fc39
|
The front end if finally ready!
|
2022-12-09 13:42:29 -03:00 |
|
LucasGGamerM
|
fc845685cc
|
Almost there
|
2022-12-09 12:25:17 -03:00 |
|
LucasGGamerM
|
0ef0aa1a44
|
The api side is finally working perfectly!
|
2022-12-09 10:30:24 -03:00 |
|
sk
|
8714b24388
|
bump version
v1.1.4+fork.57
|
2022-12-09 03:15:01 +01:00 |
|
sk
|
495db142d7
|
update readme
|
2022-12-09 03:14:11 +01:00 |
|
sk
|
ac5d11159f
|
Merge branch 'feature/translate-button'
|
2022-12-09 03:05:59 +01:00 |
|
sk
|
d1479f142b
|
add progress spinner
|
2022-12-09 03:05:17 +01:00 |
|
sk
|
ee6ec631e8
|
Merge branch 'feature/translate-button'
|
2022-12-09 02:46:55 +01:00 |
|
sk
|
dee21222a7
|
implement translate feature
|
2022-12-09 02:37:38 +01:00 |
|
LucasGGamerM
|
337689aa45
|
The api side is actually working!
|
2022-12-08 21:17:11 -03:00 |
|
sk
|
cd8123ca34
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-08 21:41:38 +01:00 |
|
sk
|
ceb08ea78d
|
fix get started button color
|
2022-12-08 21:36:50 +01:00 |
|
Gregory K
|
b79ba71228
|
Merge pull request #445 from sk22/better-inline-emoji-search
Improve inline emoji search
|
2022-12-08 23:22:24 +03:00 |
|
Grishka
|
2903874dbc
|
Splash fragment redesign
|
2022-12-08 23:22:10 +03:00 |
|
sk
|
cac5b554e2
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-08 21:02:45 +01:00 |
|
sk
|
c4adbc8e45
|
update changelog/readme
|
2022-12-08 21:02:06 +01:00 |
|
sk
|
bb01077c3b
|
Merge branch 'feature/mark-media-as-sensitive'
|
2022-12-08 21:00:43 +01:00 |
|
sk
|
b370fcda6d
|
add bottom margin to sensitive toggle
|
2022-12-08 21:00:30 +01:00 |
|
sk
|
d364ebbb2f
|
Merge branch 'better-poll-voting'
|
2022-12-08 20:56:19 +01:00 |
|
sk
|
5b28468efd
|
add option to allow multiple poll choices
|
2022-12-08 20:53:34 +01:00 |
|
sk
|
6fd58c9682
|
improve semantics for poll options
|
2022-12-08 19:56:04 +01:00 |
|
LucasGGamerM
|
f7e3423f9c
|
Bumping version number
1.1.4+fork.58.moshinda
|
2022-12-08 15:16:22 -03:00 |
|
LucasGGamerM
|
b465c09cc8
|
Fixing the "Megalodon" name on logging into a new account
|
2022-12-08 15:01:46 -03:00 |
|
sk
|
b580743619
|
fix poll option displaying wrong own vote
fixes #132
|
2022-12-08 16:03:46 +01:00 |
|
sk
|
4a9cb9f2dc
|
fix poll option displaying wrong own vote
fixes #132
|
2022-12-08 15:53:35 +01:00 |
|
Poussinou
|
0dcdda75be
|
fix typo in README
|
2022-12-08 12:45:28 +09:30 |
|
Grishka
|
202a5f9581
|
Fix #443 again
|
2022-12-08 01:48:23 +03:00 |
|
sk22
|
145f55817f
|
Translated using Weblate (German)
Currently translated at 100.0% (7 of 7 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2022-12-07 18:20:46 +00:00 |
|
sk
|
79025c2f36
|
update description
|
2022-12-07 19:19:05 +01:00 |
|
sk
|
2515a8d381
|
add missing item to changelog
|
2022-12-07 19:16:14 +01:00 |
|
sk22
|
ede7ece25a
|
Translated using Weblate (German)
Currently translated at 100.0% (7 of 7 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
v1.1.4+fork.56
|
2022-12-07 18:11:14 +00:00 |
|
sk22
|
2db39f8c66
|
Translated using Weblate (German)
Currently translated at 100.0% (47 of 47 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2022-12-07 18:11:13 +00:00 |
|
sk
|
5f0382456f
|
remove upstream fastlane changes
|
2022-12-07 19:09:13 +01:00 |
|