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
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
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
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
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
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
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
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
sk
972c05d60b
Revert "set unlisted as default visibility"
...
This reverts commit d34653750e
2022-11-03 17:13:10 +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
obstsalatschuessel
21a526dda9
Add list timelines view
...
* get accounts list timelines from API
* display available lists in discover view tab
* display list timeline
2022-11-03 09:03:34 +01:00
Samuel Kaiser
64416ef9ee
Merge pull request #26 from Y32Gcnte8z/fork
...
Should we also change the client name in the footer of status?
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
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
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
Grishka
b4c305d094
Add privacy policy step to the signup flow
2022-11-02 11:01:52 +03:00
sk
596799bf2f
enable github update check
2022-11-01 23:28:55 +01:00
sk
a4cb05080a
Merge branch 'upstream' into fork
2022-11-01 21:26:44 +01:00
David Hewitt
244f2ed911
Fix crash on duplicate custom emojis
...
Fixes #274
Add a merge function to `Collectors.toMap` to discard any duplicate custom emojis that may be returned if a user uses the same custom emoji in both their name and profile.
2022-11-01 14:47:25 +00:00
