Commit graph

3390 commits

Author SHA1 Message Date
Alex Gleason
ff26336f3a Merge branch 'chats-pagination' into 'develop'
use `/api/v2/pleroma/chats`

See merge request soapbox-pub/soapbox-fe!911
2021-12-14 15:13:11 +00:00
6a48948af7 Use old chats list API conditionally
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-14 13:38:59 +01:00
53497c2132 Chats: Create next link if not provided
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-14 13:25:08 +01:00
Alex Gleason
59a2b3dd96 Merge branch 'suggestions-home-fix' into 'develop'
Suggestions: don't show suggestions if Home timeline failed

See merge request soapbox-pub/soapbox-fe!912
2021-12-13 19:40:12 +00:00
Alex Gleason
ef17a483ab
Suggestions: don't show suggestions if Home timeline failed 2021-12-13 14:25:06 -05:00
Alex Gleason
c3766af7bf Merge branch 'followers_arent_removed' into 'develop'
Your followers from a blocked domain will not be removed

See merge request soapbox-pub/soapbox-fe!910
2021-12-13 17:19:04 +00:00
12e4c6c083 wip chat pagination
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-13 18:06:47 +01:00
NEETzsche
07fa906eaf Your followers from a blocked domain will not be removed 2021-12-13 09:33:23 -07:00
Alex Gleason
ad961dd0b5 Merge branch 'no-dms-timelines' into 'develop'
Properly filter DMs from timelines

See merge request soapbox-pub/soapbox-fe!909
2021-12-13 04:48:44 +00:00
Alex Gleason
72763d1495
Properly filter DMs from timelines 2021-12-12 22:34:10 -06:00
Alex Gleason
b706024e31 Merge branch 'search-race-condition' into 'develop'
Fix: Race condition in search

See merge request soapbox-pub/soapbox-fe!908
2021-12-12 20:30:30 +00:00
d66b2e10f2 Fix: Race condition in search
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-12 20:35:45 +01:00
Alex Gleason
01cd832680 Merge branch 'detailed-status-menu' into 'develop'
Don't show menu items requiring auth when not authenticated for detailed statuses

See merge request soapbox-pub/soapbox-fe!907
2021-12-11 21:03:29 +00:00
f52b69ebbb Don't show menu items requiring auth when not authenticated for detailed statuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-11 21:51:10 +01:00
Alex Gleason
5e7aa7b28f Merge branch 'dropdown-menu-styles' into 'develop'
DropdownMenu: Decrease vertical padding

See merge request soapbox-pub/soapbox-fe!906
2021-12-11 18:56:31 +00:00
13716e1348 It looks uneven when first/last item is hovered
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-11 19:41:42 +01:00
Alex Gleason
7d3e5b0d7a Merge branch 'dropdown-menu-styles' into 'develop'
DropdownMenu style changes

See merge request soapbox-pub/soapbox-fe!905
2021-12-11 18:41:38 +00:00
5b75687185 DropdownMenu style changes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-11 19:29:12 +01:00
Alex Gleason
fe9f934be7 Merge branch 'language-pl' into 'develop'
Update Polish translation

See merge request soapbox-pub/soapbox-fe!903
2021-12-11 12:45:26 +00:00
6a3d70bfff Update Polish translation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-11 10:22:15 +01:00
Alex Gleason
8a863d7587 Merge branch 'mastodon-status-ap-id-redirect' into 'develop'
Mastodon: redirect ActivityPub ID for statuses

See merge request soapbox-pub/soapbox-fe!902
2021-12-10 22:19:55 +00:00
Alex Gleason
73208ebe4b
Mastodon: redirect ActivityPub ID for statuses 2021-12-10 16:05:28 -06:00
Alex Gleason
f03d8861b6 Merge branch 'login-skip-app-token' into 'develop'
Auth: logIn, don't create an unnecessary app token

See merge request soapbox-pub/soapbox-fe!901
2021-12-06 20:47:36 +00:00
Alex Gleason
aaad79f6a5
Auth: logIn, don't create an unnecessary app token 2021-12-06 15:33:06 -05:00
Alex Gleason
2982bd1bc1 Merge branch 'ptr-loading-css' into 'develop'
PullToRefresh: don't transform the loading indicator

See merge request soapbox-pub/soapbox-fe!900
2021-12-03 05:11:34 +00:00
Alex Gleason
4357b6322a
PullToRefresh: don't transform the loading indicator 2021-12-02 23:11:02 -06:00
Alex Gleason
0374b058fa Merge branch 'revert-loading-indicator' into 'develop'
PullToRefresh: switch back to the old loading indicator for now

See merge request soapbox-pub/soapbox-fe!899
2021-12-03 04:38:52 +00:00
Alex Gleason
0b0e7188e3
PullToRefresh: switch back to the old loading indicator for now 2021-12-02 22:37:08 -06:00
Alex Gleason
94f3133dd4 Merge branch 'ptr-improvements' into 'develop'
PullToRefresh improvements

See merge request soapbox-pub/soapbox-fe!898
2021-12-02 21:54:36 +00:00
Alex Gleason
d6bc8d8b6c
PullToRefresh: use iOS style spinner 2021-12-02 15:38:26 -06:00
Alex Gleason
c57d50aa4e
PullToRefresh: increase pull resistance and threshold 2021-12-02 14:11:40 -06:00
Alex Gleason
3f11071fba Merge branch 'profile-share' into 'develop'
Profile: add "Share" button as a primary action to own profile

See merge request soapbox-pub/soapbox-fe!897
2021-12-01 20:22:58 +00:00
Alex Gleason
ed2866a1e1
Profile: add "Share" button as primary action to own profile 2021-12-01 14:08:44 -06:00
Alex Gleason
0796dc359c Merge branch 'gitignore-ds-store' into 'develop'
gitignore .DS_Store and .idea

See merge request soapbox-pub/soapbox-fe!895
2021-11-29 16:49:53 +00:00
Alex Gleason
e6cb31b4f7
gitignore .DS_Store and .idea 2021-11-29 10:48:54 -06:00
Alex Gleason
802b9dc7e0 Merge branch 'gitignore-surge' into 'develop'
gitignore configuration files from surge.sh

See merge request soapbox-pub/soapbox-fe!894
2021-11-29 16:46:02 +00:00
Alex Gleason
1d2ba33e94
gitignore configuration files from surge.sh 2021-11-29 10:28:34 -06:00
Alex Gleason
3622300487 Merge branch 'suggestions-conditional-admin' into 'develop'
v2 Suggestions: conditionally display admin actions

See merge request soapbox-pub/soapbox-fe!893
2021-11-27 05:54:36 +00:00
Alex Gleason
4c11a3041f
v2 Suggestions: conditionally display admin actions 2021-11-26 23:53:50 -06:00
Alex Gleason
1e0f76558a Merge branch 'suggestions' into 'develop'
v2 Suggestions: add AdminAPI, rearrange sidebars, check instance feature flag

See merge request soapbox-pub/soapbox-fe!892
2021-11-27 05:50:22 +00:00
Alex Gleason
92439137c1
v2 Suggestions: add AdminAPI, rearrange sidebars, check instance feature flag 2021-11-26 23:36:17 -06:00
Alex Gleason
e3566db690 Merge branch 'manifest' into 'develop'
Link to manifest.json

Closes #412

See merge request soapbox-pub/soapbox-fe!891
2021-11-24 23:10:32 +00:00
Alex Gleason
bd9c8a8770
Link to manifest.json 2021-11-24 16:56:40 -06:00
Alex Gleason
665d7a1e1f Merge branch 'eslint-rules' into 'develop'
eslint: add key-spacing and space-unary-ops rules

See merge request soapbox-pub/soapbox-fe!890
2021-11-24 18:10:46 +00:00
4e04f06142 eslint: add key-spacing and space-unary-ops rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-24 18:28:35 +01:00
Alex Gleason
b2845cc686 Merge branch 'stackoverflow' into 'develop'
Fix browser freezing on some threads

Closes #767

See merge request soapbox-pub/soapbox-fe!889
2021-11-23 21:31:35 +00:00
Alex Gleason
b528c4aa63
Contexts: check for cyclical in_reply_tos and prevent stitching them with tombstones 2021-11-23 15:17:12 -06:00
Alex Gleason
b76bb097f2
Status: protect against infinite context loops 2021-11-23 15:12:50 -06:00
Alex Gleason
b9febfc1a3 Merge branch 'revert-stacked-avatars' into 'develop'
Revert stacked avatars

See merge request soapbox-pub/soapbox-fe!888
2021-11-23 02:36:51 +00:00
Alex Gleason
679617c877
Revert "MaterialStatus: stack avatars on top"
This reverts commit a9a84f6701.
2021-11-22 20:35:38 -06:00