1350 Commits (e96d040e584d46826298f137fde428a5eb775a44)

Author	SHA1	Message	Date
Thibaut Girka	a76c660645	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
Jeong Arm	ca61d7577a	Add missing Korean translations (#10962) ... And change some word.	6 years ago
Thibaut Girka	a4e0071538	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock	6 years ago
Marek Ľach	3e18c4ea5f	Small update for sk.yml (#10913)	6 years ago
Thibaut Girka	206d0ea6a2	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mayaeh	7403b0ec05	Update Japanese translations. (#10875) ... run yarn manage:translations ja && i18n-tasks add-missing ja	6 years ago
Thibaut Girka	b9c5aed987	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Alix Rossi	c84a0df608	Update simple_form.co.yml (#10862)	6 years ago
Thibaut Girka	d46668d34b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.	6 years ago
Marek Ľach	16ae227935	Update simple_form.sk.yml (#10842)	6 years ago
Aditoo17	40f6439e03	I18n: Update Czech translation (#10832)	6 years ago
Eugen Rochko	a1bceb2cb6	Add responsive panels to the single-column layout (#10820) ... * Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager	6 years ago
Thibaut Girka	d445d5833e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.	6 years ago
Marek Ľach	42bdd0766d	Update sk.yml (#10788) ... * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * normalize	6 years ago
Thibaut Girka	e21662d370	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Marek Ľach	7a88a5b44a	sk.yml grammar update (#10786) ... * sk.yml grammar update * bundle exec i18n-tasks normalize	6 years ago
Thibaut Girka	fd5da4033e	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Marek Ľach	875d18d636	Small corrections for sk translation (#10784)	6 years ago
Aditoo17	7660ac5008	I18n: Update Czech translation (#10781)	6 years ago
Thibaut Girka	08a793cbd9	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	7aece1eec5	Add option for default toot content-type	6 years ago
Alix Rossi	b34a562b63	i18n: Update Corsican translation (#10770) ... * i18n: update Corsican translation * Fix typo in co.yml	6 years ago
Thibaut Girka	422dd06806	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
manuelviens	7898b67b3d	Update simple_form.fr.yml (#10756) ... Remplacement des ' par des ’	6 years ago
ThibG	f1a3135809	Record account suspend/silence time and keep track of domain blocks (#10660) ... * Record account suspend/silence time and keep track of domain blocks * Also unblock users who were suspended/silenced before dates were recorded * Add tests * Keep track of suspending date for users suspended through the CLI * Show accurate number of accounts that would be affected by unsuspending an instance * Change migration to set silenced_at and suspended_at * Revert "Also unblock users who were suspended/silenced before dates were recorded" This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c. * Switch from using suspended and silenced to suspended_at and silenced_at * Add post-deployment migration script to remove `suspended` and `silenced` columns * Use Account#silence! and Account#suspend! instead of updating the underlying property * Add silenced_at and suspended_at migration to post-migration * Change account fabricator to translate suspended and silenced attributes * Minor fixes * Make unblocking domains always retroactive	6 years ago
Marek Ľach	0aaca064a6	Update slovak simple_forms (#10763)	6 years ago
Thibaut Girka	5262820fae	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Alix Rossi	062684bcf8	i18n: Update French translations (#10747) ... * Update French JSON * i18n: Update fr.yml * i18n: Update simple_form.fr.yml * Update simple_form.fr.yml * Update fr.yml	6 years ago
Alix Rossi	1959e4e5ec	i18n: Update Corsican translations (#10746) ... * i18n: Update Corsican translations * Update co.yml * Fix a translation in co.yml	6 years ago
Thibaut Girka	1bf48b01e3	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system	6 years ago
manuelviens	f0b5e0c46d	Update simple_form.fr.yml (#10726) ... * Minor modif and add Modified '' by ’ and added invite_request * Update simple_form.fr.yml Modifications suggérées par ThibG * Update simple_form.fr.yml Remplacement des ' par des ’. * Update simple_form.fr.yml Ajout de deux petits espaces devant sessions:	6 years ago
Marek Ľach	5ba0684958	Add strings for Slovak (#10734) ... * Add strings for Slovak * Update sk.yml	6 years ago
manuelviens	221a6a0e6d	Update fr.yml (#10727) ... * Update fr.yml Added missing lines * Update fr.yml Application des modifications de ThibG * Update fr.yml Modifications proposées par ThibG	6 years ago
spla	13244f7bb3	i18n Update Catalan translation (#10719) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translation * i18n Update Catalan translation	6 years ago
mayaeh	683a5ae765	i18n: Update Japanese translations (#10706) ... * Update Japanese translations. run yarn manage:translations This commit includes translations by some users that were done at the transifex. * Reduce translation text because it becomes two lines.	6 years ago
Thibaut Girka	23829e09f5	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Marek Ľach	a20c26aba7	Minor Slovak locale update (#10705)	6 years ago
Aditoo17	71fd62835e	I18n: Update Czech translation 🇨🇿 (#10704) ... * I18n: Update Czech translation * Tiny fix	6 years ago
Thibaut Girka	73bc58c656	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	6 years ago
Alix Rossi	4bf9e83f85	i18n: Update Corsican translation (#10692)	6 years ago
ThibG	8c716f917f	Provide a link to existing domain block when trying to block an already-blocked domain (#10663) ... * When trying to block an already-blocked domain, provide a link to the block * Fix styling for links in flash messages * Allow blocks to be upgraded but not downgraded	6 years ago
Thibaut Girka	c4865cbd25	Add site-wide options to show reblogs and replies in local/public timelines ... Fixes #1021	6 years ago
ThibG	05bf900109	Minor fixes to the French translation (#10662)	6 years ago
Marek Ľach	63e9783e7d	New string added for Slovak translation (#10637)	6 years ago
Thibaut Girka	6f85bb754b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc	6 years ago
marcin mikołajczak	ebd171eb0f	i18n: Fix misleading strings in Polish translation (#10615)	6 years ago
jeroenpraat	5205009df6	Small fix Dutch translation (#10612) ... * Small fix Dutch translation * Better descriptive titles See #10611	6 years ago
Yamagishi Kazutoshi	a59d2e0926	i18n: Update Catalan translation (#10559) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations	6 years ago
jeroenpraat	f7cc05db80	Update NL (Dutch) translation (#10601) ... * Update NL language strings Have to do it this way, cause this file is locked on Weblate * fix * Update simple_form.nl.yml * Update nl.yml	6 years ago
Thibaut Girka	3673665b46	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	707ae5d37a	Add forgotten text	6 years ago
Thibaut Girka	c22175bb86	Allow turning keybase off instance-wide	6 years ago
Marek Ľach	b5850a99aa	Some new strings for Slovak (#10596)	6 years ago
Marek Ľach	e82b7347a2	Update sk.yml translation again (#10589) ... * Update sk.yml * Update sk.yml * Update sk.yml	6 years ago
Marek Ľach	970dfb92a9	Important Slovak grammar fixes (#10585) ... * Important grammar fixes for SK Devise translation * Important Slovak grammar fixes * Update devise.sk.yml * Important Slovak grammar fixes Last batch for today :-) * Update devise.sk.yml * Update sk.yml * Update sk.yml * Update sk.yml	6 years ago
Marek Ľach	d6c6431e5c	Updates the Slovak translation further (#10584)	6 years ago
Alix Rossi	159d224bba	i18n: Update Corsican translation (#10583)	6 years ago
Marek Ľach	709b519bed	Small SK locale fixes (#10561) ... * Small SK locale fixes * Update devise.sk.yml	6 years ago
Marek Ľach	ff1e9408e4	New strings added into the Slovak translation (#10562) ... * New strings added into the Slovak translation * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml	6 years ago
Renato "Lond" Cerqueira	83420b9d41	Add new pt-br translations (#10564)	6 years ago
Thibaut Girka	f8a3c00755	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Quentí	aee82e3b73	[i18n] Update for Occitan language (#10548) ... * Update activerecord.oc.yml * Update simple_form.oc.yml * Fix typo * Update simple_form.oc.yml * Remove trailing whitespace	6 years ago
Thibaut Girka	5a24934449	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Evgeny Petrov	4c19204392	i18n: Russian localization update (#10515) ... * i18n: Updated ru.json for Russian language * i18n: Updated ru.yml * Normalize ru.yml * i18n: Updated simple_form.ru.yml * i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings * Added new strings to ru.json * Deleted unused (?) string * i18n: Added recent strings (Settings refactor)	6 years ago
Eugen Rochko	a0000b9a94	Weblate translations (2019-04-10) (#10545) ... * Translated using Weblate (Occitan) Currently translated at 95.7% (780 of 815 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Greek) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/ * Translated using Weblate (French) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Dutch) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Arabic) Currently translated at 97.4% (372 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Thai) Currently translated at 75.4% (288 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/ * Translated using Weblate (Slovak) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (German) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Slovak) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (Kazakh) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/ * Translated using Weblate (Persian) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Kazakh) Currently translated at 99.0% (378 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/ * i18n-tasks normalize * yarn manage:translations * Fix empty string in Occitan	6 years ago
mayaeh	020c6ae72f	i18n: Update Japanese translations (#10536) ... * run i18n-tasks add-missing * Update Japanese translations.	6 years ago
Aditoo17	7568f716a1	I18n: Add one more string (#10543)	6 years ago
Aditoo17	db70d35c3f	I18n: Final Czech translation 🇨🇿 (#10542) ... * I18n: Update Czech translation * I18n: Why do you want to join translation * I18n: Translating a bunch of more stuff	6 years ago
koyu	fc14f14e20	Updated German translation (#10539) ... * Updated German locales * Added account approval locales (German) * Updated JSON locales (German) * Updated German translation * Fixed grammar error (German) * New strings and adjustments (German)	6 years ago
Jeong Arm	70a6a8aabc	Translation - Korean (#10540)	6 years ago
Alix Rossi	73bbfcb482	i18n: Update Corsican translations (#10538)	6 years ago
Thibaut Girka	cde0ac1aa7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	6 years ago
Eugen Rochko	75ab8cef8f	Change the groupings of menu items in settings navigation (#10533) ... * Change the groupings of menu items in settings navigation Fix #10307 * Remove unused translations	6 years ago
Eugen Rochko	13c1b5bac8	Add preference to disable e-mails about new pending accounts (#10529)	6 years ago
Eugen Rochko	7eb05b8724	Add "why do you want to join" field to invite requests (#10524) ... * Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted	6 years ago
Alix Rossi	fb93400e7d	i18n: Update Corsican translations (#10510) ... * i18n: Update Corsican translations * i18n: Update Corsican translations	6 years ago
ThibG	a604f766e0	Fix batch actions not working on pending accounts (#10508)	6 years ago
Thibaut Girka	5c8f9a3220	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	6 years ago
koyu	c66a043591	Updated German locales (#10505) ... * Updated German locales * Added account approval locales (German) * Updated JSON locales (German)	6 years ago
Alix Rossi	a5a7780ad1	i18n: Update Corsican translations (#10504)	6 years ago
Aditoo17	20040927fc	i18n: Update Czech translation (#10506)	6 years ago
Jeong Arm	d035f4af41	Translate Korean (#10499)	6 years ago
Hugo "Slaynash" Flores	5858035e39	Updated french translations (#10498) ... * updated "Invalid email or password" french translation * Updated FR translations ("instance" in now "serveur")	6 years ago
mayaeh	4f8beb3717	i18n: Update Japanese translations (#10494) ... * Update Japanese translations * Update Japanese translations.	6 years ago
Alix Rossi	6893b404f2	i18n: Update Corsican translations (#10496) ... * Update Corsican translation * Fix brackets typo	6 years ago
Eugen Rochko	c84c30c542	Improve blocked view of profiles (#10491) ... * Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 0317f37c6f. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 4cd944d364. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well	6 years ago
Aditoo17	12ebe48505	I18n: Update Czech translation (#10489)	6 years ago
koyu	59de320605	Updated German locales (#10488)	6 years ago
Eugen Rochko	c34a7f5bd2	Add batch actions for approving and rejecting pending accounts (#10469)	6 years ago
marcin mikołajczak	0e7c4d0c69	i18n: Update Polish translation (#10479) ... Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>	6 years ago
jeroenpraat	4c20f5376a	Dutch (nl) translation (#10474) ... * Translation Dutch * Update activerecord.nl.yml * Update devise.nl.yml * Update nl.yml * Update nl.yml * Update devise.nl.yml * Update nl.yml	6 years ago
Thibaut Girka	a835ea0e8f	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.	6 years ago
spla	f46cd7f002	i18n: update Catalan translation (#10458) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations	6 years ago
Jeong Arm	e09e68b656	Translate Korean (devise) (#10464)	6 years ago
Jeong Arm	7deedcc0cf	Esperanto translations (#10461) ... * Esperanto translations * Translate untranslated Esperanto strings * Normalize eo translation	6 years ago
Renato "Lond" Cerqueira	a0eaf51ad4	Re-dd PT-br translations (#10459)	6 years ago
spla	8cc94c38cf	i18n: update catalan translations (#10455) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations	6 years ago
Aditoo17	445568eff3	I18n: Improve Czech translation (#10454)	6 years ago
Thibaut Girka	5eb2632410	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml	6 years ago
mayaeh	0615bc56aa	i18n: Update Japanese translations (#10427) ... * Update Japanese translations. run yarn manage:translations && i18n-tasks add-missing * Update Japanese translations. * Fix mistake * Change to be concise.	6 years ago