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 |
|
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 |
|
Alex Gleason
|
19e3dc9ed3
|
Merge branch 'max_profile_fields' into 'develop'
Store fieldsLimits in instance/pleroma/metadata of the Redux store. Fixes #154
Closes #154
See merge request soapbox-pub/soapbox-fe!125
|
2020-08-04 23:18:50 +00: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
|
05cc7ac818
|
Fixed features/edit_profile checkbox issues. Bot value always returned true, so commented that feature out
|
2020-08-03 18:05:53 -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 |
|