Alex Gleason
|
20269bbe3e
|
soapbox_settings --> soapbox_config
|
2020-08-23 15:21:19 -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
|
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 |
|
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 |
|
crockwave
|
a5b69e77a3
|
Added Admin settings opening in new tab
|
2020-08-07 12:58:59 -05:00 |
|
Mary Kate
|
bdd9204b3c
|
basic filter form component set up
|
2020-08-04 15:21:42 -05:00 |
|
marykatefain
|
ee97e94779
|
Bookmark posts
|
2020-07-29 21:08:36 +00:00 |
|
Curtis ROck
|
de917da39e
|
Added menu item for Soapbox settings. Added translations
|
2020-07-20 21:17:23 -05:00 |
|
Alex Gleason
|
ab280b80e1
|
SecurityForm: Add navigation links
|
2020-06-05 14:58:59 -05:00 |
|
Alex Gleason
|
d24dcb3e60
|
gabsocial --> soapbox paths
|
2020-05-28 17:56:55 -05:00 |
|