bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1115 commits 1 branch 0 tags 292 MiB
Commit graph

932 commits

Author SHA1 Message Date
Alex Gleason
e9e55749cf Merge branch 'more-corner-nonsense' into 'develop' 
Fix corners on DMs

See merge request soapbox-pub/soapbox-fe!176
 2020-08-16 16:18:51 +00:00
Mary Kate
37744b60be corners on DMs 2020-08-16 10:58:51 -05: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
8818363149 improvements to markdown list styles 2020-08-15 17:54:52 -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
crockwave
d966107f1b Add default copyright value to reducer 
Fixed checkbox processing
 2020-08-14 19:03:11 -05:00
Mary Kate
368baf818e Merge branch 'profile-media-panel' of gitlab.com:soapbox-pub/soapbox-fe into profile-media-panel 2020-08-14 17:46:44 -05:00
Mary Kate
68daa5fbe9 use cover rather than contain on media gallary except on statuses 2020-08-14 17:46:21 -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
crockwave
cf260ec793 Handles virgin rendering, default soapbox object if soapbox.json missing, local state used only for UI changes, and retention of settings in both DB and store as soapbox object 
Need to monitor for soapbox object dispatch events so that hitting Back causes re-render of timeline page
Need to explore refactoring update of soapbox object before being passed to API
 2020-08-14 16:51:04 -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
Curtis ROck
b127ffa158 Added brandcolor tooltip on brand color button hover 
Component renders well from virgin use
State updates well
Still breaks on Save
 2020-08-13 22:25:06 -05:00
Alex Gleason
c766e5cd57 Merge branch 'style-hotfixes' into 'develop' 
slight overflow improvements, fixes #303

Closes #303

See merge request soapbox-pub/soapbox-fe!160
 2020-08-14 01:37:36 +00: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
crockwave
8b2c7b344b Trying to get blank customCss field to appear on virgin usage 2020-08-13 19:04:54 -05:00
Mary Kate
dc9f5c3a6a slight overflow imrpovements, fixes #303 2020-08-13 15:48:33 -05: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
Curtis ROck
06186f85c8 continued debugging 2020-08-12 20:52:32 -05:00
crockwave
cea7723fc3 refactored to improve default soapbox object for store 
refactored to render with local state if avail or with props
refactored to build soapbox object for api and store from local state if avail or with props
 2020-08-12 17:24:14 -05:00
Mary Kate
16d68e0bef styles for nested markdown, fixes #295 2020-08-12 15:09:21 -05:00
Sean King
d49d8bc145 Remove dupilcate quickFilter in notification settings 2020-08-12 13:39:13 -06:00
Mary Kate
9b85b4ad7f remove info from deactivated account pages 2020-08-12 13:06:28 -05:00
crockwave
0f70fde172 action_bar had a poor merge conflict correction fixed. 
Still experimenting with updating nested state
 2020-08-11 18:41:03 -05:00
Mary Kate
45ded363f1 update markdown styles 2020-08-11 18:31:16 -05: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
Curtis ROck
207750aef4 Trying immutable functions to modify state object 2020-08-11 06:30:54 -05: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
crockwave
e6d009d4f2 Trying to update nested state on element change events 2020-08-10 19:29:38 -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
b90c6b7de7 Merge branch 'list-overflow-hotfix' into 'develop' 
fix overflow on list index

See merge request soapbox-pub/soapbox-fe!149
 2020-08-10 21:46:22 +00:00
Mary Kate
e85baee486 fix overflow on list index 2020-08-10 16:35:34 -05:00
Alex Gleason
c9b925d252
Fix edit profile checkbox state, fixes #261 #284 2020-08-10 16:17:39 -05:00
crockwave
a001fa2dfe Merge branch 'admin_cfg' of https://gitlab.com/soapbox-pub/soapbox-fe into admin_cfg 2020-08-10 15:33:34 -05:00
Alex Gleason
1697731ad7 Merge branch 'markdown-hotfix' into 'develop' 
list markdown hotfix

Closes #279

See merge request soapbox-pub/soapbox-fe!148
 2020-08-10 20:30:53 +00: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
e6b5ef24eb list markdown hotfix 2020-08-10 15:20:09 -05: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
3fc91c2c1d
Revert "Merge branch 'bullet_point_css' into 'develop'" 
This reverts commit bf3de8adc5, reversing
changes made to a892e3ce81.
 2020-08-10 10:48:41 -05:00
Sean King
02a1bb47cf Fix poll X button 2020-08-10 09:25:57 -06:00
Sean King
f3893effbe Fix bullet point css issue 2020-08-09 22:27:55 -06:00
Curtis
ea94b05608 Resolve merge conflicts 
Merge branch 'develop' into 'admin_cfg'

# Conflicts:
#   app/soapbox/features/compose/components/action_bar.js
#   app/soapbox/features/edit_profile/index.js
 2020-08-09 23:02:48 +00:00
Sean King
c91ca7edd6 Fix toggle CSS 2020-08-09 15:23:27 -06: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
Curtis ROck
72a4a38fec Refactoring to use soapbox object as state. Still buggy 2020-08-09 11:03:24 -05:00
Alex Gleason
715779653c
Rearrange home sidebars 2020-08-09 00:29:28 -05:00
Sean King
95fb1b7900 Update index.js 2020-08-09 01:40:35 +00:00
Alex Gleason
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
Alex Gleason
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
Mary Kate
ae608388a0 add DM filter option for Home timeline, fixes #254 2020-08-07 20:47:04 -05:00
Mary Kate
e116745e83 timeline filtering improvements 2020-08-07 19:28:30 -05:00
Alex Gleason
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
Mary Kate
7931a9a89d code review 2020-08-07 18:10:13 -05:00
Mary Kate
edb15ce150 Merge branch 'user-verification' of gitlab.com:soapbox-pub/soapbox-fe into user-verification 2020-08-07 17:01:41 -05:00
Mary Kate
e9d76b6287 Update chained get requests 2020-08-07 17:01:15 -05:00
Curtis
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
Alex Gleason
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
marykatefain
68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00
Alex Gleason
2b5c0a95d2 Merge branch 'all_sound_toggle' into 'develop' 
Toggle for all notification sounds, fixes #260

Closes #260

See merge request soapbox-pub/soapbox-fe!134
 2020-08-07 20:06:38 +00:00
crockwave
a5b69e77a3 Added Admin settings opening in new tab 2020-08-07 12:58:59 -05:00
Sean King
56bac95ad4 Toggle for all notification sounds 2020-08-06 11:54:58 -06:00
crockwave
6e782ca3a0 Modified Profile bio to use textarea, preserving newlines and HTML rendered 2020-08-05 19:08:38 -05:00
Alex Gleason
f07de93ee3 Merge branch 'emoji-rendering-hotfix' into 'develop' 
Only render emoji selector in the dom when needed

See merge request soapbox-pub/soapbox-fe!131
 2020-08-05 21:04:41 +00:00
Mary Kate
769a512445 only render emoji selector in the dom when needed 2020-08-05 15:53:30 -05:00
Alex Gleason
aadde55262 Merge branch 'hover-card-display-hotfix' into 'develop' 
Only render a hover profile card in the dom when relevant

See merge request soapbox-pub/soapbox-fe!130
 2020-08-05 20:50:55 +00:00
Mary Kate
e6ee961016 Only render a hover profile card in the dom when relevant 2020-08-05 14:27:42 -05:00
Mary Kate
39d29f4e25 Update account colors to be more silimar to existing Soapbox color patterns 2020-08-05 13:20:46 -05:00
Alex Gleason
aec44bfea6 Verified: Use getIn in display_name.js 2020-08-05 18:04:32 +00:00
Mary Kate
f7f0439e72 prevent verified users from updating display name on frontend 2020-08-05 12:47:45 -05:00
Mary Kate
c9b2b66283 add verification icon on verified users 2020-08-05 12:08:52 -05:00
Mary Kate
ab3f53cb27 styles on filter form 2020-08-04 21:57:54 -05:00
Mary Kate
69184ef97c add and remove muted words, filters 2020-08-04 21:15:16 -05:00
crockwave
3d24cfaf53 Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value 2020-08-04 18:05:16 -05:00
Mary Kate
bdd9204b3c basic filter form component set up 2020-08-04 15:21:42 -05:00
crockwave
c8ba54c7a1 Fixed linter warning in colorpicker render. Fixed button-secondary hover contrast issue 2020-08-03 14:53:12 -05:00
crockwave
d83ac121a8 Removed console logging from features/configuration 2020-08-03 10:53:08 -05:00
Alex Gleason
c3be47fca6
Merge remote-tracking branch 'origin/develop' into admin_cfg 2020-08-03 01:43:54 -05:00
Alex Gleason
eeaf9f0b8e
HoverCard: Do the JS way on DetailedStatus too 2020-08-03 00:40:13 -05:00
Alex Gleason
35c9574c2f
HoverCard: Handle delay in JS instead of CSS 2020-08-02 23:47:19 -05:00
Alex Gleason
5081dd73c0
HoverCard: Reposition badges 2020-08-02 23:14:31 -05:00
Alex Gleason
9a5046179b
HoverCard: Reposition ActionButton 2020-08-02 23:10:36 -05:00
Alex Gleason
e02ff2bed3
HoverCard: Style stats 2020-08-02 23:01:38 -05:00
Alex Gleason
e943dc8b4c
UserPanel: Don't wrap text 2020-08-02 22:19:52 -05:00
Curtis
f87b5d7ab8 Merge branch 'configure_logo' into 'admin_cfg' 
Fix site logo and banner rendering when no logo or banner is set

See merge request soapbox-pub/soapbox-fe!122
 2020-08-03 03:19:05 +00:00
Alex Gleason
4197e8e833
HoverCard: Prevent floating avatars from intercepting with current card 2020-08-02 22:13:32 -05:00
Curtis ROck
4df17048b0 updated translations 2020-08-02 22:07:35 -05:00
Alex Gleason
feec86718d
Display name fixes 2020-08-02 22:06:57 -05:00
Curtis ROck
f23e3f60cb debugged soapbox-test 2020-08-02 22:06:37 -05:00
Sean King
ea85c424a4 Fix site logo and banner rendering when no logo or banner is set 2020-08-02 20:52:23 -06:00
Alex Gleason
3fd255cc0a
HoverCard: Style <a> color 2020-08-02 21:46:56 -05:00
Alex Gleason
7fe70a64b5
Pleroma relationship fixes 2020-08-02 21:45:42 -05:00
Alex Gleason
ccec8698fc
Column border-radius fixes 2020-08-02 21:29:19 -05:00
Alex Gleason
2c010768e9 Merge branch 'profile-hover-cards' into 'develop' 
Profile hover cards

See merge request soapbox-pub/soapbox-fe!114
 2020-08-03 02:27:14 +00:00
Alex Gleason
29d1debdbf
Refactor ActionButton 2020-08-02 21:16:13 -05:00
Curtis
4717638ea8 Merge branch 'add-copyright-footer-admin-settings' into 'admin_cfg' 
Add copyright footer setting

See merge request soapbox-pub/soapbox-fe!121
 2020-08-03 02:05:53 +00:00
Alex Gleason
690d7154c4
HoverCard: Fix JS console errors 2020-08-02 21:05:21 -05:00
Alex Gleason
2e21c04e28
Clean up unused UserPanel code 2020-08-02 20:50:06 -05:00
Alex Gleason
24e7ce6e83
HoverCard: Improve long bio situation 2020-08-02 20:44:47 -05:00
Sean King
86d3340426 Fix typo 2020-08-02 19:10:32 -06:00
Alex Gleason
1266585aef
HoverCard: Reposition "Follow you!" component 2020-08-02 19:50:17 -05:00
Sean King
f21f713f9a Add copyright footer setting 2020-08-02 18:44:04 -06:00
Alex Gleason
a7463dd3fc
HoverCard: Add floating NavLinks for clickthrough 2020-08-02 18:53:47 -05:00
Curtis ROck
f205ff5334 Added tests to reducers/soapbox 2020-08-02 18:45:39 -05:00
Alex Gleason
1f5898b67d
Bring HoverCard out of NavLink 2020-08-02 18:39:32 -05:00
Alex Gleason
6c205deaf0
HoverCard: Fix hover flickering issues 2020-08-02 18:31:32 -05:00
Alex Gleason
abd13e8fa5
Move hovercard into display name for regular status too 2020-08-02 18:18:34 -05:00
Alex Gleason
a4a8f167d4 Merge branch 'fix-for-profile-hover' into 'profile-hover-cards' 
Fix for profile hover

See merge request soapbox-pub/soapbox-fe!115
 2020-08-02 23:16:46 +00:00
Alex Gleason
e32bf82b03
CSS formatting 2020-08-02 18:04:49 -05:00
Alex Gleason
9d35498bb9
HoverCard: Fix CSS whitespace issues 2020-08-02 18:03:37 -05:00
Sean King
e95366b572 Fix color picker so that a POST request is not done by default every time it opens 2020-08-02 16:17:34 -06:00
Sean King
49b8ecd639 Fix merge conflict. 2020-08-02 20:47:52 +00:00
Sean King
f398dde5cb Color picker for admin config 2020-08-02 14:41:26 -06:00
crockwave
1f6ca55366 Limit logo upload to either SVG or PNG 2020-08-02 14:07:13 -05:00
crockwave
ba18c3a643 SB settings Save works and brandcolor renders. Logo/banner paths are issues, and adding new homefooter/customCSS are issues 2020-08-01 16:38:29 -05:00
crockwave
43f28a30ba linter fix 2020-07-31 18:06:16 -05:00
crockwave
0b9eeccbc3 commented out to try to push an empty soapbox payload into Admin API 2020-07-31 17:35:14 -05:00
Curtis ROck
78df407e1e remarked out a case, due to that case being triggered during a Soapbox settings save event, which needs debugging. Post to AdminConfig fails with 400 Bad Request response. 2020-07-30 21:55:17 -05:00