1112 Commits (d872902997c29e228001b71a4a3ede589e346f5d)

Author	SHA1	Message	Date
SerCom_KC	12cea76634	Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849) ... * i18n: (zh-CN) Add missing translations for multiple PRs. Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757 * i18n: (zh-CN) Fix translation for #5823 / #5835 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `发送者` to `作者` * i18n: (zh-CN) Add missing translations for #5862 * i18n: (zh-CN) Add missing translation for #5874 * i18n: (zh-CN) Improve translations for keyboard shortcuts	7 years ago
mayaeh	51f2eca887	Add Japanese translations for invite filter. (#5869)	7 years ago
Marcin Mikołajczak	b15482ce71	i18n: 🇵🇱 (#5865)	7 years ago
Yamagishi Kazutoshi	74320971e2	Add invite filter (#5862)	7 years ago
Marcin Mikołajczak	82ab9736d5	i18n: 🇵🇱 (#5851) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
mayaeh	a62039df27	Update Japanese translations. (#5844)	7 years ago
Yamagishi Kazutoshi	15fab79cfa	Show "expired" in invite index (#5838) ... * Show "expired" in invite index * "Force expire" -> "Deactivate"	7 years ago
nullkal	1b57d4dd3a	Fix account migration feature (#5837) ... * Make removable account migration * Fix error during update of account migration setting * Add notice when update account migration setting	7 years ago
Marcin Mikołajczak	d937a59997	i18n: 🇵🇱 (#5841) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Eugen Rochko	706e534455	Add UI for setting up account migration (#5832)	7 years ago
mayaeh	c6b7c77229	i18n: Update ja translation for consumable invites. (#5829) ... * Add Japanese translation for consumable invites. * Add Japanese translation. * Update Japanese translation.	7 years ago
Eugen Rochko	740f8a95a9	Add consumable invites (#5814) ... * Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly	7 years ago
spla	d07983b56d	Updated Catalan strings (#5801) ... * 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	7 years ago
Yamagishi Kazutoshi	662b8eefe8	Change navigation link for moderators (#5812)	7 years ago
mayaeh	7a45d382ea	i18n: Update ja translations (#5804) ... * Add Japanese translations. * Update Japanese translations. * Fix japanese translation.	7 years ago
Eugen Rochko	e84fecb7e9	Add logging of admin actions (#5757) ... * Add logging of admin actions * Update brakeman whitelist * Log creates, updates and destroys with history of changes * i18n: Update Polish translation (#5782) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Split admin navigation into moderation and administration * Redesign audit log page * 🇵🇱 (#5795) * Add color coding to audit log * Change dismiss->resolve, log all outcomes of report as resolve * Update terminology (e-mail blacklist) (#5796) * Update terminology (e-mail blacklist) imho looks better * Update en.yml * Fix code style issues * i18n-tasks normalize	7 years ago
SerCom_KC	bc4a726c24	i18n: (zh-CN) Add translations for #5746 & #5735 (#5764)	7 years ago
mayaeh	fc2155019b	Add Japanese translations. (#5769)	7 years ago
Joan Montané	53b7b81b43	Update and fix Catalan translation (#5773) ... * Update activerecord.ca.yml * Update ca.yml * Update devise.ca.yml * Update doorkeeper.ca.yml * Update simple_form.ca.yml * fix syntax error for ca translation * fix syntax errors in ca translations Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
mayaeh	08deec4c84	i18n: Update ja translation for moderator badge. (#5731) ... * Update Japanese translation for moderator badge. * Follows English notation	7 years ago
Lynx Kotoura	3d1d3d9a20	Remove translations of default theme (#5741)	7 years ago
Yamagishi Kazutoshi	bfdcf76a64	Add “staff” badge to admin user pages (#5735) ... * Allow staff badge to change from setting to hidden * i18n: Update Polish translation	7 years ago
Marcin Mikołajczak	b380e9d2cb	i18n: Update Polish translation (#5749)	7 years ago
Eugen Rochko	58cede4808	Profile redirect notes (#5746) ... * Serialize moved accounts into REST and ActivityPub APIs * Parse federated moved accounts from ActivityPub * Add note about moved accounts to public profiles * Add moved account message to web UI * Fix code style issues	7 years ago
SerCom_KC	6be72a3ec6	Updating Chinese (Simplified) translations (#5725) ... * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `静音` to `隐藏` * i18n: (zh-CN) Add translations for #5087 & #5669 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translation for #5728	7 years ago
Eugen Rochko	24cafd73a2	Lists (#5703) ... * Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests	7 years ago
Yamagishi Kazutoshi	dc6e031364	Redirect to reports when moderator (#5733)	7 years ago
Eugen Rochko	2151fd3150	Display moderator badge (green), admin badge changed to red (#5728)	7 years ago
mayaeh	f6bc6399e2	Add Japanese translation for DM block option. (#5704)	7 years ago
Eugen Rochko	546257bc7f	Allow specifying STATSD_NAMESPACE (#5700)	7 years ago
Eugen Rochko	fbef909c2a	Add option to block direct messages from people you don't follow (#5669) ... * Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)	7 years ago
SerCom_KC	c3ec1e87b8	Updating Chinese (Simplified) translations (#5643) ... * i18n: (zh-CN) Bug fix for note-counter. * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add support.array key for better wording * Revert "i18n: (zh-CN) Add support.array key for better wording" This reverts commit 27bf9a946e. Looks like this commit can't get pass the checks, revert it for now. * i18n: (zh-CN) Change `客户端` to `应用` * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations (#5635) * i18n: (zh-CN) Change `两步验证` to `双重认证` * i18n: (zh-CN) Improve translations	7 years ago
Marcin Mikołajczak	8087aa83d4	i18n: Update Polish translation (#5699) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
mayaeh	249b0fe107	Add Japanese translations for moderator roles and its own admin actions. (#5689)	7 years ago
Marcin Mikołajczak	a6682a3000	i18n: fix typo in Polish translation (#5688)	7 years ago
Anna e só	0e6c4cb796	l10n: PT-BR translation updated (#5681) ... * Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531. * Updated pt-BR.json * pt-BR.yml updated	7 years ago
KEINOS	252d0fe020	Fix #5652 - Notify too short when abbrev in JA (#5664) ... * Fix #5652 - Notify too short when abbrev in JA Fix #5652 of the notification message to be understandable when abbreviated. * Changed quotes as original Double quote to single and single quote as none. But I am not convinced of this fix. * Added a single quote as YAMLlint's suggestion * `bundle exec i18n-tasks normalize`	7 years ago
Marcin Mikołajczak	fcb9533549	i18n: Update Polish translation (for #5635) (#5661) ... * i18n: Update Polish translation (for #5635) * 😑🔫	7 years ago
Eugen Rochko	7bb8b0b2fc	Add moderator role and add pundit policies for admin actions (#5635) ... * Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n	7 years ago
Matt	e5aa4128f6	Update en.yml (#5648) ... Changed "Toots with replies" to read "Toots and replies"	7 years ago
Marcin Mikołajczak	cfd7b7a0b7	i18n: Update Polish translation (#5639) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
nullkal	36376b5e23	Translate ja (#5637)	7 years ago
Quenty31	eb97bd8af6	i10n OC: Memorial (#5615) + #5467 (#5623) ... * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)	7 years ago
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615) ... Fix #5597	7 years ago
MitarashiDango	cbbeec05be	Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)	7 years ago
nullkal	b6e2e999bd	Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467) ... * Show the local couterpart of emoji when it exists in admin/custom_emojis * Fix indentation * Fix error * Add class table-action-link to Overwrite link * Make it enable to overwrite emojis * Make Code Climate happy	7 years ago
Yamagishi Kazutoshi	47b0c61853	Unify file upload to using fog (#5604)	7 years ago
Marcin Mikołajczak	d48779cf7b	i18n: Improve Polish translation (#5596) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Yamagishi Kazutoshi	8a588145d5	Update extract-text-webpack-plugin to version 3.0.2 (#5584)	7 years ago
Quenty31	da3adc0a73	l10n Occitan (#5586) ... * Update OC: time format Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan Harmonisation words in menu and confirmation windows * Update for unlisted custum emoji + #5577 * correction subjonctiu It's either siasque or siague * Corrections Any : qual que, in two words, else it means "some". And "siasque" with S even if I don't pronounce it at all. * Update oc.json	7 years ago
MitarashiDango	38d072446b	add account search condition (instance domain) (#5577)	7 years ago
Yamagishi Kazutoshi	8ae9bd0eea	Upgrade compression-webpack-plugin to version 1.0.1 (#5581)	7 years ago
Nolan Lawson	0692991b54	Add ServiceWorker caching for static assets (#5524)	7 years ago
Yamagishi Kazutoshi	a2a4bf4e78	Update dependencies for Ruby (2017-10-30) (#5566) ... * Update better_errors to version 2.4.0 * Update binding_of_caller to version 0.7.3 * Update bootsnap to version 1.1.5 * Update browser to version 2.5.2 * Update capistrano to version 3.10.0 * Update capistrano-bundler to version 1.3.0 * Update capistrano-rbenv to version 2.1.2 * Update capybara to version 2.15.4 * Update cld3 to version 3.2.1 * Update fabrication to version 2.18.0 * Update fog-openstack to version 0.1.22 * Update kaminari to version 1.1.1 * Update lograge to version 0.7.1 * Update nokogiri to version 1.8.1 * Update oj to version 3.3.9 * Update ox to version 2.8.1 * Update parallel_tests to version 2.17.0 * Update pkg-config to version 1.2.8 * Update rspec-rails to version 3.7.1 * Update rubocop to version 0.51.0 * Update scss_lint to version 0.55.0 * Update sidekiq to version 5.0.5 * Update sidekiq-scheduler to version 2.1.10 * Update tzinfo-data to version 1.2017.3 * Update webpacker to version 3.0.2 * bundle update	7 years ago
SerCom_KC	29609fbb6a	Updating Chinese (Simplified) translations (#5508) ... * i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation	7 years ago
Alda Marteau-Hardi	4080569c2d	Fix a grammatical error in the notifications. (#5555)	7 years ago
Marcin Mikołajczak	2cbb8e8cd1	i18n: Update Polish translation (#5547)	7 years ago
Akihiko Odaki	e4080772b5	Use contenthash for ExtractTextWebpackPlugin (#5462) ... [hash] is not documented.	7 years ago
nullkal	781105293c	Feature: Unlisted custom emojis (#5485)	7 years ago
Ratmir Karabut	20fee786b1	Update Russian translation (#5517) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation * Update Russian translation * Fix merge conflicts (revert) * Update Russian translation * Update Russian translation (fix) * Update Russian translation (fix quotes) * Update Russian translation (fix quotes) * Update Russian translation (fix) * Update Russian translation * Add quotes * bundle exec i18n-tasks normalize	7 years ago
Anna e só	74777599cf	l10n: PT-BR translation updated (#5530)	7 years ago
Håkan Eriksson	c710069c12	Some typos and supplementation in sentence structures (#5441) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete * Swedish - Typos and supplementation in sentence structure * Update simple_form.sv.yml * Update sv.yml * Update sv.yml Rearranged the alphabetical order.	8 years ago
Jeroen	363d0d3a44	Dutch: A few strings I found last minute (#5440) ... * Dutch: A few strings I found last minute * Update simple_form.nl.yml	8 years ago
JeanGauthier	33ea042dec	i18n better wording (OC/CA/FR) + string added in FR (#5438) ... * Update oc.json * Update fr.json * Update ca.json * Update fr.json * Update simple_form.fr.yml * Update ca.json * Update fr.json * Update oc.json * Update oc.json * Update fr.json	8 years ago
Jakob Kramer	e6c9756fa9	Update German translation (#5425)	8 years ago
Yamagishi Kazutoshi	5050719fac	Add Japanese translations (#5427) ... * yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393	8 years ago
Yamagishi Kazutoshi	989553c69a	Normalize locale files (#5429)	8 years ago
masarakki	0e0c6b1b4b	use-DB_NAME-in-development (#5430)	8 years ago
Håkan Eriksson	a2b600428c	Swedish translation (#5406) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete	8 years ago
Jeroen	df1a9c5ab5	Small update Dutch (nl) strings (#5424) ... * Update Dutch strings * Update Dutch	8 years ago
Marcin Mikołajczak	3c530d95f6	i18n: Update Polish translation (#5416) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
JeanGauthier	1e7b3bf625	i18n ultim hour «More» dropdown title + reduce motion (#5415) ... * Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)	8 years ago
Nolan Lawson	fa0be3f834	Add option to reduce motion (#5393) ... * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	8 years ago
voidSatisfaction	3e2f793948	Add up-to-date korean translation on serverside (#5400) ... * chore: add korean translation on ko.yml * feat: add simple form korean translation up-to-date	8 years ago
JeanGauthier	8eb7d30a6c	l10n Occitan: finishing touches (#5404) ... * Update oc.json * Update oc.yml	8 years ago
Yannick A	7fe1428cc4	Update French translation (#5401)	8 years ago
spla	f63a40e7c2	Updated Catalan strings (#5323) ... * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted * Updated Catalan strings * Updated Catalan strings	8 years ago
Yannick A	c6f76db2e1	Update French translation (#5384) ... Update French translation	8 years ago
Masoud Abkenar	2c704ca9c6	l10n: update Persian translation for 2.0 (#5391)	8 years ago
Mathias B	c1a2707ecf	Correct some misspellings (#5381) ... * Correct some misspellings Remove some english language and put the proper french words in place. * Forgot some shit Buurps'	8 years ago
Anna e só	ad917cda10	l10n: PT-BR translation updated (#5362) ... * PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed	8 years ago
Jeroen	f398ad1994	Updating more Dutch strings for 2.0 (#5359)	8 years ago
Alda Marteau-Hardi	3cfcc7a50e	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)	8 years ago
JohnD28	691e9112f3	Update fr.yml (#5330) ... * Update fr.yml Update of french translation and reformatting Privacy Policy for better maintenance. * Update fr.yml * Update fr.yml * Update fr.yml Corrections suivant les remarques d'Alda. * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml I have replaced my proposals with those accepted here to reduce the conflict. https://github.com/tootsuite/mastodon/pull/5340 J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit. Comment dois-je faire à l'avenir pour éviter ce genre de situations ? * Update fr.yml Conflict reduction.	8 years ago
Marcin Mikołajczak	9d84b6e606	i18n: Update Polish translation (#5346) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
JeanGauthier	bf0f7e8846	Moderation notes (#5344)	8 years ago
nullkal	4817744b87	Update ja.yml (#5342) ... * Update ja.yml * Update simple_form.ja.yml	8 years ago
Sylvhem	3ebe03b729	Fixes and updates for the French translation (#5340) ... * Ajout du support des thèmes multiples Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples. Add translations for the new strings allowing support for multiple themes. * Mise à jour de la traduction Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas. Update modified strings and add new translations for the ones who are missing them. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.	8 years ago
JohnD28	fe6941e28e	Update doorkeeper.fr.yml (#5317)	8 years ago
Nolan Lawson	bebaa6eced	Remove prop types from external libraries (#5304)	8 years ago
Jakob Kramer	616f53eea8	Update German translation (#5302)	8 years ago
Jeong Arm	9d97054fe6	Remove timestamps on any option (#5282)	8 years ago
unarist	7fd66cf2fe	Fix migration failure due to StrongMigrations on production env (#5283)	8 years ago
Eugen Rochko	0717d9b3e6	Set snowflake IDs for backdated statuses (#5260) ... - Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity - Skip for statuses coming from inbox, aka delivered in real-time - Skip for statuses that claim to be from the future	8 years ago
m4sk1n	f0c939c431	i18n: Update Polish translation (#5270) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
Jeong Arm	ebadfe0ab7	Translate some Esperanto (#5252) ... * Translate some Esperanto * More translation * More Esperanto translation * Esperanto translation * Fix mistaken format	8 years ago
JeanGauthier	94f15338c3	i18n update Occitan (#5263) ... * Update oc.json * Update oc.yml * Update oc.yml * Update oc.json	8 years ago
Nolan Lawson	7de6d269d2	Use ES module build of react-router-dom (#5264)	8 years ago
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	8 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	8 years ago