sk
7f0e2bf03d
Merge branch 'feature/follow-requests' into fork
2022-11-17 18:53:42 +01:00
sk
521ba8766c
implement follow requests list
...
closes #39
2022-11-17 18:52:22 +01:00
sk
01655a3465
Merge branch 'feature/cw-above-text' into fork
2022-11-17 01:05:02 +01:00
sk
95b7dbfba3
remove unused variable
2022-11-17 01:04:51 +01:00
sk
7bcfd8939e
Merge branch 'feature/cw-above-text' into fork
2022-11-17 00:56:08 +01:00
sk
5c9e41f4ff
add content warning above text
2022-11-17 00:43:37 +01:00
sk
aab4284624
Merge branch 'main' into fork
2022-11-16 21:58:16 +01:00
Grishka
79d99a9484
Probably fix #297
2022-11-15 14:11:56 +04:00
sk
f3efd1e3bc
Merge branch 'feature/follow-requests' into fork
2022-11-12 03:22:27 +01:00
sk
dba8bd1862
clean up, revert unnecessary changes
2022-11-12 03:21:40 +01:00
sk
12fdd70ad0
implement accepting/rejecting follow requests
...
closes #13
2022-11-12 03:03:52 +01:00
sk
7fd6a6f83e
Merge branch 'feature/follow-requests' into fork
2022-11-12 03:03:14 +01:00
sk
515592e8ea
implement accepting/rejecting follow requests
...
closes #13
2022-11-12 03:01:59 +01:00
sk
5fa81e6c8a
add accept/decline buttons
2022-11-12 01:18:07 +01:00
sk
0643f72a0b
Merge branch 'feature/delete-redraft' into fork
2022-11-11 17:57:27 +01:00
sk
443b985b06
navigate to re-drafted status when opened
2022-11-11 17:53:04 +01:00
sk
5742493185
re-implement redraft from upstream edit function
2022-11-11 16:12:26 +01:00
sk
8b2d06c548
Merge branch 'main' into feature/delete-redraft
2022-11-11 15:36:33 +01:00
sk
56b76080ec
Revert "implement deleting and re-drafting"
...
This reverts commit 3a4d13b1c6
2022-11-11 15:35:30 +01:00
sk
1a12659a23
Revert "preserve visibility when re-drafting"
...
This reverts commit e8b43c7179
2022-11-11 15:35:26 +01:00
sk
ff0a77d6b5
Merge branch 'settings/hide-interaction-numbers' into fork
2022-11-11 13:25:35 +01:00
sk
596ec3230f
add option to hide interaction counts
2022-11-11 13:23:53 +01:00
sk
9283ca8878
Merge branch 'list-timeline-views' into fork
2022-11-11 03:06:55 +01:00
sk
eff6cc3e17
Merge branch 'compact-extended-footer' into fork
2022-11-11 02:11:52 +01:00
sk
03044b86b1
add clickable app name button
2022-11-11 02:11:37 +01:00
sk
a0f3d2862c
Merge branch 'compact-extended-footer' into fork
2022-11-11 01:27:46 +01:00
sk
0c64145368
implement new old extended footer design
...
fixes #34
2022-11-11 01:27:17 +01:00
sk
965ebc8669
Merge branch 'feature/post-notifications-toggle' into fork
2022-11-09 23:28:59 +01:00
sk
3514152439
fix issues with post notification button
2022-11-09 23:28:48 +01:00
sk
e9f5d235cb
Implement post notifications button
...
Closes #10 , mastodon#81
2022-11-09 18:39:28 +01:00
sk
3ae37a700b
Merge branch 'feature/post-notifications-toggle' into fork
2022-11-09 18:38:20 +01:00
sk
b166ca705e
Implement post notifications button
2022-11-09 18:38:10 +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
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
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
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
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
David Hewitt
8ff3ecb4d4
Fix receiving images from keyboards
...
The call to `super.onCreateInputConnection` was overwriting the mimes in the `outAttrs`, so we can call that first and then modify the mimes.
This fixes the ability to insert GIFs with the default GBoard GIF menu for me.
2022-10-30 14:56:47 +00:00
Grishka
01970ab69b
Compose media attachment redesign
2022-10-04 07:35:31 +03:00
sk
8aeda56fc8
merge upstream changes
2022-09-08 14:56:43 +02:00
Grishka
f531a90b41
Better editing
2022-09-02 11:21:28 +03:00
Grishka
ff52c37868
Editing
2022-09-02 05:47:20 +03:00
Grishka
8fb2b454dd
Post edit history + extended footer redesign
2022-09-02 02:00:25 +03:00
Grishka
265b2ad32c
Fix #218
2022-08-29 21:21:08 +03:00
sk
e55ca6cc05
Merge branch 'feature/delete-redraft' into fork
2022-05-26 22:42:02 +02:00
