Commit Graph

710 Commits

Author SHA1 Message Date
93ae2fff9b Don't strip comments from HTML 2020-07-15 11:10:27 -05:00
34d57df806 Add <!--server-generated-meta--> 2020-07-15 10:59:44 -05:00
7d893b8469 Merge branch 'patch-4' into 'develop'
Remove the reference to the code of conduct under Project Contribution Flow

See merge request soapbox-pub/soapbox-fe!102
2020-07-13 02:49:43 +00:00
114dcf4ffd Remove the reference to the code of conduct under Project Contribution Flow 2020-07-13 02:39:28 +00:00
96f8fdbb9d Merge branch 'remove-auto-hide-top-navbar' into 'develop'
Remove top navbar's auto-hide

See merge request soapbox-pub/soapbox-fe!101
2020-07-12 22:51:09 +00:00
54d7fbdc5a Remove top navbar's auto-hide 2020-07-12 16:39:18 -06:00
a9347a9d27 Merge branch 'fix-theme-toggle-bug' into 'develop'
Fix a bug where the theme toggle doesn't show the proper icon if the themeMode is not set

See merge request soapbox-pub/soapbox-fe!98
2020-07-12 04:07:19 +00:00
03c63fa36d Fix a bug where it doesn't show the proper icon if the themeMode is not set 2020-07-11 21:29:57 -06:00
49a3211777 Merge branch 'theme-toggle' into 'develop'
Light/dark theme toggle in top navbar

See merge request soapbox-pub/soapbox-fe!97
2020-07-11 20:40:26 +00:00
8b376b81cf State condition isLight unnecessary 2020-07-11 14:22:39 -06:00
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
b6c0884a1d Merge branch 'captcha_reload_on_click' into 'develop'
Made captcha reloadable on image click. Fixes #203

Closes #203

See merge request soapbox-pub/soapbox-fe!89
2020-07-11 19:34:51 +00:00
697291e6f5 Light/dark theme toggle in top navbar 2020-07-10 22:35:02 -06:00
06c4f88802 DetailedStatus: Small reblog tweaks 2020-07-08 21:42:34 -05:00
1ac32ad364 Merge branch 'repostdetailed' into 'develop'
Change the repost to be alongside emoji reacts (fixes #241)

Closes #241

See merge request soapbox-pub/soapbox-fe!96
2020-07-09 02:01:01 +00:00
dcedd428f3 Fixes of SCSS 2020-07-06 15:39:20 -06:00
f99db09c8d Change the repost to be alongside emoji reacts 2020-07-06 15:35:27 -06:00
cccd180fca Update CHANGELOG.md 2020-07-06 12:12:24 -05:00
794a7373f5 Merge branch 'removeapplicationlink' into 'develop'
Remove the applicationLink

See merge request soapbox-pub/soapbox-fe!95
2020-07-06 17:08:46 +00:00
64477f3b7f Remove the applicationLink 2020-07-05 22:27:14 -06:00
0821374cdc Update changelog 2020-07-05 10:04:14 -05:00
6f46b6a323 Merge branch 'patron' into 'develop'
Show Patron donor badge, fixes #238

Closes #238

See merge request soapbox-pub/soapbox-fe!94
2020-07-05 02:36:42 +00:00
44e882d7fc Show donor badge 2020-07-04 21:25:43 -05:00
4c6589637d Tests: relationships reducers 2020-07-04 20:48:31 -05:00
61deb1237d Make relationships load faster
Import pleroma.relationships when the account loads
2020-07-04 20:15:20 -05:00
d31946775c "Follows you" CSS fix 2020-07-04 19:43:28 -05:00
15998abf89 Refactor account reducer 2020-07-04 19:37:07 -05:00
a83f785b73 React 17.x upgrade fixes 2020-07-04 19:32:07 -05:00
1e1313a023 Merge branch 'componentWillReceiveProps' into 'develop'
componentWillReceiveProps fixes, fixes #184, #231, !80

Closes #231 and #184

See merge request soapbox-pub/soapbox-fe!93
2020-07-05 00:25:13 +00:00
853dad032c componentWillReceiveProps fixes, fixes #184, #231, !80 2020-07-04 19:14:12 -05:00
75ab969051 Purge unused Badge components 2020-07-04 17:11:38 -05:00
82c07f84b4 Pull patronUrl from /api/patron/v1/instance 2020-07-04 14:21:58 -05:00
0dc085411c Refactor Patron code 2020-07-04 14:14:36 -05:00
751261a173 Local dev: proxy patron endpoints again 2020-07-04 14:01:54 -05:00
735a304009 Merge branch 'patch-4' into 'develop'
Fix media modal

See merge request soapbox-pub/soapbox-fe!92
2020-07-04 18:00:21 +00:00
d973ff0aa1 Fix media modal 2020-07-04 18:00:21 +00:00
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
ee795e38d3 Update defaultMessages.json to include captcha defaultMessage 2020-07-03 20:13:19 +00:00
c28cc228a2 Merge branch 'develop' into 'captcha_reload_on_click'
# Conflicts:
#   app/soapbox/locales/defaultMessages.json
2020-07-03 20:11:09 +00:00
b43b306a93 Repost avatar positioning fix 2020-07-02 23:21:22 -05:00
71b53f26a0 Merge branch 'patch-1' into 'develop'
Update customization.md to include @albatross nginx config for Soapbox install

See merge request soapbox-pub/soapbox-fe!85
2020-07-03 03:58:39 +00:00
015c9559dd Merge branch 'patch-4' into 'develop'
Fix audio plus other attachments when there's more than one attachment on detailed status

See merge request soapbox-pub/soapbox-fe!91
2020-07-03 00:29:06 +00:00
6d9a2fab27 Update detailed_status.js 2020-07-03 00:06:26 +00:00
29f26745e2 Fix linter :( 2020-07-02 18:39:17 -05:00
aa35e2ec46 Fix old soapbox.json failing 2020-07-02 18:16:41 -05:00
894cd4668f Update sensitive_button_container.js to prevent it becoming disabled when Subject line is active 2020-07-02 22:02:21 +00:00
1be7fa8c15 Run yarn manage:translations 2020-07-02 16:47:09 -05:00
c6cee89daa Merge branch 'audio-player' into develop 2020-07-02 16:35:58 -05:00
4e94c5d2ca Merge branch 'develop' into audio-player 2020-07-02 16:32:50 -05:00
3be1c9a1f1 Fixes for audio attachments when there is more than 1 attachment and icons for audio attachments 2020-07-02 16:31:52 -05:00