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

224 commits

Author SHA1 Message Date
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
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
Curtis ROck
207750aef4 Trying immutable functions to modify state object 2020-08-11 06:30:54 -05:00
crockwave
e6d009d4f2 Trying to update nested state on element change events 2020-08-10 19:29:38 -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
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
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
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
Mary Kate
769a512445 only render emoji selector in the dom when needed 2020-08-05 15:53:30 -05: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
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
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