Commit Graph

128 Commits

Author SHA1 Message Date
sk
32d182f03a Merge branch 'feature/display-reply-visibility' into fork 2022-11-19 23:44:07 +01:00
sk
da4f54751e don't display when visibility is unknown 2022-11-19 23:43:52 +01:00
sk
08656a2678 Merge branch 'feature/display-reply-visibility' into fork 2022-11-19 19:39:26 +01:00
sk
b0f76739ba implement showing original visibility on reply
closes #41
2022-11-19 19:39:09 +01:00
sk
b819c757b7 Merge branch 'feature/cw-above-text' into fork 2022-11-17 21:24:59 +01:00
sk
b1f7acb76b fix content warnings overflowing notifications 2022-11-17 21:24:43 +01:00
sk
c23df0c065 tweak content warning styles 2022-11-17 20:46:39 +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
Gregory K
e4e1dc102b Merge pull request #321 from julroy67/fix-onboarding-category-cjk-cutoff
Fix CJK text cut off for category names on Onboarding screen
2022-11-15 10:13:03 +03:00
sk
ef53c859c3 Merge branch 'main' into fork 2022-11-14 18:49:32 +01:00
Kirill Rakhman
ba930f72e8 fix button bar layout in onboarding activation for smaller widths 2022-11-13 12:58:33 +01:00
sk
7bfd841769 Merge branch 'feature/lists' into fork 2022-11-12 20:23:16 +01:00
sk
5c593a1025 improve adding/removing users from lists 2022-11-12 20:20:45 +01:00
sk
625134605b implement adding/removing users from lists 2022-11-12 16:14:45 +01: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
fa75c8eb6f Merge branch 'compact-extended-footer' into fork 2022-11-11 13:03:51 +01:00
sk
6c7a17fb81 change edit history icon 2022-11-11 13:03:39 +01:00
sk
0ad8f926cc set reblogs and favs always in one line 2022-11-11 12:54:17 +01:00
sk
9283ca8878 Merge branch 'list-timeline-views' into fork 2022-11-11 03:06:55 +01:00
sk
f4b1bde8c5 improve list item styling 2022-11-11 02:42:58 +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
90ff88f02b Merge branch 'compact-extended-footer' into fork 2022-11-11 01:35:13 +01:00
sk
e1f378977a set fixed visibility icon size 2022-11-11 01:35:01 +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
Julien Humbert
20d838f576 Fix CJK text cut off for category names on Onboarding screen 2022-11-08 23:48:04 +09: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
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
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
b6efafe99d Merge branch 'feature/check-for-update-button' into fork 2022-11-04 03:09:39 +01:00