Commit graph

293 commits

Author SHA1 Message Date
Alex Gleason
2f2c849dfa
Chats: remove DM links from menus 2020-08-28 15:09:17 -05:00
Alex Gleason
2470e59596
/admin --> /soapbox/config 2020-08-23 21:48:31 -05:00
Alex Gleason
e3b1e8c31d
SoapboxConfig: Fix menu links to use to instead of href 2020-08-23 20:43:41 -05:00
Alex Gleason
20269bbe3e
soapbox_settings --> soapbox_config 2020-08-23 15:21:19 -05:00
Alex Gleason
2cdf6f7275
Merge remote-tracking branch 'origin/develop' into admin_cfg 2020-08-23 12:16:52 -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
c4046cbf7e add video and audio media placeholders in compose form 2020-08-10 20:59:24 -05:00
Sean King
10d1010265 New upload icon 2020-08-10 11:49:38 -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
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
Alex Gleason
444e3641ee
Fix disappearing poll button when media is uploaded 2020-07-28 14:42:58 -05:00
Alex Gleason
1329ca3578
Merge remote-tracking branch 'origin/develop' into add-images-to-polls 2020-07-28 14:18:30 -05:00
Mary Kate
a3201605b4 add uploads to polls 2020-07-28 14:15:15 -05:00
Alex Gleason
ac6b4033dd
Merge remote-tracking branch 'origin/develop' into add-markdown-posts 2020-07-28 14:00:25 -05:00
Alex Gleason
b31cf22f43
Markdown refactoring 2020-07-28 13:43:22 -05:00
Mary Kate
daf039d9bb generalize markdown to content_type 2020-07-28 13:31:44 -05:00
Mary Kate
bc787e0bbe add markdown posts 2020-07-28 12:24:04 -05:00
Alex Gleason
2aca716cfa
Revert "Merge branch 'decouple_spoiler_from_nsfw' into 'develop'"
This reverts commit 03c2a8f294, reversing
changes made to b6c0884a1d.
2020-07-28 10:52:29 -05:00
Curtis ROck
de917da39e Added menu item for Soapbox settings. Added translations 2020-07-20 21:17:23 -05:00
Alex Gleason
03c2a8f294 Merge branch 'decouple_spoiler_from_nsfw' into 'develop'
Update compose.js to decouple spoiler from marking media as NSFW. Fixes #209

Closes #209

See merge request soapbox-pub/soapbox-fe!90
2020-07-11 19:36:22 +00:00
Alex Gleason
a83f785b73
React 17.x upgrade fixes 2020-07-04 19:32:07 -05:00
Alex Gleason
853dad032c
componentWillReceiveProps fixes, fixes #184, #231, !80 2020-07-04 19:14:12 -05:00
Alex Gleason
b1bae44165 Merge branch 'poll_hint_toggle_radiobutton' into 'develop'
Added mouseover hint to poll compose radiobutton. Fixes #215

Closes #215

See merge request soapbox-pub/soapbox-fe!88
2020-07-04 17:59:43 +00:00
Curtis
894cd4668f Update sensitive_button_container.js to prevent it becoming disabled when Subject line is active 2020-07-02 22:02:21 +00:00
Alex Gleason
4e94c5d2ca
Merge branch 'develop' into audio-player 2020-07-02 16:32:50 -05:00
Sean King
1a7cbb21a7
Audio player work (change of sensitive content handling) 2020-07-02 16:31:48 -05:00
Sean King
01d042f80d
Update of work on audio player 2020-07-02 16:31:43 -05:00
crockwave
86d9dea032 Added mouseover hint to poll compose radiobutton, to let user know that a click toggles between single and multi-choice polls 2020-06-28 12:34:14 -05:00
Alex Gleason
ecf26de289 Merge branch 'componentWillReceiveProps_to_DidUpdate_refactor' into 'develop'
Component will receive props to did update refactor Fixes #184

Closes #184

See merge request soapbox-pub/soapbox-fe!80
2020-06-27 00:23:44 +00:00
crockwave
3d29f7b6e2 partial mods to replace deprecated componentWillReceiveProps 2020-06-22 20:26:20 -05:00
crockwave
24b72b5828 Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179 2020-06-17 20:42:30 -05:00
Alex Gleason
c5e1f3cfd4
Lint: Fix weird react-hooks error 2020-06-09 23:11:35 -05:00
Alex Gleason
d78760e188
Composer: Improve design, fixes #158 2020-06-07 18:05:54 -05:00
Alex Gleason
4737dc6da9
Compose: Fix NSFW tag error on CW 2020-06-07 15:30:21 -05:00
Alex Gleason
409431d7e8
Focal Point: make conditional based on BE, fixes #159 2020-06-07 14:57:13 -05:00
Alex Gleason
d772608df4
Search: Conditionally display hashtag features, fixes #142 2020-06-07 14:09:33 -05:00
Alex Gleason
ab280b80e1
SecurityForm: Add navigation links 2020-06-05 14:58:59 -05:00
Alex Gleason
61fcfdbc6e
Fix ComposeForm Ctrl+Enter hotkey issue, fixes #127 2020-05-30 17:29:50 -05:00
Alex Gleason
f451b81e25
Remove searchEnabled 2020-05-28 20:41:18 -05:00
Alex Gleason
d24dcb3e60
gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00