Commit graph

12 commits

Author SHA1 Message Date
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
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
c5e1f3cfd4
Lint: Fix weird react-hooks error 2020-06-09 23:11:35 -05:00
Alex Gleason
409431d7e8
Focal Point: make conditional based on BE, fixes #159 2020-06-07 14:57:13 -05:00
Alex Gleason
d24dcb3e60
gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00