Commit graph

3208 commits

Author SHA1 Message Date
Alex Gleason
e64afb5d40 Merge branch 'conditional-attachments' into 'develop'
Compose: pull accept content types from backend if available, fallback to all types

See merge request soapbox-pub/soapbox-fe!835
2021-10-31 21:27:51 +00:00
Alex Gleason
f950ee7c0c Merge branch 'import-data-link' into 'develop'
Use correct 'Import data' link for Mastodon

See merge request soapbox-pub/soapbox-fe!834
2021-10-31 21:22:03 +00:00
Alex Gleason
2946a7432b
Compose: pull accept content types from backend if available, fallback to all types 2021-10-31 16:14:09 -05:00
d4f32e1219 Use correct 'Import data' link for Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-31 22:07:41 +01:00
Alex Gleason
21a5c3215a Merge branch 'styles' into 'develop'
Improve search input styles on aliases/list editor pages

See merge request soapbox-pub/soapbox-fe!833
2021-10-31 21:06:54 +00:00
2bf24ef038 Filters page: adjust margin
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-31 21:52:33 +01:00
b9153b8866 Improve search input on aliases/list editor pages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-31 21:51:56 +01:00
Alex Gleason
beb0e6edae Merge branch 'search-reducer-refactor' into 'develop'
Search: refactor search reducer, add tests

See merge request soapbox-pub/soapbox-fe!831
2021-10-28 18:36:05 +00:00
Alex Gleason
6b54e88b62
Search: refactor search reducer, add tests 2021-10-28 14:23:54 -04:00
Alex Gleason
7aee517358 Merge branch 'invites-link' into 'develop'
use baseURL for /invites

See merge request soapbox-pub/soapbox-fe!830
2021-10-28 18:13:33 +00:00
fe4c4d93c9 use baseURL for /invites
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-28 19:58:18 +02:00
Alex Gleason
5227f4688a Merge branch 'icons-link' into 'develop'
Link to Line Awesome icon list

See merge request soapbox-pub/soapbox-fe!829
2021-10-28 13:51:32 +00:00
5043588007 Link to Line Awesome icon list
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-28 12:40:28 +02:00
Alex Gleason
e63f3403f7 Merge branch 'fix-profile-menu-position-mobile' into 'develop'
TabsBar: fix profile menu position (mobile)

See merge request soapbox-pub/soapbox-fe!827
2021-10-27 19:10:42 +00:00
Alex Gleason
c6fb12ad13
TabsBar: fix profile menu position (mobile) 2021-10-27 14:56:39 -04:00
Alex Gleason
de7d8c47b8 Merge branch 'tabs-bar-style-fix' into 'develop'
Fix profile menu button

See merge request soapbox-pub/soapbox-fe!825
2021-10-25 10:19:45 +00:00
0a15250513 Fix profile menu button
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-25 11:53:33 +02:00
Alex Gleason
916bf7a634 Merge branch 'demetricator-style' into 'develop'
Fix styles for account page with Demetricator enabled

See merge request soapbox-pub/soapbox-fe!824
2021-10-24 20:20:46 +00:00
Alex Gleason
7fd5dc1350 Merge branch 'language-pl' into 'develop'
Update Polish translation

See merge request soapbox-pub/soapbox-fe!823
2021-10-24 20:20:22 +00:00
608c4a27eb Fix styles for account page with Demetricator enabled
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-24 21:52:42 +02:00
5b149bd9ed Update Polish translation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-24 21:46:13 +02:00
Alex Gleason
f8ca45f5fb Merge branch 'configurable-autoload-more' into 'develop'
ScrollableList: Add option to disable loading more items when scrolled to bottom

See merge request soapbox-pub/soapbox-fe!822
2021-10-24 18:32:07 +00:00
535290654d ScrollableList: Add option to disable loading more items when scrolling to bottom
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-24 20:11:28 +02:00
Alex Gleason
b54011241f Merge branch 'search-scrollable-list' into 'develop'
Use ScrollableList for search results

See merge request soapbox-pub/soapbox-fe!821
2021-10-24 18:10:56 +00:00
742b1f2b58 Use ScrollableList for search results
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-24 19:58:04 +02:00
Alex Gleason
4787e35aa6 Merge branch 'polls-fix' into 'develop'
Fix polls for unauthenticated users

See merge request soapbox-pub/soapbox-fe!820
2021-10-24 13:02:20 +00:00
marcin mikołajczak
ce9a150abc Update app/soapbox/components/poll.js 2021-10-24 12:33:24 +00:00
f2b91a2231 Fix polls for unauthenticated users
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-24 14:03:42 +02:00
Alex Gleason
dde588faa8 Merge branch 'optimistic-status-queue' into 'develop'
Timelines: push pending statuses into queue

See merge request soapbox-pub/soapbox-fe!819
2021-10-23 20:22:23 +00:00
Alex Gleason
f290b78636
Timelines: push pending statuses into queue 2021-10-23 15:08:21 -05:00
Alex Gleason
d677ef7cdf Merge branch 'reorder-nav' into 'develop'
Rearrange navigation

See merge request soapbox-pub/soapbox-fe!818
2021-10-23 19:43:31 +00:00
Alex Gleason
47c68014d0
TabsBar: fix unauthenticated buttons on mobile 2021-10-23 14:29:26 -05:00
Alex Gleason
6d7ce6ffd4
TabsBar: move Profile menu to the left on mobile 2021-10-23 14:14:56 -05:00
Alex Gleason
897f65cf72
PrimaryNavigation, ThumbNavigation: move Search to after Home 2021-10-23 14:09:17 -05:00
Alex Gleason
1edfb0206a Merge branch 'notifications-component-refactor' into 'develop'
Notifications: refactor makeGetNotification, pass the full rebuilt notification all the way through

See merge request soapbox-pub/soapbox-fe!817
2021-10-22 22:47:53 +00:00
Alex Gleason
acf316faf6
Notifications: refactor makeGetNotification, pass the full rebuilt notification all the way through 2021-10-22 17:15:11 -05:00
Alex Gleason
03541ccc6f Merge branch 'video-player' into 'develop'
Video player changes from Mastodon

See merge request soapbox-pub/soapbox-fe!816
2021-10-22 18:14:49 +00:00
a2abb0bad7 Add hotkeys for video control
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 19:55:09 +02:00
a1c4066077 Fix video not reacting to window resizes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 19:03:14 +02:00
a338e7c98f Add tooltips to audio/video player buttons
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 18:59:15 +02:00
aef01ea262 Change audio/video playback to stop playback when out of view
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 18:50:32 +02:00
Alex Gleason
057a87cd48 Merge branch 'polls' into 'develop'
Polls improvements from Mastodon

See merge request soapbox-pub/soapbox-fe!815
2021-10-22 13:55:16 +00:00
813cd58305 Do not use voters_count for now
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 15:27:49 +02:00
88d35e13e8 Add single option votes tooltip in polls
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 15:23:07 +02:00
e6f30abd91 Fix poll options not being selectable via keyboard
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 15:13:17 +02:00
00aacc5e33 Add voters count support
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 15:06:34 +02:00
040dfe652a Change vote results to display tied leading options as leading
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 15:04:21 +02:00
2f5fff0222 Show user what options they have voted
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-22 15:03:21 +02:00
Alex Gleason
98067ae877 Merge branch 'push-notification-link' into 'develop'
Push notifications: take to Notifications on click

See merge request soapbox-pub/soapbox-fe!814
2021-10-21 22:37:40 +00:00
Alex Gleason
a96b9678a3
Push notifications: take to Notifications on click 2021-10-21 17:34:01 -05:00