Conflicts:
Dockerfile
app/javascript/packs/common.js
config/webpack/loaders/sass.js
config/webpack/shared.js
db/schema.rb
package.json
yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option). They were resolved via accept-ours.
* Update babel-eslint to version 8.2.3
* Update eslint to version 4.19.1
* Update eslint-plugin-promise to version 3.8.0
* Update eslint-plugin-react to version 7.8.2
* Upgrade eslint-plugin-jsx-a11y to version 6.0.3
* yarn test:lint --fix
* Track trending tags
- Half-life of 1 day
- Historical usage in daily buckets (last 7 days stored)
- GET /api/v1/trends
Fix#271
* Add trends to web UI
* Don't render compose form on search route, adjust search results header
* Disqualify tag from trends if it's in disallowed hashtags setting
* Count distinct accounts using tag, ignore silenced accounts
Unfortunately the new hammer.js functionality wasn't correctly tested and didn't work across devices and browsers, as such, it's best to revert PR #6944 until we can revisit this functionality and make it work across all devices and browsers that are supported by Mastodon.
This reverts commit 5021c4e9ca.
* Add eslint-plugin-promise to detect uncaught rejections
* Move alert generation for errors to actions/alert
* Add missing rejection handling for Promises
* Use catch() instead of onReject on then()
Then it will catches rejection from onFulfilled. This detection can be
disabled by `allowThen` option, though.
add <div.zoomable-image__margin/> to keep margin of the image on zooming
move setting `scrollLeft` and `scrollTop` of container from callback of
`setState` to `componentDidUpdate`
add 'hammerjs' package for touch gesture detection
rewrite `ZoomableImage` using 'hammerjs'
Both of yarn and npm are used in Mastodon, but the combined usage requires
a redundant dependency and may lead to data inconsistency.
Considering that yarn has autoclean feature which npm does not have,
this change replaces all npm usage with yarn.
This change requires documentation update. Most notably, the following
command must be executed before assets precompilation if any system
dependency of node-sass has changed:
yarn install --force --pure-lockfile
* Specify AGPLv3+
Since the documentation doesn't specify you can use Mastodon as AGPLv3 or any later version.
* Use newest version of SPDX AGPLv3+ identifier
* Update babel-plugin-lodash to version 3.3.2
* Update enzyme to version 3.2.0
* Update enzyme-adapter-react-16 to version 1.1.0
* Update intersection-observer to version 0.5.0
* Update intl-messageformat to version 2.2.0
* Update node-sass to version 4.7.2
* Update postcss-loader to version 2.0.9
* Update React to version 16.2.0
* Update react-textarea-autosize to version 5.2.1
* Update stringz to version 0.3.0
* Update webpack to version 3.9.1
* Update webpack-bundle-analyzer to version 2.9.1
* Update webpack-dev-server to version 2.9.5
* Update webpack-merge to version 4.1.1
* Update fsevents to version 1.1.3
* yarn upgrade
* Update autoprefixer to version 7.1.6
* Update babel-plugin-preval to version 1.6.1
* Update babel-plugin-transform-react-remove-prop-types to version 0.4.10
* Update babel-preset-env to version 1.6.1
* Update cross-env to version 5.1.1
* Update enzyme-adapter-react-16 to version 1.0.2
* Update eslint-plugin-import to version 2.8.0
* Update immutable to version 3.8.2
* Update express to 4.16.2
* Update intl-relativeformat to version 2.1.0
* Update postcss-loader to version 2.0.8
* Update react-immutable-pure-component to version 1.1.1
* Update react-motion to version 0.5.2
* Update react-notification to version 6.8.2
* Update react-overlays to version 0.8.3
* Update react-redux-loading-bar to version 2.9.3
* Update resolve-url-loader to version 2.2.0
* Update style-loader to version 0.19.0
* Update webpack to version 3.8.1
* Update webpack-dev-server to version 2.9.3
* yarn upgrade
Thibaut Girka
abcang
Yamagishi Kazutoshi
Petko Bordjukov
David Yip
Eugen Rochko
Emelia Smith
Jenkins
unarist
Yuto Tokunaga
Akihiko Odaki
TrashMacNugget
Surinna Curtis
masarakki
Ondřej Hruška