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 |
|
Gregory K
|
b5e229a84d
|
Merge pull request #288 from sk22/fix-editing-visibility
Fix wrong visibility displayed when editing
|
2022-11-04 07:02:19 +03:00 |
|
sk
|
ef207f885b
|
increase update check interval
v1.1.4+fork.28
|
2022-11-04 03:37:32 +01:00 |
|
sk
|
c4eee28335
|
Merge branch 'feature/check-for-update-button' into fork
|
2022-11-04 03:34:06 +01:00 |
|
sk
|
6fe466779e
|
add toash message
|
2022-11-04 03:33:41 +01:00 |
|
sk
|
e71db1b883
|
custom app name in strings
|
2022-11-04 03:11:10 +01:00 |
|
sk
|
b6efafe99d
|
Merge branch 'feature/check-for-update-button' into fork
|
2022-11-04 03:09:39 +01:00 |
|
sk
|
688d466f8e
|
implement manual update check settings item
|
2022-11-04 03:09:19 +01:00 |
|
Samuel Kaiser
|
3c5797932e
|
add download badge
|
2022-11-03 17:42:31 +01:00 |
|
sk
|
48a5e262ce
|
bump version
|
2022-11-03 17:18:57 +01:00 |
|
sk
|
63b0365208
|
remove reverted default visibility
|
2022-11-03 17:18:42 +01:00 |
|
sk
|
972c05d60b
|
Revert "set unlisted as default visibility"
This reverts commit d34653750e.
|
2022-11-03 17:13:10 +01:00 |
|
sk
|
acb5778e0b
|
bump version, again
v1.1.4+fork.27
|
2022-11-03 16:36:31 +01:00 |
|
sk
|
7694c50358
|
Merge branch 'fix-editing-cw' into fork
|
2022-11-03 16:35:31 +01:00 |
|
sk
|
7ffa368d10
|
fix spoiler not being published when editing
|
2022-11-03 16:33:12 +01:00 |
|
Y32Gcnte8z
|
53f8f41d88
|
remain visibility when editing
|
2022-11-03 16:15:17 +01:00 |
|
sk
|
93d57d847e
|
fix newly published posts appearing twice
see https://github.com/mastodon/mastodon-android/issues/283
|
2022-11-03 16:14:12 +01:00 |
|
sk
|
83a4f5eec2
|
re-add missing onStatusUpdate event listener
|
2022-11-03 16:11:44 +01:00 |
|
Samuel Kaiser
|
836c2dba8d
|
Merge branch 'mastodon:master' into fork
|
2022-11-02 22:32:57 +01:00 |
|
Samuel Kaiser
|
13ae8d2ebe
|
Update README.md
|
2022-11-02 22:30:16 +01:00 |
|
Gregory K
|
98dafb4e49
|
Merge pull request #280 from sk22/fix-notifications-crash
Check whether title status item is null to fix null pointer exception
|
2022-11-03 00:27:07 +03:00 |
|
sk
|
85b8bae42e
|
bump version
|
2022-11-02 22:15:26 +01:00 |
|
Samuel Kaiser
|
64416ef9ee
|
Merge pull request #26 from Y32Gcnte8z/fork
Should we also change the client name in the footer of status?
v1.1.4+fork.26
|
2022-11-02 21:55:20 +01:00 |
|
Samuel Kaiser
|
6274ab3384
|
Merge pull request #27 from Y32Gcnte8z/visibility
Retain visibility of status when editing
|
2022-11-02 21:53:34 +01:00 |
|
sk
|
4ea5d94dc6
|
Merge branch 'fix-notifications-crash' into fork
v1.1.4+fork.25
|
2022-11-02 21:41:30 +01:00 |
|
sk
|
db4dd436b7
|
more concise null check
|
2022-11-02 21:36:14 +01:00 |
|
sk
|
6906ac6c8f
|
remove unnecessary import
|
2022-11-02 21:34:05 +01:00 |
|
sk
|
bc0b56a90e
|
avoid null in notification display items
fixes bug where type = status, but status = null,
causing buildDisplayItems to return a null title status item and an account card
|
2022-11-02 21:31:44 +01:00 |
|
sk
|
349d95b8ee
|
fix syntax error
|
2022-11-02 20:25:42 +01:00 |
|
sk
|
8c8eb395de
|
Merge remote-tracking branch 'origin/upstream' into fork
|
2022-11-02 20:22:33 +01:00 |
|
Grishka
|
50c844aa25
|
It was the wrong icon this whole time
|
2022-11-02 11:06:00 +03:00 |
|