84 Commits (3550470c18425e80a322e6fe56245c9ede3d0689)

Author	SHA1	Message	Date
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Yamagishi Kazutoshi	13b60e6a14	Use URL polyfill (#7664)	7 years ago
Akihiko Odaki	d95642f6d9	Cache attachments on external host with service worker (#7493)	7 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	7 years ago
Akihiko Odaki	d8b3f5fb9a	Limit environment variables to expose to webpack (#7480)	7 years ago
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Akihiko Odaki	ca42f9b0eb	Cache media (#6902)	7 years ago
David Yip	f4b2478af1	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	7 years ago
Eugen Rochko	97dcfb0f50	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	7 years ago
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	b1daa71da5	Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)	7 years ago
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	7 years ago
ThibG	d613dda91d	Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) ... Since 872a0d5bd8, assets URL are absolute and not relative. Unfortunately, the domain used to build such URLs is the wrong one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.	7 years ago
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	872a0d5bd8	Improve HTML e-mails based on Litmus tests (#6301) ... * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	7 years ago
Jenkins	f6adb409fd	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	9a61b0ef22	Fix RFC 5646 Regular Expression (#6190)	7 years ago
kibigo!	8aa527434c	Fixed index in webpack config	7 years ago
kibigo!	6b7085a33e	Linting fixes	7 years ago
kibigo!	b28cd6769c	Javascript intl8n flavour support	7 years ago
kibigo!	753535c3c7	Fixed webpack skin folder globbing	7 years ago
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	7 years ago
kibigo!	541fe9b110	Skins support	7 years ago
kibigo!	8812bab687	Minor fixes	7 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	7 years ago
kibigo!	585758a373	Themed prefetching	7 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	7 years ago
Yamagishi Kazutoshi	8a588145d5	Update extract-text-webpack-plugin to version 3.0.2 (#5584)	7 years ago
Yamagishi Kazutoshi	8ae9bd0eea	Upgrade compression-webpack-plugin to version 1.0.1 (#5581)	7 years ago
Nolan Lawson	0692991b54	Add ServiceWorker caching for static assets (#5524)	7 years ago
Akihiko Odaki	e4080772b5	Use contenthash for ExtractTextWebpackPlugin (#5462) ... [hash] is not documented.	7 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	7 years ago
Nolan Lawson	bebaa6eced	Remove prop types from external libraries (#5304)	7 years ago
Nolan Lawson	7de6d269d2	Use ES module build of react-router-dom (#5264)	7 years ago
aschmitz	2076c557c9	Configure webpack to poll for changes in development (#5040) ... * Configure webpack to poll for changes in development Vagrant on Linux/macOS hosts shared files via NFS, which doens't support inotify-based watching of files. This tweak makes webpack check for changes every second, and rebuild if necessary. This removes the need to restart Foreman every time a frontend file changes. Note that rebuilding is still a relatively lengthy process. The polling frequency can be changed to taste. * Only poll in Vagrant This tests for the presence of the VAGRANT environment variable to determine whether or not we're in Vagrant. It is set in .env.vagrant, which is set up to be included in the Vagrantfile.	7 years ago
kibigo!	f7ca205f38	Fixed webpack config code	7 years ago
kibigo!	86e617a839	Better themeing support!!	7 years ago
Andrew	0401a24558	Add support for multiple themes (#4959) ... * Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return	7 years ago
David Yip	b9f7bc149b	Merge branch 'origin/master' into sync/upstream ... Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb	7 years ago
Yamagishi Kazutoshi	da172a8b1b	Disable babel-loader cache when development environment (#4684)	7 years ago
Ondřej Hruška	7a1ca8b0df	Merge remote-tracking branch 'upstream/master'	7 years ago
Yamagishi Kazutoshi	fae71b653a	Enable cache for babel-loader (#4505)	7 years ago
kibigo!	8150689b48	Merge upstream (#111)	7 years ago
Gô Shoemake	b61e3daf98	Multiple frontend support (#110) ... * Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common	7 years ago
Yamagishi Kazutoshi	f93f306053	Remove hash from chunk filename when dev env (#4411)	7 years ago
Satoshi KOJIMA	e54cc15cbd	fix #4356 : place sw.js to assets/sw.js (#4357)	7 years ago
kibigo!	0a678cf377	Fix for stylesheet split	7 years ago
Surinna Curtis	7a77f7b3bb	Add sourceRoot/includePaths to loaders ... Use the settings modal as an example/testcase	7 years ago
Ondřej Hruška	3ea02314b9	split added glitch locales from vanilla (#82) ... * Locale script now accepts overrides and new keys from glitch/locales * Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts	7 years ago
Sorin Davidoi	0c7c188c45	Web Push Notifications (#3243) ... * feat: Register push subscription * feat: Notify when mentioned * feat: Boost, favourite, reply, follow, follow request * feat: Notification interaction * feat: Handle change of public key * feat: Unsubscribe if things go wrong * feat: Do not send normal notifications if push is enabled * feat: Focus client if open * refactor: Move push logic to WebPushSubscription * feat: Better title and body * feat: Localize messages * chore: Fix lint errors * feat: Settings * refactor: Lazy load * fix: Check if push settings exist * feat: Device-based preferences * refactor: Simplify logic * refactor: Pull request feedback * refactor: Pull request feedback * refactor: Create /api/web/push_subscriptions endpoint * feat: Spec PushSubscriptionController * refactor: WebPushSubscription => Web::PushSubscription * feat: Spec Web::PushSubscription * feat: Display first media attachment * feat: Support direction * fix: Stuff broken while rebasing * refactor: Integration with session activations * refactor: Cleanup * refactor: Simplify implementation * feat: Set VAPID keys via environment * chore: Comments * fix: Crash when no alerts * fix: Set VAPID keys in testing environment * fix: Follow link * feat: Notification actions * fix: Delete previous subscription * chore: Temporary logs * refactor: Move migration to a later date * fix: Fetch the correct session activation and misc bugs * refactor: Move migration to a later date * fix: Remove follow request (no notifications) * feat: Send administrator contact to push service * feat: Set time-to-live * fix: Do not show sensitive images * fix: Reducer crash in error handling * feat: Add badge * chore: Fix lint error * fix: Checkbox label overlap * fix: Check for payload support * fix: Rename action "type" (crash in latest Chrome) * feat: Action to expand notification * fix: Lint errors * fix: Unescape notification body * fix: Do not allow boosting if the status is hidden * feat: Add VAPID keys to the production sample environment * fix: Strip HTML tags from status * refactor: Better error messages * refactor: Handle browser not implementing the VAPID protocol (Samsung Internet) * fix: Error when target_status is nil * fix: Handle lack of image * fix: Delete reference to invalid subscriptions * feat: Better error handling * fix: Unescape HTML characters after tags are striped * refactor: Simpify code * fix: Modify to work with #4091 * Sort strings alphabetically * i18n: Updated Polish translation it annoys me that it's not fully localized :P * refactor: Use current_session in PushSubscriptionController * fix: Rebase mistake * fix: Set cacheName to mastodon * refactor: Pull request feedback * refactor: Remove logging statements * chore(yarn): Fix conflicts with master * chore(yarn): Copy latest from master * chore(yarn): Readd offline-plugin * refactor: Use save! and update! * refactor: Send notifications async * fix: Allow retry when push fails * fix: Save track for failed pushes * fix: Minify sw.js * fix: Remove account_id from fabricator	7 years ago