moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
932 Commits 234 Branches 14 Tags 65 MiB
Commit Graph

932 Commits

Author SHA1 Message Date
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
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
crockwave 8b2c7b344b Trying to get blank customCss field to appear on virgin usage 2020-08-13 19:04:54 -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
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 a892e3ce81 Merge branch 'toggle_css' into 'develop' 
Fix toggle CSS, fixes #277

Closes #277

See merge request soapbox-pub/soapbox-fe!141
 2020-08-09 21:35:05 +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
Alex Gleason 3135a2a5ec Merge branch 'fields-limit' into 'develop' 
Reintroduce fields limit changes

See merge request soapbox-pub/soapbox-fe!137
 2020-08-09 02:01:32 +00:00
Alex Gleason 09bd8f28d1 Merge branch 'patch-4' into 'fields-limit' 
Fix for fields_limit

See merge request soapbox-pub/soapbox-fe!138
 2020-08-09 01:51:16 +00: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
Alex Gleason 6ecf1a3ace Merge branch 'local-timeline-filters' into 'develop' 
Timeline filtering improvements

Closes #254

See merge request soapbox-pub/soapbox-fe!136
 2020-08-08 02:32:47 +00: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
Alex Gleason 9819f1aa73 Merge branch 'timeline-word-filters' into 'develop' 
Timeline word filters

Closes #14

See merge request soapbox-pub/soapbox-fe!126
 2020-08-07 21:09:52 +00: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
Alex Gleason 6bd8c0733a Merge branch 'admin_new_tab' into 'develop' 
Added Admin settings opening in new tab. Fixes #272

Closes #272

See merge request soapbox-pub/soapbox-fe!135
 2020-08-07 20:04:05 +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
Alex Gleason 8d28f9b9a5 Merge branch 'account-coloration-improvements' into 'develop' 
Update account colors to be more silimar to existing Soapbox color patterns

See merge request soapbox-pub/soapbox-fe!129
 2020-08-05 20:50:35 +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