2231 Commits

Author	SHA1	Message	Date
Thibaut Girka	980c004f06	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one	2020-01-12 15:57:34 +01:00
Eugen Rochko	a369d1ca64	New Crowdin translations (#12378) ... * New translations simple_form.en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Welsh) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (French) [ci skip] * New translations devise.en.yml (German) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations devise.en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Basque) [ci skip] * New translations activerecord.en.yml (Basque) [ci skip] * New translations devise.en.yml (Basque) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations activerecord.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations devise.en.yml (Tamil) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations activerecord.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [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 (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations simple_form.en.yml (Asturian) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations devise.en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (Esperanto) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Vietnamese) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations activerecord.en.yml (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations devise.en.yml (Catalan) [ci skip] * New translations en.json (Basque) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (German) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations doorkeeper.en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations doorkeeper.en.yml (Kazakh) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations doorkeeper.en.yml (Persian) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations doorkeeper.en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations doorkeeper.en.yml (Tamil) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations doorkeeper.en.yml (Estonian) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations doorkeeper.en.yml (Arabic) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations doorkeeper.en.yml (Portuguese) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations activerecord.en.yml (Icelandic) [ci skip] * New translations devise.en.yml (Icelandic) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Corsican) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Swedish) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.json (Icelandic) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations doorkeeper.en.yml (Esperanto) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations simple_form.en.yml (Icelandic) [ci skip] * New translations doorkeeper.en.yml (Icelandic) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations doorkeeper.en.yml (Italian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations doorkeeper.en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Icelandic) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations doorkeeper.en.yml (Czech) [ci skip] * New translations doorkeeper.en.yml (Basque) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations doorkeeper.en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Greek) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Spanish) [ci skip] * i18n-tasks normalize * New translations en.yml (Thai) [ci skip] * New translations en.yml (Korean) [ci skip] * yarn manage:translations * New translations en.yml (Thai) [ci skip]	2020-01-12 15:18:03 +01:00
ThibG	d386d89179	Fix invalid votes from the API being accepted (#12601) ... * Fix invalid votes from the API being accepted Fixes #12556 - Ensure `choice` is an integer instead of silently converting to 0 - Ensure `choice` corresponds to an actual choice of the poll * Please CodeClimate	2020-01-12 14:17:03 +01:00
koyu	5b9f01aec0	Fix spelling mistake (#12817)	2020-01-11 11:32:25 +09:00
ThibG	ea436b355b	Add support for linking XMPP URIs in toots (#12709) ... * Fix wrong grouping in Twitter valid_url regex * Add support for xmpp URIs Fixes #9776 The difficult part is autolinking, because Twitter-text's extractor does some pretty ad-hoc stuff to find things that “look like” URLs, and XMPP URIs do not really match the assumptions of that lib, so it doesn't sound wise to try to shoehorn it into the existing regex. This is why I used a specific regex (very close, although slightly more permissive than the RFC), and a specific scan function (a simplified version of the generalized one from Twitter). * Remove leading “xmpp:” from auto-linked text	2020-01-11 02:15:25 +01:00
Sasha Sorokin	36426ed4ad	Use heading actions and placeholders in settings (#12801) ... This commit: - Refactors centered text blocks currently used for placeholders for empty tables and puts styles for it in separate class - .centered-text, simply aliasing text-align: center. Which is furtherly used in this commit. - Improves applications settings page to use heading actions, moving "New application" button there, and displaying placeholder "You have no applications" in place of empty table. - Improves custom emoji settings page to use heading action for "Upload" button, making it more easily accessible without need to scroll through all of the emojis. - Improves email domain blocks settings page, moving "Add new" to the heading actions and using placeholder "No e-mail domains currently blacklisted" instead of showing empty table.	2020-01-11 02:14:45 +01:00
Thibaut Girka	578553ba05	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-07 16:28:59 +01:00
Sasha Sorokin	345dd93310	Little improvements to filters settings page (#12793) ... When you have many filters, it may be hard for you to reach the button to create yet another one. This commit moves creation button to the heading, leaving the page just for the list. On the other hand, when there are no filters, page looks kind of strange with the empty table. So text stating obvious fact that user has no filters was added in this commit too. Closes #11020 Closes #12790	2020-01-07 10:41:19 +01:00
Thibaut Girka	01eaeab56d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.	2020-01-04 23:04:42 +01:00
Eugen Rochko	49b2f7c0a2	Fix base64-encoded file uploads not being possible (#12748) ... Fix #3804, Fix #5776	2020-01-04 01:54:07 +01:00
Eugen Rochko	59c697a30c	Fix resource_owner_from_credentials in Doorkeeper initializer (#12743) ... - Nil error when e-mail not found - LDAP authentication used in place of PAM authentication	2020-01-03 05:35:46 +01:00
Eugen Rochko	09d54d1f62	Fix uncaught query param encoding errors (#12741)	2020-01-02 17:14:58 +01:00
Sasha Sorokin	9edab7afaf	Add translation project promotion link (#12736) ... This commit adds promotional notice on appearance settings about translation project if any other locale than English is used. It allows users to learn and contribute translations to Mastodon. Step ahead, in this commit one unusual string is added - link to a guide. By default it refers to Crowdin project itself, but if any of Mastodon localization teams established their own guide, they can refer it. Or, if Crowdin supports localized domain for language, it can also be put there (e.g. https://fr.crowdin.com/...).	2019-12-31 22:15:05 +01:00
Thibaut Girka	ab5ff638f2	Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc	2019-12-19 13:52:54 +01:00
Sasha Sorokin	902c6bed5a	Use different strings on exports page (#12569) ... Currently the page re-uses strings from other contexts which doesn't fit very well - strings incorrectly lowercase-d and pluralized, when they don't need to be, because it's a table. This commit changes page to re-use accounts.posts_tab_heading for toots, and admin.accounts for "Following" and "Follows". This all should look more aesthetically pleasing.	2019-12-19 12:47:55 +01:00
ThibG	fb9137752a	Remove unused translatable strings (#12643) ... * Remove unused “salmon_url” string * Remove more unused translatable strings The following strings all used to be on the admin account page but aren't used anymore: profile_url, outbox_url, followers_url, feed_url	2019-12-18 16:56:39 +01:00
Alice Gaudon	668f698077	Admin setting to disable default follows (#12566)	2019-12-16 23:55:50 +01:00
Sasha Sorokin	d5b7a4b116	Avoid using pluralize on moderation pages (#12589) ... Pluralize function from Rails framework does not work with other languages than English, moreover it does not even work properly with English [1]. Not that the latest applies to this context, it's just a sign that we best to avoid this function, especially when there are more reliable ways. This commit changes how reports pages generated in order to avoid usage of pluralize function, replacing it with default translation function, called with given counter. On top of that, we have to make strings pluralizable, so have to change locale files. [1]: https://medium.com/@anna7/b3927de2ca8e#6a60	2019-12-12 19:50:23 +01:00
Thibaut Girka	be4849c083	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system	2019-12-12 15:40:06 +01:00
Eugen Rochko	17159625b3	Add S3_OVERRIDE_PATH_STYLE environment variable (#12594) ... To support Exoscale	2019-12-10 07:40:01 +01:00
Eugen Rochko	f3d232381d	Add tootctl media remove-orphans (#12568)	2019-12-08 15:37:12 +01:00
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 7e10a137b8. * 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