1078 Commits (6e3f176b8e9f3fd2528b602ab49d68827acb675f)

Author	SHA1	Message	Date
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.	7 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	7 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	7 years ago
Jakob Kramer	e6c9756fa9	Update German translation (#5425)	7 years ago
Yamagishi Kazutoshi	5050719fac	Add Japanese translations (#5427) ... * yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393	7 years ago
Yamagishi Kazutoshi	989553c69a	Normalize locale files (#5429)	7 years ago
masarakki	0e0c6b1b4b	use-DB_NAME-in-development (#5430)	7 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	7 years ago
Jeroen	df1a9c5ab5	Small update Dutch (nl) strings (#5424) ... * Update Dutch strings * Update Dutch	7 years ago
Marcin Mikołajczak	3c530d95f6	i18n: Update Polish translation (#5416) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 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)	7 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	7 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	7 years ago
JeanGauthier	8eb7d30a6c	l10n Occitan: finishing touches (#5404) ... * Update oc.json * Update oc.yml	7 years ago
Yannick A	7fe1428cc4	Update French translation (#5401)	7 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	7 years ago
Yannick A	c6f76db2e1	Update French translation (#5384) ... Update French translation	7 years ago
Masoud Abkenar	2c704ca9c6	l10n: update Persian translation for 2.0 (#5391)	7 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'	7 years ago
Anna e só	ad917cda10	l10n: PT-BR translation updated (#5362) ... * PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed	7 years ago
Jeroen	f398ad1994	Updating more Dutch strings for 2.0 (#5359)	7 years ago
Alda Marteau-Hardi	3cfcc7a50e	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)	7 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.	7 years ago
Marcin Mikołajczak	9d84b6e606	i18n: Update Polish translation (#5346) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
JeanGauthier	bf0f7e8846	Moderation notes (#5344)	7 years ago
nullkal	4817744b87	Update ja.yml (#5342) ... * Update ja.yml * Update simple_form.ja.yml	7 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.	7 years ago
JohnD28	fe6941e28e	Update doorkeeper.fr.yml (#5317)	7 years ago
Nolan Lawson	bebaa6eced	Remove prop types from external libraries (#5304)	7 years ago
Jakob Kramer	616f53eea8	Update German translation (#5302)	7 years ago
Jeong Arm	9d97054fe6	Remove timestamps on any option (#5282)	7 years ago
unarist	7fd66cf2fe	Fix migration failure due to StrongMigrations on production env (#5283)	7 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	7 years ago
m4sk1n	f0c939c431	i18n: Update Polish translation (#5270) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Jeong Arm	ebadfe0ab7	Translate some Esperanto (#5252) ... * Translate some Esperanto * More translation * More Esperanto translation * Esperanto translation * Fix mistaken format	7 years ago
JeanGauthier	94f15338c3	i18n update Occitan (#5263) ... * Update oc.json * Update oc.yml * Update oc.yml * Update oc.json	7 years ago
Nolan Lawson	7de6d269d2	Use ES module build of react-router-dom (#5264)	7 years ago
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	7 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	7 years ago
Eugen Rochko	3a3475450e	Encode custom emojis as resolveable objects in ActivityPub (#5243) ... * Encode custom emojis as resolveable objects in ActivityPub * Improve code style	7 years ago
Jeong Arm	0e0a9e716c	Korean translation (#5244) ... * [i18n] Korean translation Add missing Korean translations. [skip ci] * start ci	7 years ago
m4sk1n	4413d81d7f	i18n: Update Polish translation (#5255) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Eugen Rochko	eb5ac23434	Clean up code style of Mastodon::TimestampId module (#5232) ... * Clean up code style of Mastodon::TimestampId module * Update brakeman config	7 years ago
Eugen Rochko	49cc0eb3e7	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
Lynx Kotoura	32e8a87830	adjust public profile pages 2 (#5223)	7 years ago
Jakob Kramer	636acb5712	Update German translation (#5221)	7 years ago
utam0k	b3af3f9f8c	Implement EmailBlackList (#5109) ... * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	7 years ago
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447) ... * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	7 years ago
aschmitz	2076c557c9	Configure webpack to poll for changes in development (#5040) ... * Configure webpack to poll for changes in development Vagrant on Linux/macOS hosts shared files via NFS, which doens't support inotify-based watching of files. This tweak makes webpack check for changes every second, and rebuild if necessary. This removes the need to restart Foreman every time a frontend file changes. Note that rebuilding is still a relatively lengthy process. The polling frequency can be changed to taste. * Only poll in Vagrant This tests for the presence of the VAGRANT environment variable to determine whether or not we're in Vagrant. It is set in .env.vagrant, which is set up to be included in the Vagrantfile.	7 years ago
Yamagishi Kazutoshi	eb6ec3d068	Add missing Japanese translations (#5193) ... * yarn manage:translations * Add Japanese translations for #5170 * Add Japanese translations for #5123 * Add Japanese translations for #5046 * Add Japanese translations for #5099 * Add Japanese translations for #5161 * "項目" -> "絵文字"	7 years ago
Jakob Kramer	395a57d03d	Update German translation (#5189)	7 years ago
m4sk1n	a767ef85fa	i18n: Update translation files and Polish translation (#5180) ... * Update translation files Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Jeong Arm	c30e492587	Korean translation (#5185) ... * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	7 years ago
JeanGauthier	04fa4eb7f9	l10n Update OC: reorganization pref. page (#5168)	7 years ago
Eugen Rochko	0b3f1ec62a	Reorganize preferences page (#5161)	7 years ago
Eugen Rochko	eb605141ff	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	7 years ago
roikale	1df453aff6	Change wording on landing page. (#4805) ... "Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa". https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto	7 years ago
Nishi, Keisuke	83ffc4dc07	Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155)	7 years ago
Jakob Kramer	1a72813b53	Updated German translation (#5151) ... Translate "about" page, several settings pages, data export/import, sessions overview, authorized followers page, account deletion page. More consistent use of words: - A toot is a Beitrag. - An account is a Konto. Some small improvements.	7 years ago
Yanaken	c3f9c74719	Better Japanese translations (#5142)	7 years ago
Eugen Rochko	35a8cafa35	Replace self-rolled statsd instrumention with localshred/nsa (#5118)	7 years ago
Jakob Kramer	d0b4709b2a	Update German translation (#5133) ... Create activerecord.de.yml (50%) Update devise.de.yml Update doorkeeper.de.yml (100%) Update simple_form.de.yml (100%)	7 years ago
JeanGauthier	3406e30526	OC 500 error (#5110)	7 years ago
Eugen Rochko	4ec1771165	Add ability to specify alternative text for media attachments (#5123) ... * Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference	7 years ago
Eugen Rochko	db3ed498b0	When OAuth password verification fails, return 401 instead of redirect (#5111) ... Call to warden.authenticate! in resource_owner_from_credentials would make the request redirect to sign-in path, which is a bad response for apps. Now bad credentials just return nil, which leads to HTTP 401 from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into this way.	7 years ago
Yamagishi Kazutoshi	901fc48aae	Upgrade Webpacker to version 3.0.1 (#5122)	7 years ago
m4sk1n	9d53a38a44	i18n: Update Polish translation (#5106) ... * i18n: Update Polish translation * i18n: Update Polish translation	7 years ago
Eugen Rochko	e528114c53	Follow-up to #4582 and #5027, removing dead code (#5101)	7 years ago
Eugen Rochko	3b60832214	New error page graphic. Other error page improvements (#5099) ... - 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault	7 years ago
Eugen Rochko	2c8e3fbbfb	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	7 years ago
Eugen Rochko	b982d549f4	Add strong_migrations gem to warn when creating unsafe migrations (#5078)	7 years ago
Eugen Rochko	293972f716	New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)	7 years ago
Lynx Kotoura	8fcfcddc8f	Fix theme translations alphabetically (#5031)	7 years ago