Commit Graph

206 Commits

Author SHA1 Message Date
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
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
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
9864966eb0 remove endorse button from the profile header menu and some related funcs, fixes #328 2020-08-16 10:42:55 -05:00
3da44d60bf Revert direct_timeline to use /api/v1/timelines/direct, fixes #325 2020-08-15 23:37:50 -05:00
ca333c9552 Start refactoring direct_timeline / conversations 2020-08-15 23:18:53 -05:00
9afac986fb Refactor oembed card to work with videos on Pleroma 2020-08-15 19:40:08 -05:00
455cb6f575 only render layout colum inner div when column exists, fixes #293 2020-08-15 18:50:42 -05:00
2f24577e7f only show public attachments in profile media panel 2020-08-15 15:51:31 -05:00
422588178a loading improvments for profile media panel 2020-08-15 15:19:18 -05:00
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
dd0b0c911f remove proile media panel from right sidebar on medium screens 2020-08-14 22:34:22 -05:00
50ccb6d010 add loading indicator to DMs, fixes #316 2020-08-14 21:11:36 -05:00
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
c6a4db7528 Fix 504 error when visiting account you've blocked 2020-08-14 17:23:31 -05:00
39d9b20431 Merge remote-tracking branch 'origin/develop' into profile-media-panel 2020-08-14 16:25:25 -05:00
fdbe981477 Fix timeline queue header when filters are enabled 2020-08-14 16:01:30 -05:00
30983571b1 add profile media panel 2020-08-14 14:32:32 -05:00
d49d8bc145 Remove dupilcate quickFilter in notification settings 2020-08-12 13:39:13 -06:00
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
72433b6bd0 Translation strings for FeaturesPanel 2020-08-10 21:03:28 -06:00
c4046cbf7e add video and audio media placeholders in compose form 2020-08-10 20:59:24 -05:00
202b8e145f Revert "Remove unnecessary video preview url that was fixing video previews"
This reverts commit f56e156d21f2c8a815aca2aa1445e659295f4218.
2020-08-11 00:12:26 +00:00
c9b925d252 Fix edit profile checkbox state, fixes #261 #284 2020-08-10 16:17:39 -05:00
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
5349045e51 Revert "only render emoji selector in the dom when needed"
This reverts commit 769a512445.
2020-08-10 15:06:39 -05:00
42a7a61ce7 border radius fixes 2020-08-10 15:05:24 -05:00
10d1010265 New upload icon 2020-08-10 11:49:38 -06:00
6ac0c615fe fixes #278, large awaiting approval button 2020-08-10 12:23:59 -05:00
5998f52e9f fix relationship not loading on hover card 2020-08-10 12:08:32 -05:00
b30dc39f1a Bio fixes 2020-08-09 15:13:36 -05:00
695a78503d Verified ['pleroma', 'tags'] fix 2020-08-09 14:55:32 -05:00
d9579831e0 Merge remote-tracking branch 'origin/multi_line_bio' into develop 2020-08-09 14:45:31 -05:00
504e36c7d8 Fix linter 2020-08-09 14:44:56 -05:00
e97b9d2168 Update columns layout for all pages 2020-08-09 14:37:02 -05:00
6f6f91e2f4 Verified className fix 2020-08-09 14:32:22 -05:00
2fff5db5d5 Handle max_fields fallback differently 2020-08-09 14:01:16 -05:00
9c505d0d84 Fix for Pleroma 2.1 and older versions regarding profile metadata 2020-08-09 10:55:39 -06:00
715779653c Rearrange home sidebars 2020-08-09 00:29:28 -05:00
95fb1b7900 Update index.js 2020-08-09 01:40:35 +00:00
9a2fba1ef5 Revert "Revert "Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value""
This reverts commit b3a6c395df.
2020-08-08 20:32:39 -05:00
b3a6c395df Revert "Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value"
This reverts commit 3d24cfaf53.
2020-08-08 18:34:35 -05:00
ae608388a0 add DM filter option for Home timeline, fixes #254 2020-08-07 20:47:04 -05:00
e116745e83 timeline filtering improvements 2020-08-07 19:28:30 -05:00
4ee0fa8160 Merge branch 'user-verification' into 'develop'
Display user verification icon

See merge request soapbox-pub/soapbox-fe!128
2020-08-07 23:23:11 +00:00
7931a9a89d code review 2020-08-07 18:10:13 -05:00
e9d76b6287 Update chained get requests 2020-08-07 17:01:15 -05:00
36e634b0aa Resolved merge conflicts
Merge branch 'develop' into 'timeline-word-filters'

# Conflicts:
#   app/soapbox/components/sidebar_menu.js
#   app/styles/application.scss
2020-08-07 20:46:44 +00:00
92f43566e0 Merge branch 'mfa' into 'develop'
Multi-Factor Auth with OTP

See merge request soapbox-pub/soapbox-fe!124
2020-08-07 20:17:13 +00:00
68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00