mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2019-11-19	Remove dependency on fibers (#10902)	Yamagishi Kazutoshi

2019-03-27	Revert "fix: update to emoji-mart 2.10.0 (#10281)"	Thibaut Girka
	This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60.
2019-03-16	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to keep the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to keep the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to keep the theme names even if they are useless to avoid future conflicts.
2019-03-16	fix: update to emoji-mart 2.10.0 (#10281)	Nolan Lawson
	* fix: update to emoji-mart 2.10.0 * remove useless change * fix CSS style of emoji picker, improve a11y * fix missing newline in scss * fix the title and input fonts
2019-03-16	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
2019-03-16	Do not use @babel/preset-env to compile node_modules (#10289)	Yamagishi Kazutoshi

2019-03-15	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	Yamagishi Kazutoshi
	Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>