Commit Graph

2299 Commits

Author SHA1 Message Date
859eb77ffc Refactor verification actions 2021-07-13 12:26:56 -05:00
5eafa25ea9 Allow promotion/demotion of users to staff roles 2021-07-13 12:21:12 -05:00
4c82b4703b ProfileInfoPanel: avoid redundant staff badge
If the user is an admin, don't display the moderator badge
2021-07-13 11:21:37 -05:00
955a4863f0 Merge branch 'moderators' into 'develop'
Moderators: conditional display of features

See merge request soapbox-pub/soapbox-fe!609
2021-07-13 04:48:43 +00:00
96af79ad90 Moderators: conditional display of features 2021-07-12 23:32:02 -05:00
0fbc3f3d99 Merge branch 'unmangle-production' into 'develop'
Webpack: switch to TerserPlugin, don't mangle output

See merge request soapbox-pub/soapbox-fe!608
2021-07-12 03:57:19 +00:00
b9901cf638 Lint: add terser-webpack-plugin as a package.json dep 2021-07-11 22:41:10 -05:00
d86eb6d848 Webpack: don't mangle output in TerserPlugin 2021-07-11 22:21:44 -05:00
cc5084c481 Remove deprecated uglifyjs-webpack-plugin 2021-07-11 22:13:18 -05:00
2572640c3a Merge branch 'error-boundary-pretty-browser' into 'develop'
ErrorBoundary: display user's browser info

See merge request soapbox-pub/soapbox-fe!606
2021-07-11 23:35:51 +00:00
4f51f1cea6 ErrorBoundary: display user's browser info 2021-07-11 18:19:18 -05:00
b66cc1f71f Merge branch 'defensive-this-node' into 'develop'
Possible crash fix: defensive checks of this.node

See merge request soapbox-pub/soapbox-fe!604
2021-07-11 23:07:14 +00:00
52b14d9d09 Possible crash fix: defensive checks of this.node 2021-07-11 17:50:30 -05:00
284972aa76 Merge branch 'onlyemoji-crash-fix' into 'develop'
Big emojis: fix possible web crash

See merge request soapbox-pub/soapbox-fe!602
2021-07-10 17:46:46 +00:00
a66f2b3f75 Big emojis: fix possible web crash 2021-07-10 12:41:57 -05:00
f208d350a2 Merge branch 'actually-actually-actually-actually-fix-tabs-bar' into 'develop'
TabsBar: move withRouter to outer component

Closes #680

See merge request soapbox-pub/soapbox-fe!601
2021-07-10 10:16:59 +00:00
c24c8aa4d1 TabsBar: move withRouter to outer component 2021-07-10 05:13:38 -05:00
7093e6b4de Merge branch 'relationship-styles' into 'develop'
Improve account list styling

See merge request soapbox-pub/soapbox-fe!600
2021-07-10 10:04:23 +00:00
258889c492 Merge branch 'refactor-getOtherAccounts' into 'develop'
Refactor getOtherAccounts selector

See merge request soapbox-pub/soapbox-fe!599
2021-07-10 10:00:48 +00:00
61493bab42 Merge branch 'tabs-bar-hack' into 'develop'
TabsBar: force rerender, fixes #680

Closes #680

See merge request soapbox-pub/soapbox-fe!598
2021-07-10 09:56:58 +00:00
288a2c3623 Improve account list styling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-07-10 11:54:21 +02:00
a12b1a0749 Merge branch 'babel-improvements' into 'develop'
Babel improvements, upgrade deps

See merge request soapbox-pub/soapbox-fe!596
2021-07-10 09:51:50 +00:00
4e3c002f8a Refactor getOtherAccounts selector 2021-07-10 04:49:44 -05:00
ea1c05ae0b Improve account list styling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-07-10 11:42:37 +02:00
447a2561f4 TabsBar: force rerender 2021-07-10 04:40:16 -05:00
c8cafb4feb jest: use jsdom test environment 2021-07-10 03:10:55 -05:00
2d8862a3a1 Merge remote-tracking branch 'origin/develop' into babel-improvements 2021-07-10 03:00:08 -05:00
4f54031fb9 Upgrade jest 2021-07-10 02:58:01 -05:00
079e269812 Merge branch 'upgrade-emoji-mart' into 'develop'
Upgrade emoji mart

See merge request soapbox-pub/soapbox-fe!595
2021-07-10 07:14:51 +00:00
469115cf85 Upgrade react-router-dom to 4.3.1 2021-07-10 02:13:42 -05:00
225f61cc5b Merge branch 'upgrade-emoji-mart' into fix-notifications-tab 2021-07-10 02:00:29 -05:00
89b9c739b1 Update tests
I have no idea why changing soapbox -> mastodon fixes this, but I'm tired
2021-07-10 01:59:44 -05:00
3f2716bae9 Emoji picker: fix background of title bar 2021-07-10 01:41:43 -05:00
ce5c42b5db Fix font icon picker 2021-07-10 01:40:00 -05:00
a3d5d1a882 Upgrade emoji-datasource to 5.0.0 2021-07-10 00:43:49 -05:00
5789b8338b Upgrade emoji-mart to 3.0.1 2021-07-09 23:57:54 -05:00
040bd7587a Add browserslist as an explicit dep 2021-07-09 21:05:54 -05:00
118a8e8f79 Update browserslist config 2021-07-09 21:04:15 -05:00
08d38f09e2 Babel: enable useBuiltIn option to turn on polyfills 2021-07-09 20:47:35 -05:00
6df733ba4e Fix PropTypes warning in WrappedRoute 2021-07-09 19:56:09 -05:00
c50a7b2126 Babel: disable 'loose' mode 2021-07-09 19:55:59 -05:00
19ed7b6883 Merge branch 'only-emoji-fix-2' into 'develop'
Big emojis: fix race condition

See merge request soapbox-pub/soapbox-fe!593
2021-07-09 23:53:03 +00:00
22254ec6bb Big emojis: fix race condition 2021-07-09 18:52:06 -05:00
8b4d855758 Merge branch 'big-emojis-fix' into 'develop'
Big emojis: ignore mentions

See merge request soapbox-pub/soapbox-fe!592
2021-07-09 23:40:33 +00:00
011b5dd19b Big emojis: ignore mentions 2021-07-09 18:39:05 -05:00
45f6c21617 Merge branch 'fix-notification-categories' into 'develop'
Fix notification categories, fixes #679

Closes #679

See merge request soapbox-pub/soapbox-fe!591
2021-07-09 23:10:40 +00:00
75d464b4d4 Notifications: no need to reverse fetched data 2021-07-09 17:56:25 -05:00
94332ea0ef Notifications: improve look of advanced filter 2021-07-09 17:48:56 -05:00
a13d31ac30 Notifications: import target account from 'Move' notification 2021-07-09 17:40:15 -05:00
ed793d912a Merge branch 'big-emoji' into 'develop'
Display big emojis when there's no other content

See merge request soapbox-pub/soapbox-fe!589
2021-07-09 22:18:50 +00:00