Commit graph

379 commits

Author SHA1 Message Date
Alex Gleason
1e06eff010 Merge branch 'page-layout-style-improvement' into 'develop'
Only render layout column inner div when column exists, fixes #293

Closes #293

See merge request soapbox-pub/soapbox-fe!171
2020-08-16 17:39:37 +00:00
Alex Gleason
b3a05c75ff Merge branch 'profile-media-panel-improvments' into 'develop'
Profile media panel improvements, Fixes #318

Closes #318

See merge request soapbox-pub/soapbox-fe!168
2020-08-16 17:24:52 +00:00
Alex Gleason
fb16afb8f7 Merge branch 'remove-endorse-button' into 'develop'
remove endorse button from the profile header menu and some related funcs, fixes #328

Closes #328

See merge request soapbox-pub/soapbox-fe!174
2020-08-16 15:53:10 +00:00
Mary Kate
9864966eb0 remove endorse button from the profile header menu and some related funcs, fixes #328 2020-08-16 10:42:55 -05:00
Alex Gleason
3da44d60bf
Revert direct_timeline to use /api/v1/timelines/direct, fixes #325 2020-08-15 23:37:50 -05:00
Alex Gleason
ca333c9552
Start refactoring direct_timeline / conversations 2020-08-15 23:18:53 -05:00
Alex Gleason
7f824207c0 Merge branch 'oembed-video' into 'develop'
Refactor oembed card to work with videos on Pleroma

See merge request soapbox-pub/soapbox-fe!172
2020-08-16 00:51:51 +00:00
Alex Gleason
9afac986fb
Refactor oembed card to work with videos on Pleroma 2020-08-15 19:40:08 -05:00
Mary Kate
455cb6f575 only render layout colum inner div when column exists, fixes #293 2020-08-15 18:50:42 -05:00
Mary Kate
02c7325e4d Check src exists first in hover to play, hopefully fixes #322 2020-08-15 16:24:34 -05:00
Mary Kate
2f24577e7f only show public attachments in profile media panel 2020-08-15 15:51:31 -05:00
Mary Kate
422588178a loading improvments for profile media panel 2020-08-15 15:19:18 -05:00
Alex Gleason
99d96ed901
Fix login issues due to no pleroma_settings_store fallback 2020-08-15 14:43:34 -05:00
Alex Gleason
799915039b Merge branch 'profile-media-panel' into 'develop'
Add profile media panel

Closes #294

See merge request soapbox-pub/soapbox-fe!162
2020-08-15 03:44:44 +00:00
Mary Kate
dd0b0c911f remove proile media panel from right sidebar on medium screens 2020-08-14 22:34:22 -05:00
Alex Gleason
208f9f8821
Merge remote-tracking branch 'origin/dm-load-indicator' into develop 2020-08-14 21:16:33 -05:00
Mary Kate
50ccb6d010 add loading indicator to DMs, fixes #316 2020-08-14 21:11:36 -05:00
Mary Kate
bafe8bd428 show statuses on muted profiles, fixes #301 2020-08-14 20:34:19 -05:00
Alex Gleason
0f132fd3b7 Merge branch 'blocked-account-error' into 'develop'
Fix 504 error when visiting account you've blocked

Closes #310

See merge request soapbox-pub/soapbox-fe!164
2020-08-14 22:33:41 +00:00
Mary Kate
c6a4db7528 Fix 504 error when visiting account you've blocked 2020-08-14 17:23:31 -05:00
Alex Gleason
39d9b20431
Merge remote-tracking branch 'origin/develop' into profile-media-panel 2020-08-14 16:25:25 -05:00
Alex Gleason
fdbe981477
Fix timeline queue header when filters are enabled 2020-08-14 16:01:30 -05:00
Mary Kate
30983571b1 add profile media panel 2020-08-14 14:32:32 -05:00
Alex Gleason
bd65a1b3f5
Filter out reposts in local timeline by default, fixes #307 2020-08-14 12:42:03 -05:00
Alex Gleason
bb5854c310 Merge branch 'remove_duplicate_quick_filter' into 'develop'
Remove dupilcate Quick Filter bar toggle in notification settings, fixes #296

Closes #296

See merge request soapbox-pub/soapbox-fe!158
2020-08-14 01:37:08 +00:00
Alex Gleason
101f519d4b
Spinster migration hotfix: fix locale set to "" 2020-08-13 04:46:45 -05:00
Alex Gleason
e7bd011495
Streaming: Add locale fallback for invalid locale 2020-08-13 04:20:35 -05:00
Alex Gleason
6652df35b3
Run yarn manage:translations 2020-08-13 03:45:58 -05:00
Sean King
d49d8bc145 Remove dupilcate quickFilter in notification settings 2020-08-12 13:39:13 -06:00
Alex Gleason
34bf11f512 Merge branch 'media-compose-placeholders' into 'develop'
Add video and audio media placeholders in compose form

Closes #234

See merge request soapbox-pub/soapbox-fe!152
2020-08-11 19:23:44 +00:00
Sean King
72433b6bd0 Translation strings for FeaturesPanel 2020-08-10 21:03:28 -06:00
Mary Kate
c4046cbf7e add video and audio media placeholders in compose form 2020-08-10 20:59:24 -05:00
marykatefain
202b8e145f Revert "Remove unnecessary video preview url that was fixing video previews"
This reverts commit f56e156d21f2c8a815aca2aa1445e659295f4218.
2020-08-11 00:12:26 +00:00
Alex Gleason
767a491aa9 Merge branch 'redraft-remove-media' into 'develop'
Remove broken media upload from Del & Redraft composer

See merge request soapbox-pub/soapbox-fe!150
2020-08-10 23:29:26 +00:00
Mary Kate
5b3accdc53 Hotfix to remove media uploads entirely on del and redraft compose form since it was tricking user into thinking it would retain the media when submitted 2020-08-10 18:18:23 -05:00
Alex Gleason
c9b925d252
Fix edit profile checkbox state, fixes #261 #284 2020-08-10 16:17:39 -05:00
Alex Gleason
ae8c1b88d4 Merge branch 'small-fixes' into 'develop'
Small fixes

Closes #278 and #266

See merge request soapbox-pub/soapbox-fe!147
2020-08-10 20:28:14 +00:00
Mary Kate
5349045e51 Revert "only render emoji selector in the dom when needed"
This reverts commit 769a512445.
2020-08-10 15:06:39 -05:00
Mary Kate
42a7a61ce7 border radius fixes 2020-08-10 15:05:24 -05:00
Sean King
10d1010265 New upload icon 2020-08-10 11:49:38 -06:00
Mary Kate
6ac0c615fe fixes #278, large awaiting approval button 2020-08-10 12:23:59 -05:00
Mary Kate
5998f52e9f fix relationship not loading on hover card 2020-08-10 12:08:32 -05:00
Alex Gleason
b30dc39f1a
Bio fixes 2020-08-09 15:13:36 -05:00
Alex Gleason
695a78503d
Verified ['pleroma', 'tags'] fix 2020-08-09 14:55:32 -05:00
Alex Gleason
d9579831e0
Merge remote-tracking branch 'origin/multi_line_bio' into develop 2020-08-09 14:45:31 -05:00
Alex Gleason
504e36c7d8
Fix linter 2020-08-09 14:44:56 -05:00
Alex Gleason
e97b9d2168
Update columns layout for all pages 2020-08-09 14:37:02 -05:00
Alex Gleason
6f6f91e2f4
Verified className fix 2020-08-09 14:32:22 -05:00
Alex Gleason
2fff5db5d5
Handle max_fields fallback differently 2020-08-09 14:01:16 -05:00
Sean King
9c505d0d84 Fix for Pleroma 2.1 and older versions regarding profile metadata 2020-08-09 10:55:39 -06:00