860 Commits (173a970752ed8c86ee9323d33ba7eb8b44fe119f)

Author	SHA1	Message	Date
Ondřej Hruška	7a1ca8b0df	Merge remote-tracking branch 'upstream/master'	7 years ago
m4sk1n	47579ec58c	It makes no sense to try using invalid or expired link again (#4521) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
m4sk1n	3363a05539	i18n: Update Polish translation (#4545)	7 years ago
Masoud Abkenar	e7a5a188ef	i18n: update Persian translation (#4540)	7 years ago
Komic	71384b2ef9	Fix #4531 (#4533) ... wrong character, sorry about that~	7 years ago
Komic	d1d465347a	fr.yml update (#4531) ... Translation for https://github.com/tootsuite/mastodon/pull/4523	7 years ago
Daigo 3 Dango	5eba129b0f	Translate 'Signed in as' into Japanese (#4530)	7 years ago
Quent-in	021a83ead4	l10n OC - Added #4523 "signed in as" (#4529) ... Neutral form used.	7 years ago
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523)	7 years ago
Quent-in	029786442a	l10n update Occitan (#4522) ... Salutation mailer + invalid reset link.	7 years ago
Krzysztof Jurewicz	400616813e	Fix some mistakes in Polish translation (#4495)	7 years ago
Eugen Rochko	724be2d5fe	Ignore some locale keys that can but do not need to be translated (#4515)	7 years ago
Jeroen	76da330155	Dutch strings: typo (#4489)	7 years ago
m4sk1n	0bbd5789b5	i18n: Update Polish translation (#4479) ... * i18n: Update Polish translation * Update Polish translation	7 years ago
Yamagishi Kazutoshi	fae71b653a	Enable cache for babel-loader (#4505)	7 years ago
nullkal	dfcd2834f9	Redirect to PasswordController#new when reset_password_token is invalid (#4506)	7 years ago
asria-jp	26ab702304	Update Japanese Translation (authorize_follow) (#4481) ... * Update Japanese Translation * preserve "Unfortunately"("残念ながら") preserve "Unfortunately"("残念ながら")	7 years ago
kibigo!	8150689b48	Merge upstream (#111)	7 years ago
Masoud Abkenar	4b6cd1dfdb	i18n: update Persian translation (#4470) ... * i18n: update Persian translation * i18n: fix quotes	7 years ago
unarist	155ba8fd3a	Make salutation of email localizable (#4454)	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
unarist	feadf7553d	Update Japanese translations (#4453)	7 years ago
Jeroen	990cea471e	Dutch: Small fix (#4441)	7 years ago
Quent-in	ff9d344d4c	i18n update of OC version (#4425) ... * Correction of misspellings * Improve the OC version * Improve of the OC version * Improvement of OC version	7 years ago
m4sk1n	c7de92e0df	i18n: Update Polish translation (#4414) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Yamagishi Kazutoshi	f93f306053	Remove hash from chunk filename when dev env (#4411)	7 years ago
Sorin Davidoi	e67fc997dc	feat(web_push_notifications): Group notifications (#4388)	7 years ago
Eugen Rochko	6270f9ce34	Fix #3189 - Share CSRF secret between main app and Sidekiq Web (#4383)	7 years ago
Satoshi KOJIMA	e54cc15cbd	fix #4356 : place sw.js to assets/sw.js (#4357)	7 years ago
Ratmir Karabut	2654f3be82	Update Russian translation (#4407) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation	7 years ago
Yamagishi Kazutoshi	97a48f237d	Add default settings for user (#4393)	7 years ago
m4sk1n	7905739c2a	s/PubSubHubbub/WebSub/g (#4372) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Ondřej Hruška	7e5691804d	Merge git://github.com/tootsuite/mastodon into tootsuite-master	7 years ago
Clworld	02744f29ef	Update Japanese translations for landing page (for Mobile). (#4362)	7 years ago
Jeroen	f52ce92f2b	Update and (almost) completing Dutch strings for 1.5 (#4351) ... * Update and expanding Dutch strings for 1.5 Only privacy policy is not translated, but is included. Hopefully I have time to translate this another time (you can set your own privacy policy now anyway). * Missing file * A few changes cause of changes in another file * Fix * Update Dutch strings for 1.5 * nl * fix don't know how that ended up there * Update nl.yml	7 years ago
Petko Bordjukov	c80046a77b	Update Capistrano lock version in config/deploy.rb (#4352) ... Deployment with Capistrano was failing due to a mismatch between the loaded version of Capistrano and the one specified in the deployment configuration. Bumping the version in config/deploy.rb fixes this issue.	7 years ago
m4sk1n	462b3752e4	i18n: @2374d63 (pl) (#4340) ... * i18n: @2374d63 (pl) * i18n: fixed typo on Polish translation	7 years ago
Eugen Rochko	029f2c4545	Redesign /terms page (#4338) ... * Redesign /terms page * Fix tests * Remove unused keys	7 years ago
Eugen Rochko	467456f7a1	Move clean up of unconfirmed users to sidekiq-scheduler (#4336) ... * Move clean up of unconfirmed users to sidekiq-scheduler * mastodon:daily is now deprecated	7 years ago
Eugen Rochko	2374d63536	Redesign extended information page (#4322) ... * Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS	7 years ago
Eugen Rochko	de985a30bc	Run i18n-tasks normalize (#4335)	7 years ago
sdukhovni	06d905f415	Allow domain blocks that only reject media without silencing or suspending (#4325) ... * Allow domain blocks to reject media without silencing or suspending * Fix typo * Hide 'Reject media' button when superfluous, instead of disabling it * Properly hide 'reject media' checkbox on page load if needed This may happen when resubmitting the domain block form after an error. * Don't ask whether undoing a media-only block should be retroactive * Rename :media_only block to :noop * Display :noop block as None in frontend, allow blocks that do nothing * Remove 'coding' line auto-added by emacs	7 years ago
Yamagishi Kazutoshi	ef16089c6d	Redirect user profile page to short URL when HTML format (#4328)	7 years ago
m4sk1n	4b4ea1f929	i18n: Update Polish translation (#4327) ... * i18n: Update Polish translation * i18n: Update Polish translation	7 years ago
Yamagishi Kazutoshi	45af29912f	Change about_mastodon to about_mastodon_html for all locales (#4326)	7 years ago
Yamagishi Kazutoshi	43cad817e8	Update Japanese translations for #4313 and #4315 (#4323) ... * Update Japanese translations for #4313 * Update Japanese translations for #4315	7 years ago
Eugen Rochko	3a3b556065	Improve noscript message and style (#4315)	7 years ago
Quent-in	a677ac8384	i10n Update for Occitan (#4301) ... * Update to translate new strings * Update * Update * Indend added * Update oc.yml	7 years ago
Eugen Rochko	3c515f2cd2	Run yarn run manage:translations and i18n-tasks normalize (#4302)	7 years ago
Ondřej Hruška	6913426e48	Merge pull request #92 from tootsuite/master ... tiny upstream merge	7 years ago