mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	91bef4759f	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js	8 years ago
Yamagishi Kazutoshi	0ddbccf7e6	Upgrade Babel to version 7.0.0 (#5925 )	8 years ago
Thibaut Girka	0f155af32a	Add notification badge to favicon	8 years ago
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.	8 years ago
Eugen Rochko	bb71538bb5	Redesign public profiles and toots (#8068 )	8 years ago
Thibaut Girka	7dbed4dab9	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
abcang	3c3cf7e208	Update supported Node.js version (#8041 )	8 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream 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	8 years ago
Yamagishi Kazutoshi	af161e849d	Downgrade react-swipeable-views to v0.12.13 from v0.12.14 (#8022 )	8 years ago
Yamagishi Kazutoshi	0eacf2b419	Upgrade Node.js to v8.x on Docker image (#8019 )	8 years ago
Yamagishi Kazutoshi	e9b322d0a6	Upgrade webpack to version v4.x (#6655 )	8 years ago
Petko Bordjukov	37d428dfaf	Update uws dependency to 10.148.0 (#7448 ) This release fixes issues with open events, adds Node 10 support and drops Node 4, 5, 6 and 7. Changes: `6152fb6787...689c15c59e`	8 years ago
David Yip	3550470c18	Merge remote-tracking branch 'origin/master' into gs-master 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.	8 years ago
Yamagishi Kazutoshi	bfa12239e8	Update ESLint for Code Climate (#7696 ) * 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	8 years ago
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Yamagishi Kazutoshi	13b60e6a14	Use URL polyfill (#7664 )	8 years ago
Eugen Rochko	9bd23dc4e5	Track trending tags (#7638 ) * 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	8 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	8 years ago
Yamagishi Kazutoshi	6832110af4	Correct rotate of image using EXIF (#7422 )	8 years ago
David Yip	16d5217502	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json	8 years ago
ThibG	7e0aed398f	Fix scrolling behavior (#7151 ) * Update React.JS * Use React's new lifecycles for scrollable lists * Clean up dead code * Make CodeClimate happy	8 years ago
David Yip	3ab6a8b8be	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: spec/views/about/show.html.haml_spec.rb	8 years ago
Emelia Smith	7a81082704	Revert "Add double-tap zoom functionary to `ZoomableImage` (#6944 )" (#7035 ) 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`.	8 years ago
Jenkins	6611100480	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
unarist	2c51bc0ca5	Add missing rejection handling for Promises (#7008 ) * 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.	8 years ago
Jenkins	f0bb3ff533	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yuto Tokunaga	5021c4e9ca	Add double-tap zoom functionary to `ZoomableImage` (#6944 ) 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'	8 years ago
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Akihiko Odaki	ca42f9b0eb	Cache media (#6902 )	8 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	188aa3ea50	Add polyfill for Object.values (#6697 )	8 years ago
Yamagishi Kazutoshi	83c982b458	Run tests with npm-run-all (#6688 )	8 years ago
Akihiko Odaki	81cefc1913	Do not use npm (#6656 ) 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	8 years ago
David Yip	1b8fcd4df5	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	8 years ago
TrashMacNugget	6f5f434caa	Specify AGPLv3+ (#6546 ) * 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	8 years ago
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	0a103c7749	Upgrade ESLint to version 4.x (#6276 )	8 years ago
Jenkins	bed13f22e2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	43c37a4768	Add supported Node.js version to package.json (#6096 )	8 years ago
Jenkins	757f52ff2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	ac17309faf	Update dependencies for Node.js (2017-12-03) (#5876 ) * 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	8 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	8 years ago
Yamagishi Kazutoshi	8a588145d5	Update extract-text-webpack-plugin to version 3.0.2 (#5584 )	8 years ago
Yamagishi Kazutoshi	0338c16f9f	Remove babel-plugin-react-transform (#5582 )	8 years ago
Yamagishi Kazutoshi	8ae9bd0eea	Upgrade compression-webpack-plugin to version 1.0.1 (#5581 )	8 years ago
Yamagishi Kazutoshi	763a2f8511	Replace react-router-scroll to react-router-scroll-4 (#5568 )	8 years ago
Yamagishi Kazutoshi	6705463ed0	Update dependencies for Node.js (2017-10-30) (#5565 ) * 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	8 years ago
David Yip	4f01e6e8d5	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
masarakki	049381b284	remove-duplicated-jest-config (#5465 )	8 years ago
David Yip	42e8c8eb0e	Merge tag 'v2.0.0' into gs-master	8 years ago

1 2 3 4 5

206 Commits (00fcdebed758f031b486ec239fd425fc54a180b3)