429 Commits (c1bc5e14ebbecd8ffc6b4188fbf608e11f64422e)

Author	SHA1	Message	Date
Eugen Rochko	42b8220632	Fix #1624 - Send e-mail notifications to admins about new reports (#3949)	8 years ago
m4sk1n	646de92781	i18n: Updated Polish translation (#3956) ... * i18n: Updated Polish translation * Update pl.yml	8 years ago
m4sk1n	ae2b722f55	i18n: Warning to look into the spam folder (pl) (#3955)	8 years ago
Alda Marteau-Hardi	f53ed108b0	Translate pin/unpin and fix some inconsistencies in gender neutral strings (#3952)	8 years ago
Eugen Rochko	5e8d037e27	Fix #3910 - Require OTP authentication to disable 2FA (#3935) ... * Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability to generate new OTP backup codes *after* initial backup codes were handed out during activation * Restore recovery code re-generation * Improve display of some 2FA elements	8 years ago
Eugen Rochko	d821aba002	Rename "Credentials" page to "Security" for clarity (#3941) ... * Rename "Credentials" page to "Security" for clarity * Change "security" icon from cog to lock	8 years ago
Eugen Rochko	f7301bd5b9	Add overview of active sessions (#3929) ... * Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test	8 years ago
Ratmir Karabut	9ca02a00a6	Update Russian translation (#3902) ... * 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	8 years ago
Quent-in	98fab24bea	Update of doorkeeper.oc.yml (#3896) ... Just some adjustements	8 years ago
m4sk1n	da6fa029f6	i18n: Fixed typo in Polish translation (#3864)	8 years ago
のら	5cc7cd8518	Add Japanese translation "Action taken by" (#3850)	8 years ago
spla	4367443287	Added new Catalan strings (#3843) ... * 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	8 years ago
Quent-in	8fd931dc12	l10n update for account deletion (#3820) ... * l10n update for acount deletion * l10n little change * l10n little changes Less passive voice, more natural. * Update oc.yml Correction, " added	8 years ago
m4sk1n	6f34fdb616	updated Polish translation (#3751) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
unarist	da0333f1cb	Add Japanese translation for Account deletion (#3747)	8 years ago
m4sk1n	98eacb2238	i18n: updated Polish translation (#3744)	8 years ago
Eugen Rochko	4a618908e8	Account deletion (#3728) ... * Add form for account deletion * If avatar or header are gone from source, remove them * Add option to have SuspendAccountService remove user record, add tests * Exclude suspended accounts from search	8 years ago
Ratmir Karabut	9e53fe5c29	Update Russian translation (#3692)	8 years ago
m4sk1n	778430b54a	i18n: Minor fixes in Polish translation (#3674) ... * i18n * i18n * i18n * i18n * i18n	8 years ago
m4sk1n	1a065fb146	i18n: updated Polish translation (#3670)	8 years ago
Yamagishi Kazutoshi	1be48dd805	Refactor views/admin/reports/show.html.haml (#3656)	8 years ago
unarist	65d8c73bae	Add Japanese translation for #3640 (#3650)	8 years ago
Eugen Rochko	8902e265b4	Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640) ... * Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks	8 years ago
Yamagishi Kazutoshi	7d2b4186c3	Add Japanese translations (#3635)	8 years ago
m4sk1n	90689190a3	i18n: Update Polish translation (#3637)	8 years ago
Sorin Davidoi	8acadeea76	fix: Warn if JavaScript is disabled (#3634)	8 years ago
jeroenpraat	92bb166246	Rest of 2FA translated + small fix (#3630)	8 years ago
m4sk1n	30fa5fe1a4	i18n: updated Polish translation (#3597) ... * i18n: updated Polish translation * i18n: updated Polish translation btw it would be nice to have master-based Mastodon instance (even isolated from others) to test translation.	8 years ago
Quent-in	370fa70924	l10n update for occitan language (#3557) ... * i18n Update : Add preference setting for delete toot modal Adding a line for "Add preference setting for delete toot modal" * i18n update for pin/unpin Update to add two more translations * i18n update to have the dates in plain occitan * Removed the blank line * %{selft} back in the translation	8 years ago
Eugen Rochko	f7a30e2fae	Added support for configurable reserved usernames (fix of #1382) (#3566) ... * Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames	8 years ago
Matt Jankowski	de4681b2be	Move admin/pubsubhubbub controller to admin/subscriptions (#3442)	8 years ago
spla	93de41b39b	Catalan language updates (#3454) ... * 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	8 years ago
Atsushi Yamamoto	402c19a924	Add preference setting for delete toot modal (#3368) ... * Set delete_modal preference to true by default * Does not show confirmation modal if delete_modal is false * Add ja translation for preference setting page	8 years ago
vidarlee	450441fc11	i18n: Add some tags for Chinese translation (#3379) ... * Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175 * i18n: Add some tags for Chinese translation * i18n: Add some tags for Chinese translation	8 years ago
Masoud Abkenar	b619362a36	Persian translation fixes and updates (#3380) ... * Persian translation fix * Persian translation of new strings	8 years ago
jeroenpraat	f9180823bc	Update Dutch strings for 1.4 (#3363) ... * Update nl strings for 1.4 * Update nl strings for 1.4 * Update nl strings for 1.4 * nl strings (+1) More new OTP strings will be translated another time	8 years ago
Quent-in	4b0c667c09	i18n update for Occitan language (#3362) ... * Update simple_form.oc.yml * Added check spam folder * Update oc.json abonats => seguidors * Update oc.yml * Update oc.json Added translations + corrections * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * i18n mailer * Update reset_password_instructions.oc.html.erb	8 years ago
m4sk1n	1b732cad61	i18n: pl: pluralized (#3344) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
m4sk1n	ef80ad17b3	Updated Polish translation (#3335) ... * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: corrected Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update simple_form.pl.yml * Update simple_form.pl.yml * updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update pl.yml	8 years ago
Ira	2241a15ee9	i18n: New strings translated to Hebrew (#3282)	8 years ago
alpaca-tc	7ee5fc5d68	Toggle sensitive from admin page (#3261)	8 years ago
Ira	1baa75f79f	i18n: Latest Hebew strings translated (#3250)	8 years ago
Eugen Rochko	9afd7dadbf	Fix more locale regressions from #3055 (#3242)	8 years ago
Eugen Rochko	48e7a22e34	Fix locale regression from #3055 (#3231)	8 years ago
Ratmir Karabut	2bb5486357	Update Russian translation (#3225) ... * 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	8 years ago
m4sk1n	fbbd80b40b	Updated Polish translation (#3204) ... * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: corrected Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update simple_form.pl.yml * Update simple_form.pl.yml	8 years ago
Yamagishi Kazutoshi	84608c3ff8	Add translations for counter of profile (#3214) ... ref #3101	8 years ago
Masoud Abkenar	b69365e397	Persian translation update (#3206) ... * Persian translation update * Persian translation update: new files * Persian translation update * activerecord.fa.yml language code * Persian translation update * fix indent	8 years ago
vidarlee	440441ccb3	Enhance for the Chinese translation (#3198) ... * Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175	8 years ago
Daigo 3 Dango	3eb13307ca	Add a Japanese translation for PR #3175 (#3192)	8 years ago
spla	b75f13927e	Catalan translation update (#3177) ... * 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	8 years ago
Matt Jankowski	8f4b7c1820	Filter languages with opt out (#3175) ... * Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages	8 years ago
Yamagishi Kazutoshi	da0a18a318	Add Japanese translations (domain block & admin page) (#3160) ... https://github.com/tootsuite/mastodon/pull/3100 https://github.com/tootsuite/mastodon/pull/3127	8 years ago
Ira	550863198c	i18n: Hebrew Spam folder check warning added (#3134)	8 years ago
Ira	b11c4326d2	i18l: Hebrew translation updates (#3109)	8 years ago
Quent-in	cf6f67997e	Update oc.yml (#3112) ... Normally fully complete	8 years ago
Eugen Rochko	76449df903	Fix character counter not updating for bio (#3101)	8 years ago
Eugen Rochko	226c9836e4	Add reset button to admin accounts search, improve looks a little (#3100)	8 years ago
alpaca-tc	e89e4355eb	Add filter to AccountFilter (#2968)	8 years ago
jeroenpraat	7c1f3f8163	Added a warning to look into the spam folder (#2921) ... Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.	8 years ago
spla	a51c8074df	Add catalan language (#3084) ... * 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	8 years ago
Hiroaki Ninomiya	9bddb946f0	feat(ja): add missing ja translation. (#3083) ... ref: https://github.com/tootsuite/mastodon/pull/2584	8 years ago
Hiroaki Ninomiya	cb50ecdb07	chore(landing_strip): hide signup path unless the instance allows registration. (#3055)	8 years ago
Hiroaki Ninomiya	1379124682	Improve ja translation (#3071) ... * chore(ja): replace with reasonable word. * chore(ja): add periods.	8 years ago
Stephen Burgess	4bd0488a77	feat(count): Just yml count syntax to provide different rule for 1 (#2685) ... Update all translation forms that use this "counter" element.	8 years ago
Ira	1b17da6ed9	i18n: Hebrew string updates (#3037)	8 years ago
Bastien	dc5b746f42	Small FR localisation enhancements (#3033) ... * Small localisation enhancement. Be consistent regarding "e-mail" vs "courriel": I suggest using "courriel" to refer to the electronic message and "e-mail" when used in "adresse e-mail". This reflects the usage I generally observe, but I may be wrong. * Localisation enhancements. Omit some commas: "..., ..., ou ..." should be "..., ... ou ..." since "ou" already articulates the sentence. Also replace "demande" by "requête" when it makes sense.	8 years ago
Eugen Rochko	e0c3ed29d8	Fix locales again (#3010) ... * Normalize locales * Restore "mention" locale key	8 years ago
ButterflyOfFire	888864ad5a	Update doorkeeper.ar.yml (#3006) ... * Update doorkeeper.ar.yml - Remodelling doorkeeper.ar.yml and adding missing strings from english version to arabic version. - Translating max strings - Reviewing some translations - Other strings to be translated later (complicated somehow) * Update doorkeeper.ar.yml Updating translations from lines : 88 to 91	8 years ago
Koala Yeung	f5cdea5122	Update Norwegian translations (#2937) ... * Update Norwegian translations * Updated no.json * Updated activerecord.no.yml * Updated no.yml * Updated simple_form.no.yml * i18n: fix Unicode character error in no.yml * Javascript escaping code "\uD83D\uDC18" should be "\U0001f418" in Ruby / yml * i18n: remove unused keys in Norwegian translation * Remove unused keys in no.yml and activerecord.no.yml by running: `bundle exec i18n-tasks remove-unused no` * Add missing keys in activerecord.no.yml and no.yml by running: `bundle exec i18n-tasks add-missing no` * i18n: escape the key 'no' in activerecord.no.yml	8 years ago
jeroenpraat	406229d927	Updating and extending Dutch strings (#2930) ... * Update nl * Update nl * Update nl * Create confirmation_instructions.nl.html.erb * Create confirmation_instructions.nl.text.erb * Create password_change.nl.html.erb * Create password_change.nl.text.erb * Create reset_password_instructions.nl.html.erb * Create reset_password_instructions.nl.text.erb	8 years ago
ButterflyOfFire	7140def5c9	Update simple_form.ar.yml (#2908) ... * Update simple_form.ar.yml Added missing strings that were introduced to simple_form.ar.yml and completing translation. * Create confirmation_instructions.ar.html.erb * Create confirmation_instructions.ar.text.erb * Create password_change.ar.html.erb * Create password_change.ar.text.erb * Create reset_password_instructions.ar.text.erb * Create reset_password_instructions.ar.html.erb	8 years ago
Koala Yeung	cbd673601c	Add Thai langauge (#2903) ... * Updated Thai language * locale: remove unused translation in Thai * locale: add Thai to settings menu and application * locale: fix activerecord.th.yml format	8 years ago
Eugen Rochko	0291b73de7	Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896)	8 years ago
ster	9d84dda213	Update Ukrainian, Russian translations (#2893) ... * Update Ukrainian translation (rebased off Russian translation) * Update Ukrainian, Russian translations	8 years ago
Özcan Zafer AYAN	983593ddf4	Add Turkish yml file (#2878) ... * Add Turkish yml file * Add translation files for Turkish * Deleted click_to_edit key and val Deleted click_to_edit: Düzenlemek için ilgili ayara tıklayınız line	8 years ago
Ira	ee1486a7de	i18n: Update Hebrew interface translation. (#2880) ... * follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...	8 years ago
Koala Yeung	ada8a6cb77	Fix unused key issue in zh-HK (#2870) ... * locale: remove unused keys in zh-HK * locale: update json translations * handled the untranslated strings. * removed unused keys.	8 years ago
m4sk1n	2d45794956	i18n: corrected Polish translation (#2841)	8 years ago
Koala Yeung	886176f854	Update Locale zh-HK (#2818) ... * locale: Add missing translation in zh-HK.yml * locale: fix consistancy in zh-HK.yml translation * locale: Improve zh-HK yml translations * Use "PuSH" in all "PubSubHubBub" occurances. * Simplify text on front page. * Improve doorkeeper authorization table translations. * Simplify setting form text for better layout. * Improve "Business Email" translation. * locale: Update zh-HK.json * Fix untranslated text. * Improve translations.	8 years ago
Milan*	8c9ea9b849	Correct typo in german locale (#2805)	8 years ago
Masoud Abkenar	11077af52f	Persian translation update (#2788) ... * Persian translation update * fix newline typo	8 years ago
Matt Jankowski	2bd132d458	Replace best_in_place editor on admin settings page (#2789) ... * Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n	8 years ago
Eduardo Elias	3b51581f1b	Language: update pt-BR (#2775)	8 years ago
alpaca-tc	db92eec876	Localize 'throttled' (#2755)	8 years ago
Quent-in	53384b0ffe	Update of simple_forum_oc (#2745) ... * Update of simple_forum_oc * Update simple_form.oc.yml	8 years ago
ヨイツの賢狼ホロ | 3rd style	1c469ca98b	i18n: Update zh-CN [ Chinese (China) ] translations. (#2699) ... * Update zh-CN translations. * Update doorkeeper.zh-CN.yml * Follow @Artoria2e5 's change advices. * forget mail for text format ...... * fix some changes * mail's html version ...... * https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283 * a space..... * delete some unused keys	8 years ago
jirayudech	38473f0aa0	Add Thai Language (#2598) ... * Create th.yml * Update th.yml * Update thai translation * update thai translation. * Update Thai translation * Update thai translation * Update thai thanslation * Update thai translation * Update th.yml * Update th.yml	8 years ago
m4sk1n	bf8031e984	i18n: updated Polish translation (#2729) ... * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	8 years ago
Masafumi Otsune	ab307b816b	Update simple_form.ja.yml (#2746) ... "サーバー" in Japanese is "Server", so I modified it to instance according to English.	8 years ago
Yamagishi Kazutoshi	5f9cb48882	Add Japanese translation for allowed languages (#2738) ... * Add Japanese translation for allowed languages * Remove duplicate expression words	8 years ago
m4sk1n	03f3223d72	i18n: updated Polish translation (#2727) ... Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	8 years ago
Kaylee	7880671f35	Add option to disable two factor auth in admin accounts panel. (#2584) ... * Add option to disable two factor auth in admin accounts panel. Closes #2578 * Add @mjankowski's suggestions. * Moves destroy actions behind User#disable_two_factor! * Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!	8 years ago
Quent-in	2128682162	Creation of activerecord for OC (#2721) ... * Creation of activerecord for OC * Update activerecord.oc.yml	8 years ago
m4sk1n	aea3aff4e4	i18n: Updated Polish translation (#2686) ... #807	8 years ago
Eduardo Elias	302c0d2046	Language: update pt-BR (#2687)	8 years ago
Ira	438ce5809f	Add Hebrew interface translation. (#2573) ... * follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...	8 years ago
Drew Gates	f485fa31f3	grammar fixes (#2695) ... “such as” should be used instead of “like” under imports->preface. Reworded imports->preface and recovery_instructions for better flow.	8 years ago
Giuseppe Pignataro	2bd46f442d	Italian translation (#2654) ... * Added Italian Translation of the following files: Changes to be committed: new file: app/views/user_mailer/confirmation_instructions.it.html.erb new file: app/views/user_mailer/confirmation_instructions.it.text.erb new file: app/views/user_mailer/password_change.it.html.erb new file: app/views/user_mailer/password_change.it.text.erb new file: app/views/user_mailer/reset_password_instructions.it.html.erb new file: app/views/user_mailer/reset_password_instructions.it.text.erb * Added italian translation Changes to be committed: new file: config/locales/activerecord.it.yml	8 years ago
Matt Jankowski	f025cc6782	Filter on allowed user language preferences (#2361) ... * Naive approached to timeline filtering * Convert allowed_languages into a db column * Allow users to choose languages to see statuses in * Style list items as two columns * Add a hint to explain language filtering preference	8 years ago