sk
|
e6a67543f4
|
Bump version, update README
v1.1.4+fork.32
|
2022-11-09 15:54:33 +01:00 |
|
sk
|
7d38f031f1
|
Merge branch 'feature/follow_hashtags' into fork
Fixes #31, mastodon#233
|
2022-11-09 15:49:29 +01:00 |
|
sk
|
cf864e6f49
|
Implement following hashtags
|
2022-11-09 15:48:01 +01:00 |
|
sk
|
f4b1629a1d
|
Merge branch 'feature/filter-home-timeline' into fork
|
2022-11-09 10:34:47 +01:00 |
|
sk
|
1fbb97021e
|
align code
|
2022-11-09 10:34:36 +01:00 |
|
sk
|
229c815a59
|
move option to home timeline section
|
2022-11-09 10:32:12 +01:00 |
|
sk
|
ee8d78637d
|
Merge branch 'settings/load-new-posts' into fork
|
2022-11-09 10:31:30 +01:00 |
|
sk
|
4ede842171
|
add option to disable automatically loading new posts
|
2022-11-09 10:30:25 +01:00 |
|
sk
|
8306e78ce3
|
Merge branch 'feature/filter-home-timeline' into fork
|
2022-11-09 10:12:16 +01:00 |
|
sk
|
65d093ee9d
|
fix new posts not filtering
|
2022-11-09 10:11:55 +01:00 |
|
sk
|
aa48233a75
|
Merge branch 'main' into fork
|
2022-11-09 09:48:03 +01:00 |
|
Grishka
|
ae50e618c0
|
Fix #316
|
2022-11-08 09:41:07 +03:00 |
|
Grishka
|
defa8b014e
|
Fix #315
|
2022-11-08 09:38:26 +03:00 |
|
Grishka
|
159d91f390
|
Crash fixes
|
2022-11-08 09:36:56 +03:00 |
|
sk
|
430d4ec93b
|
Merge branch 'spoiler-height-independent' into fork
|
2022-11-08 00:55:10 +01:00 |
|
sk
|
ae64784daf
|
revert increased vertical padding
i changed my mind
|
2022-11-08 00:54:48 +01:00 |
|
sk
|
18df7c32a4
|
Merge branch 'feature/filter-home-timeline' into fork
|
2022-11-08 00:27:31 +01:00 |
|
sk
|
4615612a65
|
use home_timeline string
|
2022-11-08 00:27:19 +01:00 |
|
sk
|
6b226cdcad
|
bump version
v1.1.4+fork.31
|
2022-11-08 00:21:33 +01:00 |
|
sk
|
1776709b38
|
update readme
|
2022-11-08 00:21:17 +01:00 |
|
sk
|
75a35cd680
|
Merge branch 'feature/filter-home-timeline' into fork
|
2022-11-08 00:18:19 +01:00 |
|
sk
|
18d4f2fa36
|
add timeline filters for replies/boosts
fixes #32, mastodon#210
|
2022-11-08 00:13:06 +01:00 |
|
sk
|
bca936f6a2
|
move contribute to the spicy zone
i've been planning to do this for a while :D
|
2022-11-07 23:37:10 +01:00 |
|
sk
|
0b59379c4e
|
update readme
|
2022-11-07 23:35:31 +01:00 |
|
sk
|
58abdad62a
|
bump version
v1.1.4+fork.30
|
2022-11-07 21:18:41 +01:00 |
|
sk
|
c693414cc3
|
update readme
|
2022-11-07 21:18:37 +01:00 |
|
sk
|
ee158e1aba
|
Merge branch 'feature/mark-media-as-sensitive' into fork
|
2022-11-07 21:04:44 +01:00 |
|
sk
|
40d478aaec
|
tweak styles
|
2022-11-07 21:04:28 +01:00 |
|
sk
|
e7fb96b3ff
|
Merge branch 'feature/mark-media-as-sensitive' into fork
|
2022-11-07 20:47:15 +01:00 |
|
sk
|
ef75427b45
|
fix option not being there when editing
|
2022-11-07 20:46:49 +01:00 |
|
sk
|
2ff4f00774
|
Merge branch 'feature/mark-media-as-sensitive' into fork
|
2022-11-07 20:17:39 +01:00 |
|
sk
|
534fd8c119
|
implement "mark media as sensitive" button
fixes #21
|
2022-11-07 20:15:16 +01:00 |
|
sk
|
2d2cd89454
|
Merge branch 'spoiler-height-independent' into fork
|
2022-11-07 17:32:55 +01:00 |
|
sk
|
9f3f5ca7c1
|
make spoiler height independent of content
fixes #12, fixes mastodon/mastodon-android#166
|
2022-11-07 17:32:37 +01:00 |
|
Samuel Kaiser
|
c0e6f17c83
|
Merge pull request #28 from br4yd/patch-1
Add German translation for the federated timeline
|
2022-11-07 16:57:21 +01:00 |
|
sk
|
677f1cb42d
|
Merge remote-tracking branch 'origin/upstream' into fork
|
2022-11-07 16:56:27 +01:00 |
|
Gregory K
|
1ac6a04a46
|
Merge pull request #309 from julroy67/perapp-language
Add Android 13 per-app language preferences
|
2022-11-07 06:49:58 +03:00 |
|
Julien Humbert
|
21927d2e25
|
Add missing line in Android Manifest
|
2022-11-07 12:32:20 +09:00 |
|
Julien Humbert
|
c35441f5f7
|
Add per-app language preferences
|
2022-11-07 12:27:26 +09:00 |
|
br4yd
|
3718fe6601
|
Add German translation for the federated timeline
I added the translation strings for the federation timeline tab to the German translation file and also translated the values.
|
2022-11-06 22:21:53 +01:00 |
|
sk
|
095f234bd5
|
bump version
v1.1.4+fork.29
|
2022-11-06 11:16:31 +01:00 |
|
sk
|
f10c0e06db
|
Merge branch 'fork' of github.com:sk22/mastodon-android-fork into fork
|
2022-11-06 11:13:42 +01:00 |
|
sk
|
ebbd5d1fa3
|
Merge branch 'upstream' into fork
|
2022-11-06 11:13:26 +01:00 |
|
Grishka
|
c8abf26040
|
Fix #301
|
2022-11-06 05:43:17 +03:00 |
|
Grishka
|
bc733af147
|
Actually no, this makes more sense
|
2022-11-06 05:39:22 +03:00 |
|
Grishka
|
77a2fd2a60
|
Fix #298
|
2022-11-06 05:36:43 +03:00 |
|
Samuel Kaiser
|
5cfc5eb08a
|
Update README.md
|
2022-11-05 11:27:02 +01:00 |
|
Samuel Kaiser
|
b832d2df26
|
Update README.md
|
2022-11-04 18:02:33 +01:00 |
|
Samuel Kaiser
|
db34dc40ba
|
Merge branch 'mastodon:master' into fork
|
2022-11-04 14:32:13 +01:00 |
|
Gregory K
|
bfa48c2d3e
|
Merge pull request #289 from sk22/fix-editing-cw
Fix spoiler not being published when editing
|
2022-11-04 07:02:40 +03:00 |
|