2210 commits

Author	SHA1	Message	Date
Thibaut Girka	abcba5c198	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.	2019-12-07 12:28:59 +01:00
Takeshi Umeda	f43f1e0184	Add basic support for group actors (#12071) ... * Show badge on group actor in WebUI * Do not notify in case of by following group actor * If you mention group actor, also mention group actor followers * Relax characters that can be used in username (same as Application) * Revert "Relax characters that can be used in username (same as Application)" This reverts commit 7e10a137b878d0db1b5252c52106faef5e09ca4b. * Delete display_name method	2019-12-04 20:36:33 +01:00
tateisu	f1ef777d40	add S3_OPEN_TIMEOUT environment variable (#12459)	2019-12-02 21:05:27 +01:00
Mathieu Brunot	bd8dc9bd0c	✨ Add an LDAP Mail attribute config (#12053) ... Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>	2019-12-01 18:52:21 +01:00
Thibaut Girka	99f1f48741	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-01 12:12:42 +01:00
Mathieu Brunot	d70268f099	✨ Convert LDAP username (#12461) ... * ✨ Convert LDAP username #12021 Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * 🐛 Fix conversion var use Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * 🐛 Fix LDAP uid conversion test Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * 👌 Remove comments with ref to PR Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * 👌 Remove unnecessary paranthesis Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io> * 🔧 Move space in conversion string Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>	2019-12-01 07:21:28 +01:00
Sasha Sorokin	c8d82ef3c3	Split relationships page strings (#12502) ... Before this moment relationships managing page was using strings from other context - from counters, but in order for translators to be able to translate it relatively to the page, it must use separate strings. I've split the strings for "Following" and "Followers" and put them to "relationships" keyset in localization file. This should solve this issue. Fixes #10863	2019-12-01 07:08:40 +01:00
ThibG	d8f96028c5	Add ability to filter reports by target account domain (#12154) ... * Add ability to filter reports by target account domain * Reword by_target_domain label	2019-11-30 19:53:58 +01:00
ntl-purism	f3a93987b6	LDAP & PAM added to OAuth password grant strategy (#7999) (#12390) ... When authenticating via OAuth, the resource owner password grant strategy is allowed by Mastodon, but (without this PR), it does not attempt to authenticate against LDAP or PAM. As a result, LDAP or PAM authenticated users cannot sign in to Mastodon with their email/password credentials via OAuth (for instance, for native/mobile app users). This PR fleshes out the authentication strategy supplied to doorkeeper in its initializer by looking up the user with LDAP and/or PAM when devise is configured to use LDAP/PAM backends. It attempts to follow the same logic as the Auth::SessionsController for handling email/password credentials. Note #1: Since this pull request affects an initializer, it's unclear how to add test automation. Note #2: The PAM authentication path has not been manually tested. It was added for completeness sake, and it is hoped that it can be manually tested before merging.	2019-11-30 19:44:59 +01:00
Thibaut Girka	2b7158427f	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-30 17:29:44 +01:00
Sasha Sorokin	fd45f5bbaa	Improve notifications page (#12497) ... Currently notifications page seems a bit cluttered with no clear separation between e-mail and filtering settings. This commit tries to address them by adding clear separation with headers, hints and removing continuously reused texts for events checkboxes.	2019-11-29 17:03:06 +01:00
Yamagishi Kazutoshi	ffc33c1ae6	Use override_csp options on pghero (#12489)	2019-11-27 05:28:11 +01:00
Thibaut Girka	e87cc59811	Fix weird edge case in load_schema	2019-11-20 19:19:57 +01:00
Thibaut Girka	6b999411fc	Revert CircleCI and some webpack changes to match upstream	2019-11-20 18:05:24 +01:00
Thibaut Girka	d52e27f3db	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 17:57:17 +01:00
dependabot-preview[bot]	5605b828e5	Bump webpacker from 4.0.7 to 4.2.0 (#12416) ... * Bump webpacker from 4.0.7 to 4.2.0 Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.7 to 4.2.0. - [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/v4.0.7...v4.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Use NODE_ENV=tests instead of test, to work around async modules not having a chunk	2019-11-20 17:56:11 +01:00
Thibaut Girka	1064a9d827	Override Migrator.new instead of Migrator#initialize, it's easier to understand	2019-11-20 17:31:22 +01:00
Thibaut Girka	33c2a7e23c	Add documentation about the migration hack	2019-11-20 17:18:00 +01:00
Thibaut Girka	6475525f31	Monkey-patch Rails' migrator to ignore duplicate migrations across Mastodon and glitch-soc	2019-11-20 17:03:25 +01:00
Thibaut Girka	ff67385cfb	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code	2019-11-20 15:36:09 +01:00
Eugen Rochko	9d7cfcb1b3	Fix inconsistent interpolations test by ignoring single plural keys (#12394)	2019-11-15 21:23:03 +01:00
Eugen Rochko	510e184216	Fix localization test failing due to order of locale definitions (#12393)	2019-11-15 21:00:09 +01:00
Eugen Rochko	24ea938ce1	Add kn, mr, ur to available locales (#12379)	2019-11-13 23:36:41 +01:00
Eugen Rochko	eee73de5c8	New Crowdin translations (#12146) ... * New translations en.json (Tamil) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations simple_form.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations activerecord.en.yml (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.yml (Kannada) [ci skip] * New translations simple_form.en.yml (Kannada) [ci skip] * New translations activerecord.en.yml (Kannada) [ci skip] * New translations devise.en.yml (Kannada) [ci skip] * New translations doorkeeper.en.yml (Kannada) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.yml (Marathi) [ci skip] * New translations simple_form.en.yml (Marathi) [ci skip] * New translations activerecord.en.yml (Marathi) [ci skip] * New translations devise.en.yml (Marathi) [ci skip] * New translations doorkeeper.en.yml (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Hindi) [ci skip] * New translations simple_form.en.yml (Hindi) [ci skip] * New translations activerecord.en.yml (Hindi) [ci skip] * New translations devise.en.yml (Hindi) [ci skip] * New translations doorkeeper.en.yml (Hindi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.yml (Urdu (Pakistan)) [ci skip] * New translations simple_form.en.yml (Urdu (Pakistan)) [ci skip] * New translations activerecord.en.yml (Urdu (Pakistan)) [ci skip] * New translations devise.en.yml (Urdu (Pakistan)) [ci skip] * New translations doorkeeper.en.yml (Urdu (Pakistan)) [ci skip] * New translations activerecord.en.yml (Marathi) [ci skip] * New translations doorkeeper.en.yml (Marathi) [ci skip] * New translations doorkeeper.en.yml (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations simple_form.en.yml (Finnish) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Malayalam) [ci skip] * New translations simple_form.en.yml (Malayalam) [ci skip] * New translations activerecord.en.yml (Malayalam) [ci skip] * New translations devise.en.yml (Malayalam) [ci skip] * New translations doorkeeper.en.yml (Malayalam) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations simple_form.en.yml (Tamil) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Malayalam) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations devise.en.yml (Estonian) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations devise.en.yml (Malayalam) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Malayalam) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations devise.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations devise.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Hindi) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Bengali) [ci skip] * i18n-tasks normalize * yarn manage:translations	2019-11-13 23:24:55 +01:00
ThibG	dfea7368c9	Add bookmarks (#7107) ... * Add backend support for bookmarks Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter. * Add spec for bookmark endpoints * Add front-end support for bookmarks * Introduce OAuth scopes for bookmarks * Add bookmarks to archive takeout * Fix migration * Coding style fixes * Fix rebase issue * Update bookmarked_statuses to latest UI changes * Update bookmark actions to properly reflect status changes in state * Add bookmarks item to single-column layout * Make active bookmarks red	2019-11-13 23:02:10 +01:00
ThibG	a2014830c2	Fix broken admin audit log in whitelist mode (#12303)	2019-11-11 00:05:15 +02:00
Thibaut Girka	04125c9c0d	Fix build with new sass-loader	2019-11-07 14:56:09 +01:00
Thibaut Girka	42dff261d6	Disable minimization in test environment	2019-11-07 13:16:10 +01:00
Thibaut Girka	0ae7d84273	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`	2019-11-06 14:38:28 +01:00
Yamagishi Kazutoshi	7512f3a3e0	Change message of public timeline for local only (#12224)	2019-10-27 12:45:33 +01:00
Thibaut Girka	41a98b6543	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb	2019-10-27 12:14:01 +01:00
Faye Duxovni	48f75b86ae	Add setting for whether to crop images in unexpanded toots (#12126)	2019-10-24 22:51:41 +02:00
ThibG	15c192ce40	Add link to search for users connected from the same IP address (#12157) ... * Add link to search for users connected from the same IP address Fixes #11949 * Fix missing cell in admin account view table	2019-10-24 22:49:26 +02:00
Soft. Dev	3ebd903535	change string from Disable to Disable login (#12201)	2019-10-24 22:45:55 +02:00
Thibaut Girka	10f1478498	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-11 22:41:21 +02:00
Eugen Rochko	c4118ba71b	New Crowdin translations (#12144) ... * New translations activerecord.en.yml (Corsican) [ci skip] * New translations activerecord.en.yml (Czech) [ci skip] * New translations activerecord.en.yml (Danish) [ci skip] * New translations activerecord.en.yml (Dutch) [ci skip] * New translations activerecord.en.yml (Esperanto) [ci skip] * New translations activerecord.en.yml (Estonian) [ci skip] * New translations activerecord.en.yml (Finnish) [ci skip] * New translations activerecord.en.yml (French) [ci skip] * New translations activerecord.en.yml (Galician) [ci skip] * New translations activerecord.en.yml (Georgian) [ci skip] * New translations activerecord.en.yml (German) [ci skip] * New translations activerecord.en.yml (Greek) [ci skip] * New translations activerecord.en.yml (Hungarian) [ci skip] * New translations activerecord.en.yml (Chinese Simplified) [ci skip] * New translations activerecord.en.yml (Italian) [ci skip] * New translations activerecord.en.yml (Japanese) [ci skip] * New translations activerecord.en.yml (Kazakh) [ci skip] * New translations activerecord.en.yml (Korean) [ci skip] * New translations activerecord.en.yml (Norwegian) [ci skip] * New translations activerecord.en.yml (Occitan) [ci skip] * New translations activerecord.en.yml (Polish) [ci skip] * New translations activerecord.en.yml (Portuguese) [ci skip] * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations activerecord.en.yml (Catalan) [ci skip] * New translations en.yml (Telugu) [ci skip] * New translations activerecord.en.yml (Chinese Traditional) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations activerecord.en.yml (Bulgarian) [ci skip] * New translations en.yml (Macedonian) [ci skip] * New translations activerecord.en.yml (Portuguese, Brazilian) [ci skip] * New translations activerecord.en.yml (Indonesian) [ci skip] * New translations activerecord.en.yml (Persian) [ci skip] * New translations activerecord.en.yml (Albanian) [ci skip] * New translations activerecord.en.yml (Arabic) [ci skip] * New translations activerecord.en.yml (Asturian) [ci skip] * New translations activerecord.en.yml (Basque) [ci skip] * New translations activerecord.en.yml (Bengali) [ci skip] * New translations activerecord.en.yml (Breton) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations simple_form.en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations simple_form.en.yml (Serbian (Latin)) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations simple_form.en.yml (Ido) [ci skip] * New translations en.yml (Croatian) [ci skip] * New translations simple_form.en.yml (Croatian) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations simple_form.en.yml (Georgian) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations simple_form.en.yml (Hebrew) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.yml (Ido) [ci skip] * New translations simple_form.en.yml (Bulgarian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.json (Breton) [ci skip] * New translations simple_form.en.yml (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.json (Czech) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations simple_form.en.yml (Danish) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (Esperanto) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Basque) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations devise.en.yml (Serbian (Cyrillic)) [ci skip] * New translations devise.en.yml (Hungarian) [ci skip] * New translations devise.en.yml (Russian) [ci skip] * New translations devise.en.yml (Danish) [ci skip] * New translations devise.en.yml (Croatian) [ci skip] * New translations doorkeeper.en.yml (Asturian) [ci skip] * New translations devise.en.yml (Portuguese, Brazilian) [ci skip] * New translations devise.en.yml (Serbian (Latin)) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Dutch) [ci skip] * New translations devise.en.yml (Portuguese) [ci skip] * New translations devise.en.yml (Estonian) [ci skip] * New translations devise.en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Bulgarian) [ci skip] * New translations devise.en.yml (Hebrew) [ci skip] * New translations devise.en.yml (Spanish) [ci skip] * New translations devise.en.yml (Finnish) [ci skip] * New translations devise.en.yml (Swedish) [ci skip] * New translations devise.en.yml (German) [ci skip] * New translations devise.en.yml (Georgian) [ci skip] * New translations devise.en.yml (Ido) [ci skip] * New translations devise.en.yml (Polish) [ci skip] * New translations devise.en.yml (Corsican) [ci skip] * New translations devise.en.yml (Breton) [ci skip] * New translations devise.en.yml (Bengali) [ci skip] * New translations devise.en.yml (Asturian) [ci skip] * New translations devise.en.yml (Bulgarian) [ci skip] * New translations devise.en.yml (Albanian) [ci skip] * New translations devise.en.yml (Norwegian) [ci skip] * New translations activerecord.en.yml (Welsh) [ci skip] * New translations activerecord.en.yml (Ukrainian) [ci skip] * New translations activerecord.en.yml (Turkish) [ci skip] * New translations activerecord.en.yml (Thai) [ci skip] * New translations activerecord.en.yml (Spanish, Argentina) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations activerecord.en.yml (Slovenian) [ci skip] * New translations activerecord.en.yml (Slovak) [ci skip] * New translations devise.en.yml (Chinese Simplified) [ci skip] * New translations devise.en.yml (Occitan) [ci skip] * New translations activerecord.en.yml (Serbian (Latin)) [ci skip] * New translations activerecord.en.yml (Serbian (Cyrillic)) [ci skip] * New translations activerecord.en.yml (Russian) [ci skip] * New translations devise.en.yml (Persian) [ci skip] * New translations devise.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations devise.en.yml (Kazakh) [ci skip] * New translations activerecord.en.yml (Spanish) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Occitan) [ci skip] * New translations doorkeeper.en.yml (Basque) [ci skip] * New translations doorkeeper.en.yml (Persian) [ci skip] * New translations doorkeeper.en.yml (Arabic) [ci skip] * New translations doorkeeper.en.yml (Polish) [ci skip] * New translations doorkeeper.en.yml (Portuguese) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations doorkeeper.en.yml (Portuguese, Brazilian) [ci skip] * New translations doorkeeper.en.yml (Ukrainian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Swedish) [ci skip] * New translations doorkeeper.en.yml (Czech) [ci skip] * New translations doorkeeper.en.yml (Estonian) [ci skip] * New translations doorkeeper.en.yml (Dutch) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (French) [ci skip] * New translations doorkeeper.en.yml (Danish) [ci skip] * New translations doorkeeper.en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (Kazakh) [ci skip] * New translations doorkeeper.en.yml (Greek) [ci skip] * New translations doorkeeper.en.yml (Corsican) [ci skip] * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional) [ci skip] * New translations doorkeeper.en.yml (Italian) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Serbian (Latin)) [ci skip] * New translations doorkeeper.en.yml (Serbian (Cyrillic)) [ci skip] * New translations doorkeeper.en.yml (Croatian) [ci skip] * New translations devise.en.yml (Esperanto) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Basque) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations devise.en.yml (French) [ci skip] * New translations devise.en.yml (Japanese) [ci skip] * New translations activerecord.en.yml (Swedish) [ci skip] * New translations devise.en.yml (Czech) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Indonesian) [ci skip] * New translations doorkeeper.en.yml (Ido) [ci skip] * New translations doorkeeper.en.yml (Hebrew) [ci skip] * New translations doorkeeper.en.yml (Georgian) [ci skip] * New translations doorkeeper.en.yml (Welsh) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations doorkeeper.en.yml (Thai) [ci skip] * New translations doorkeeper.en.yml (Norwegian) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations devise.en.yml (Arabic) [ci skip] * New translations doorkeeper.en.yml (Esperanto) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations devise.en.yml (Chinese Traditional) [ci skip] * New translations devise.en.yml (Greek) [ci skip] * New translations devise.en.yml (Italian) [ci skip] * New translations devise.en.yml (Korean) [ci skip] * New translations devise.en.yml (Turkish) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations devise.en.yml (Welsh) [ci skip] * New translations en.yml (Swedish) [ci skip] * i18n-tasks normalize * yarn manage:translations	2019-10-10 20:30:28 +02:00
Eugen Rochko	1fc5b61351	New Crowdin translations (#12072) ... * New translations en.yml (German) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations devise.en.yml (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations devise.en.yml (Arabic) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations devise.en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations devise.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (French) [ci skip] * New translations devise.en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (French) [ci skip] * New translations devise.en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations devise.en.yml (Greek) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations devise.en.yml (Greek) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations en.yml (Ido) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Croatian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Telugu) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (Esperanto) [ci skip] * New translations devise.en.yml (Esperanto) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations activerecord.en.yml (Swedish) [ci skip] * New translations activerecord.en.yml (Swedish) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations devise.en.yml (Czech) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations devise.en.yml (Czech) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Polish) [ci skip] * i18n-tasks normalize * yarn manage:translations * New translations en.yml (French) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations activerecord.en.yml (Persian) [ci skip] * i18n-tasks normalize * yarn manage:translations	2019-10-10 19:59:27 +02:00
Eugen Rochko	aa509a3d8a	Fix auto-report string saying the account has been auto-silenced (#12142)	2019-10-10 18:47:24 +02:00
Thibaut Girka	61631f4751	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline	2019-10-10 17:26:08 +02:00
Eugen Rochko	45eccaf8c5	Fix preloaded JSON-LD context for identity not being used (#12138) ... Regression from #11316	2019-10-10 06:48:53 +02:00
Eugen Rochko	b5f7e12817	Remove auto-silence behaviour from spam check (#12117) ... Fix #12113	2019-10-09 07:11:23 +02:00
Eugen Rochko	354fdd317e	Fix attachment not being re-downloaded even if file is not stored (#12125) ... Change the behaviour of remotable concern. Previously, it would skip downloading an attachment if the stored remote URL is identical to the new one. Now it would not be skipped if the attachment is not actually currently stored by Paperclip.	2019-10-09 07:10:46 +02:00
Eugen Rochko	c8bcf5cbfd	Add admin setting to auto-approve hashtags (#12122) ... Change inaccurate labels on other admin settings	2019-10-09 00:30:15 +02:00
Eugen Rochko	19cdc62765	Remove fallback to long description on sidebar and meta description (#12119) ... Fix #12114	2019-10-08 22:08:55 +02:00
Eugen Rochko	086fc7ed77	Fix S3 adapter retrying failing uploads with exponential backoff (#12085) ... The default limit of 10 retries with exponential backoff meant that if the S3 server was timing out, you would be stuck with it for much, much longer than the 5 second read timeout we expect. The uploading happens within a database transaction, which means a failing S3 server could negatively affect database performance	2019-10-06 06:20:57 +02:00
Thibaut Girka	1bbba0016a	Merge tag 'v3.0.0' into glitch-soc/merge-upstream	2019-10-04 19:49:43 +02:00
dependabot-preview[bot]	4592c69b07	Bump capistrano from 3.11.1 to 3.11.2 (#12012) ... * Bump capistrano from 3.11.1 to 3.11.2 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.11.1...v3.11.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump capistrano from 3.11.1 to 3.11.2	2019-10-04 11:11:36 +09:00
Eugen Rochko	4289ecd037	New Crowdin translations (#12067) ... * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (French) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (French) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Persian) [ci skip] * i18n-tasks normalize * yarn manage:translations	2019-10-03 22:41:21 +02:00
Eugen Rochko	740c9cb3ee	Remove invite comments from UI (#12068) ... Due to UX confusion and insufficient time to fix it	2019-10-03 22:37:13 +02:00
Eugen Rochko	32efa14060	New Crowdin translations (#12061) ... * New translations en.json (Armenian) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations doorkeeper.en.yml (Italian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations doorkeeper.en.yml (Greek) [ci skip] * New translations doorkeeper.en.yml (Kazakh) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Dutch) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations doorkeeper.en.yml (Esperanto) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations doorkeeper.en.yml (Estonian) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (French) [ci skip] * New translations doorkeeper.en.yml (French) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Galician) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (German) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (Occitan) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.yml (Telugu) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations doorkeeper.en.yml (Thai) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations doorkeeper.en.yml (Welsh) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.yml (Macedonian) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Swedish) [ci skip] * New translations doorkeeper.en.yml (Persian) [ci skip] * New translations doorkeeper.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations doorkeeper.en.yml (Polish) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations doorkeeper.en.yml (Portuguese) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations doorkeeper.en.yml (Danish) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.yml (Ido) [ci skip] * New translations doorkeeper.en.yml (Ido) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations doorkeeper.en.yml (Norwegian) [ci skip] * New translations doorkeeper.en.yml (Hebrew) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations doorkeeper.en.yml (Asturian) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (Georgian) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.yml (Croatian) [ci skip] * New translations doorkeeper.en.yml (Croatian) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations doorkeeper.en.yml (Basque) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations doorkeeper.en.yml (Corsican) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations doorkeeper.en.yml (Czech) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations doorkeeper.en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations doorkeeper.en.yml (Serbian (Latin)) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations doorkeeper.en.yml (Ukrainian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Arabic) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations devise.en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * i18n-tasks normalize * yarn manage:translations	2019-10-03 18:24:55 +02:00