Commit graph

865 commits

Author SHA1 Message Date
Curtis ROck
acfd8fe2ac edit conversations-test 2020-07-07 08:55:44 -05:00
Sean King
dcedd428f3 Fixes of SCSS 2020-07-06 15:39:20 -06:00
Sean King
f99db09c8d Change the repost to be alongside emoji reacts 2020-07-06 15:35:27 -06:00
crockwave
c55e937dcc linter fix 2020-07-06 15:08:13 -05:00
crockwave
8ad0b96600 fix linter 2020-07-06 14:52:01 -05:00
crockwave
ff63b6f6c5 edit auth-test 2020-07-06 14:42:11 -05:00
Alex Gleason
cccd180fca
Update CHANGELOG.md 2020-07-06 12:12:24 -05:00
Alex Gleason
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
Sean King
64477f3b7f Remove the applicationLink 2020-07-05 22:27:14 -06:00
crockwave
ca2ccb8a3c started editing additional reducer tests 2020-07-05 19:38:32 -05:00
Alex Gleason
0821374cdc
Update changelog 2020-07-05 10:04:14 -05:00
Alex Gleason
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
Alex Gleason
44e882d7fc
Show donor badge 2020-07-04 21:25:43 -05:00
Alex Gleason
4c6589637d
Tests: relationships reducers 2020-07-04 20:48:31 -05:00
Alex Gleason
61deb1237d
Make relationships load faster
Import pleroma.relationships when the account loads
2020-07-04 20:15:20 -05:00
Alex Gleason
d31946775c
"Follows you" CSS fix 2020-07-04 19:43:28 -05:00
Alex Gleason
15998abf89
Refactor account reducer 2020-07-04 19:37:07 -05:00
Alex Gleason
a83f785b73
React 17.x upgrade fixes 2020-07-04 19:32:07 -05:00
Alex Gleason
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
Alex Gleason
853dad032c
componentWillReceiveProps fixes, fixes #184, #231, !80 2020-07-04 19:14:12 -05:00
Alex Gleason
75ab969051
Purge unused Badge components 2020-07-04 17:11:38 -05:00
crockwave
f7f2b500b5 edit reducers/compose-test 2020-07-04 14:43:50 -05:00
Alex Gleason
82c07f84b4
Pull patronUrl from /api/patron/v1/instance 2020-07-04 14:21:58 -05:00
Alex Gleason
0dc085411c
Refactor Patron code 2020-07-04 14:14:36 -05:00
Alex Gleason
751261a173
Local dev: proxy patron endpoints again 2020-07-04 14:01:54 -05:00
crockwave
a3df58e260 edited reducers/compose-test.js 2020-07-04 13:13:23 -05:00
Alex Gleason
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
Sean King
d973ff0aa1 Fix media modal 2020-07-04 18:00:21 +00: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
crockwave
7da412d8e5 fixed linter errors 2020-07-04 11:38:50 -05:00
crockwave
cb98e71748 edit reducers/compose.js 2020-07-03 18:44:25 -05:00
Curtis
ee795e38d3 Update defaultMessages.json to include captcha defaultMessage 2020-07-03 20:13:19 +00:00
Curtis
c28cc228a2 Merge branch 'develop' into 'captcha_reload_on_click'
# Conflicts:
#   app/soapbox/locales/defaultMessages.json
2020-07-03 20:11:09 +00:00
Alex Gleason
b43b306a93
Repost avatar positioning fix 2020-07-02 23:21:22 -05:00
Alex Gleason
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
crockwave
ed9c9800ae further compose reducer tests 2020-07-02 20:18:19 -05:00
Alex Gleason
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
Sean King
6d9a2fab27 Update detailed_status.js 2020-07-03 00:06:26 +00:00
Alex Gleason
29f26745e2
Fix linter :( 2020-07-02 18:39:17 -05:00
Alex Gleason
aa35e2ec46
Fix old soapbox.json failing 2020-07-02 18:16:41 -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
1be7fa8c15
Run yarn manage:translations 2020-07-02 16:47:09 -05:00
Alex Gleason
c6cee89daa
Merge branch 'audio-player' into develop 2020-07-02 16:35:58 -05:00
Alex Gleason
4e94c5d2ca
Merge branch 'develop' into audio-player 2020-07-02 16:32:50 -05:00
Sean King
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
Sean King
e2f76f538c
Refactor Audio modal and make View context actually work 2020-07-02 16:31:51 -05:00
Sean King
bf8b875b96
Jest test failure fix. Let's make sure we don't have the roof collapse. 2020-07-02 16:31:51 -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
Sean King
29e43fa642
Update status_check_box.js 2020-07-02 16:21:33 -05:00