Commit graph

797 commits

Author SHA1 Message Date
Alex Gleason
23e370a10b
Bookmarks: don't update constantly, fixes #263 2020-07-30 00:38:40 -05:00
Alex Gleason
59e2811a49 Merge branch 'approval-mode-fe-3' into 'develop'
Approval mode fe 3

See merge request soapbox-pub/soapbox-fe!117
2020-07-29 22:17:18 +00:00
Alex Gleason
02bdb6473c Merge branch 'bookmark-posts' into 'develop'
Bookmark posts

See merge request soapbox-pub/soapbox-fe!116
2020-07-29 21:08:36 +00:00
marykatefain
ee97e94779 Bookmark posts 2020-07-29 21:08:36 +00:00
Mary Kate
774adf9baa update reason or joining form to simpletextarea 2020-07-28 21:43:27 -05:00
Mary Kate
4ce5ba6c1a textarea input 2020-07-28 21:43:27 -05:00
Mary Kate
209f826c15 add reason field on registration when by approval mode is on 2020-07-28 21:43:27 -05:00
Alex Gleason
444e3641ee
Fix disappearing poll button when media is uploaded 2020-07-28 14:42:58 -05:00
Alex Gleason
7342325e23 Merge branch 'add-images-to-polls' into 'develop'
Add uploads to polls

See merge request soapbox-pub/soapbox-fe!113
2020-07-28 19:27:05 +00: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
5333680a32
Linter fixes 2020-07-28 14:13:29 -05:00
Alex Gleason
2aa553c6d5 Merge branch 'add-markdown-posts' into 'develop'
Add markdown posts

See merge request soapbox-pub/soapbox-fe!112
2020-07-28 19:11:15 +00:00
Alex Gleason
ac6b4033dd
Merge remote-tracking branch 'origin/develop' into add-markdown-posts 2020-07-28 14:00:25 -05:00
Alex Gleason
eda4c7d629
Add markdown reducer tests 2020-07-28 13:53:01 -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
Alex Gleason
efbe28967d Merge branch 'revert-cw-changes' into 'develop'
Revert CW changes

See merge request soapbox-pub/soapbox-fe!111
2020-07-28 18:08:40 +00:00
Mary Kate
bc787e0bbe add markdown posts 2020-07-28 12:24:04 -05:00
Alex Gleason
665a27d4c9
Update compose CW tests 2020-07-28 10:57:20 -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
Alex Gleason
9b66611540
Revert "Merge branch 'patch-1' into 'develop'"
This reverts commit 20bfeb1db6, reversing
changes made to 475881e80b.
2020-07-28 10:50:51 -05:00
Alex Gleason
30a5a0baa9
Fix compose form border-radius 2020-07-27 23:55:23 -05:00
Alex Gleason
9b46b2e0c0 Merge branch '63-dismiss-fediverse-explanation' into 'develop'
Add toggle to collapse and expand Fediverse tab explanation box, fixes #63

Closes #63

See merge request soapbox-pub/soapbox-fe!109
2020-07-26 22:59:25 +00:00
Mary Kate
7fd8c860b6 add toggle to collapse and expand Fediverse tab explaination box, fixes #63 2020-07-26 17:49:43 -05:00
Alex Gleason
97515b7794
yarn start --> yarn dev 2020-07-26 15:26:23 -05:00
Alex Gleason
e47131a4b5 Merge branch '249-dark-mode-emoji-input' into 'develop'
Make emoji selector text visible on dark mode, fixes #249

Closes #249

See merge request soapbox-pub/soapbox-fe!108
2020-07-26 20:19:48 +00:00
Mary Kate
f81f5d057b Make emoji selector text visible on dark mode, fixes #249 2020-07-26 15:07:53 -05:00
Alex Gleason
5c0bef4e9b
Fix header .still-image on mobile 2020-07-20 20:36:11 -05:00
Alex Gleason
ce6446f059
Center icon in theme-toggle 2020-07-20 17:30:10 -05:00
Alex Gleason
e8288ffdf8
Fix theme-toggle v-align issues 2020-07-20 15:34:54 -05:00
Alex Gleason
c0dc03b3e4
Deactivate --> Delete 2020-07-20 15:23:38 -05:00
Alex Gleason
79dcbd781d Merge branch 'deactivate_account_from_profile' into 'develop'
Deactivate account from profile. Fixes #153

Closes #153

See merge request soapbox-pub/soapbox-fe!87
2020-07-20 19:55:02 +00:00
Alex Gleason
20bfeb1db6 Merge branch 'patch-1' into 'develop'
Update compose-test.js to accommodate decoupling of CW toggle from sensitive (NSFW) assignment

See merge request soapbox-pub/soapbox-fe!106
2020-07-20 19:37:56 +00:00
Curtis
d15f8d4a4e Update compose-test.js to accommodate decoupling of CW toggle from sensitive (NSFW) assignment 2020-07-20 19:28:06 +00:00
Alex Gleason
475881e80b Merge branch 'reducers_tests' into 'develop'
Reducers tests

See merge request soapbox-pub/soapbox-fe!103
2020-07-20 19:10:33 +00:00
Alex Gleason
ec8cd65e8d Merge branch 'change-toggle-design' into 'develop'
Change design of toggle button

See merge request soapbox-pub/soapbox-fe!105
2020-07-20 01:14:14 +00:00
Sean King
1a0c3131bf Spacing fix 2020-07-19 19:03:39 -06:00
Sean King
9df1b085cb ThemeToggle class 2020-07-19 18:50:09 -06:00
Sean King
277f4b5f22 Move ThemeToggle to separate class, style it, and fix it on mobile 2020-07-19 18:44:17 -06:00
Sean King
796bf9c844 Change design of toggle button 2020-07-19 15:50:16 -06:00
Alex Gleason
03e33df86b
Improve domain unblock compatibility, fixes #422 2020-07-16 13:43:25 -05:00
crockwave
7023471abe edited auth-test 2020-07-15 17:36:34 -05:00
Alex Gleason
2024c4ec0d Merge branch 'new-yarn-translations' into 'develop'
New yarn translations after toggle change

See merge request soapbox-pub/soapbox-fe!100
2020-07-15 21:01:17 +00:00
Alex Gleason
93ae2fff9b
Don't strip comments from HTML 2020-07-15 11:10:27 -05:00
Alex Gleason
34d57df806
Add <!--server-generated-meta--> 2020-07-15 10:59:44 -05:00
crockwave
e5937b42e4 fix linter error 2020-07-14 18:21:49 -05:00
crockwave
599129897a edited accounts and alerts reducer tests 2020-07-14 17:11:05 -05:00
crockwave
67d94fb226 edited accounts_counters-test 2020-07-14 14:05:05 -05:00
Curtis ROck
26a37382de edited accounts_counters-test 2020-07-14 07:43:56 -05:00