aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,904 Commits
135 Branches
281 Tags
1.1 GiB
Commit Graph

317 Commits (bbaac89eb080e6f0a5832de2333025d0c4be2209)

Author SHA1 Message Date
Matt Jankowski 7f0a865b05 Allow import/export of mutes list () 
* Allow export of mutes list

* Allow importing of mutes list

* Refactor to use Settings::Exports::BaseController and DRY up exports code
Carlos A. Escobar 3064ef96a1 Added missing Spanish translations strings () 
* Added missing Spanish translations strings

* fix bad translation

* resolve conflict with tootsuite/master

* agreements from spanish community

* Add some missing strings
Thomas Citharel d90d23699c Make Reporting admin section translatable () 
* Make Reporting admin section translatable

And translate it into english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Make subject of emails translatable and improve french translation

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Make error pages translatable and translate them in english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Translate site setting section

* Insert instance in registration emails and improve them a bit

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Thor Harald Johansen 1f5ff46fd9 Working translation for Norwegian. ()
Koala Yeung 24eb45425e Add Traditional Chinese, Hong Kong translation (zh-HK) () 
* Added Chinese Traditional Hong Kong (zh-HK) for Ruby

* Added translations for Ruby.

* Added Chinese Traditional Hong Kong (zh-HK) for JS

* Added translations for javascript code.

* Rearrange language references in mastodon.jsx

* Break `addLocaleData` into multiple lines. Make future commit more readable.
* Roughly re-sort the languages in alphabetical orders
  (only manually put English on top because it is default).

* Sort application.rb locale with alphabetical order

With exception that English (default language) goes first.
Improve code readability.

* Resort language selection box alphabetically

Sort HUMAN_LOCALES in the alphabetical order of display name
(except English, the default language, come first).

Improve usability.
Thomas Citharel 327a6e166f Update french locale () 
* Update devise.fr.yml fixing minor typos

* add missing strings

* Fix a translation and add translation for devise part

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
pinfort 6f5268b02d Add Japanese translation () 
* add device.ja.yml

* update device.ja.yml

* add file simple_form.ja.yml

* 👍Added doorkeeper.ja.yml

* add ja.yml

* Update doorkeeper.ja.yml

fixed url to uri

* update ja.yml

* fix some translations

* fix japanese grammar of a translate

* fix some translates

* fix ja.yml

* add ja.jsx

* add Japanese user mail views

* Added japanese translate locales

* Added :ja to available_locales

こっちも

* Added "日本語" to HUMAN_LOCALES

* Imported/Added ja to addLocaleData

* update ja.jsx
jukper 4964433190 Revised finnish translation ()
Jantso Porali 9e3c4fd2d7 Update language files () 
* update faq with default language

* update translation for about page

* update Minio config

Thanks to @Gargon for helping me. I hope this will help others as well

* update import and export translation

* translate emails to finnish

* add finnish translation for emails

* add finnish translation for emails

* add finnish translation

* add missing dot

* update finnish language to emails

* add finnish translation for emails

* add dot and fix typo

* updated some minor typos

* remove language change due breaking emails

And by dev request

* updated minio config by dev request

* updated about page translation

* fix for Amazon S3/Minio instance setups

If you were using S3 or Minio for your files, this will fix the Import issue :)

* update translation according to issue 

See issue 

* update translation for issue 

see issue
Eugen Rochko 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
blackle 06444bf050 Allow user to disable the boost confirm dialog in preferences
Matt Jankowski 4ada50985a Pagination improvements () 
* Replace will_paginate with kaminari

* Use #page instead of #paginate in controllers

* Replace will_paginate.page_gap with pagination.truncate in i18n

* Customize kaminari views to match prior styles

* Set kaminari options to match prior behavior

* Replace will_paginate with paginate in views
Ratmir Karabut 9043b32183 Add Russian translation (ru) () 
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency
Olivier Humbert 082bef3027 French translation update () 
* Update confirmation_instructions.fr.html.erb

consistency across the French translation

* Update 

consistency across the French translation

* Update fr.yml

a bunch of consistency across the French translation + a few typos

* Update doorkeeper.fr.yml

consistency across the French translation (punctuation)
spf e6b48a7048 French typo () 
* French typo

* Datetime french translation
Eugen 9acdb166e8 Fix , fix , fix - 2FA requires confirmation to be enabled () 
* Fix , fix , fix  - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled

* Clean up
Thomas Citharel 41f8fde83e Update french translation () 
Add french translation for emails sent

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add non-breaking spaces

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

changes and fixes to the nbsps

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

French update

a few fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Sebastian Hübner f860eb7d71 Fixed two translation errors () 
Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx
Korbinian 8f9a11b642 Update simple_form.de.yml ()
Jantso Porali 01d8003867 Updated about page in Finnish language () 
* update faq with default language

* update translation for about page

* update Minio config

Thanks to @Gargon for helping me. I hope this will help others as well

* update import and export translation

* translate emails to finnish

* add finnish translation for emails

* add finnish translation for emails

* add finnish translation

* add missing dot

* update finnish language to emails

* add finnish translation for emails

* add dot and fix typo

* updated some minor typos

* remove language change due breaking emails

And by dev request

* updated minio config by dev request

* updated about page translation
Olivier Humbert ed3dfd0bee French translation update () 
* Update fr.yml

one typo fix

* Update simple_form.fr.yml

one translation consistency
Shel R fef478781d Merge branch 'master' into master
Chad Pytel ad5ddd5e95 Use I18n for media attachment validation errors 
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
Jantso Porali 786e6f94b9 Update Finnish translations, add sample Minio config ()
André Lewin bf7cefa516 Merge branch 'master' into master
Jantso Porali 837030db98 updated blocking translation
Jantso Porali deb001bba8 updated two-way auth and preferences translation
Jantso Porali d3bf0307db updated translation for about page
JantsoP 20b53e6add Merge branch 'master' into master
JantsoP 3ec221d3b7 updated reblog to boost translation 
Since it is that :D
JantsoP 473e4f7813 udpdated display_name translation
JantsoP b845ef395d updated reblog translation
Eugen Rochko 667ffafef8 Fix spec
Eugen 086a88f3bb Merge pull request from Eychics/master 
Add closed_registrations message on French language
Eugen e76dd52b08 Merge pull request from JantsoP/master 
Updated Finnish Translation
Eugen c12214963e Merge pull request from kklleemm/patch-1 
Fix typos on french translations
Eugen aa8dacbc8a Merge pull request from chapeaumeinfreund/master 
Updated and fixed german orthography
Eugen ce524cbb49 Merge pull request from chapeaumeinfreund/patch-1 
Updated and fixed german orthography
Eugen 57466d542b Merge pull request from nevillepark/master 
Changed "reblogs" to "boosts"
Clément D 350958babf Fix typos on french translations
Thibaut (Eychics) 9a5d6e9715 Add closed_registrations message on French language
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI
JantsoP db4a41cf58 Merge branch 'master' into master
JantsoP dc89fc17cc updated translation
Neville Park ce1ca28594 Changed "reblogs" to "boosts"
axolotl 0700521ef3 added Esperanto (eo)
Eugen Rochko 98a93aa07e Fix norwegian translation being malformed
Korbinian ec8029a955 Updated and fixed orthography
Korbinian 7dd5ba42a3 Updated and fixed german orthography
Eugen Rochko b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block
Christopher Kolstad 5cb011b66b Add Norwegian locale
JantsoP 65d667dc6c another typo. fuck me
JantsoP d3fde60297 fixed an sneaky peaky tpy
JantsoP 85a8b62ca2 add finnish translation 
add finnish translation
JantsoP 97803600ed add finnish translation 
add finnish translation
JantsoP bfa99981e5 Merge branch 'master' into master
JantsoP b0f4c9b91f finnish translation 
finnish translation
JantsoP f9b4f30de6 updated final translation 
updated final translation
JantsoP 87854745e9 Create new translation file 
Still in progress. Should be done shortly
Angristan c97fc5c1f4 Improve french translation
Valentin Lorentz fbcba65f81 Improve French translation 
Fix typos and typography. Make vocabulary and grammar more uniform.
Damien Erambert 71cf9d0608 Fix typo in simple_form.fr.yml
Damien Erambert 5e45982ed9 Improve translation of data import in fr.yml
Damien Erambert b829460b4a Better translation for revoked token in doorkeeper.fr.yml
Damien Erambert 65e6a00817 Fix date format in doorkeeper.fr.yml
Damien Erambert cb1989cbd8 Add locale in devise.fr.yml
Damien Erambert 03d676faa8 Add french translation for "scopes" in doorkeeper.fr.yml
Damien Erambert 9e26af264e Fix small typo in doorkeeper.fr.yml
Damien Erambert f9f6098e22 Complete localization of in simple_form.fr.yml
Damien Erambert 2c881e6717 Improve french locales on the backend (WIP)
Eugen Rochko 5e26295e06 Fix - hide spoilers on static pages
Eugen Rochko e8875c6046 Import feature for following/blocking lists (addresses , , , )
Eugen Rochko f864fee116 Fix up some localizations
leopku d5d5afff9c 🌐 add simplified chinese language
leopku fc9bbdfd34 🚧 chinese translation WIP
leopku 349c6cfa2b 🌐 add chinese language file
Eugen Rochko 8803ca9efe Improved landing page
Eugen Rochko 6b1db5c2b2 Add landing strip
Eugen Rochko 56d998cbdb Export follow/block lists as CSV
shel 38dceb3bf7 Promote Apps () 
"Various apps are available" is now a hyperlink
Eugen Rochko 6b81d10030 Add digest e-mails
Eugen Rochko 175a9b9caa Fix - Style OAuth authorized applications page 
Add ability to search accounts by display name
Eugen Rochko 63886bdc59 Fix - Display TOTP secret next to QR code
Eugen Rochko d2619e0b53 Site title is now a setting
shel 2d6f603c2b Add link to other instances text 
Text for link to other instances
Eugen Rochko 347a153b3d Add API modifiers to limit returned toots from public/hashtag timelines 
to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen
Eugen Rochko c2fbd144cf Add "open in web" link to detailed public status pages
Eugen Rochko 23b997ae55 Split 2FA login into two prompts
Eugen Rochko f4bc9620a9 Update settings to re-use admin layout, one big navigation tree, improve settings forms
Eugen Rochko ba192f12e3 Added optional two-factor authentication
Eugen Rochko 999cde94a6 Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text 
Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations
Eugen Rochko e9737c2235 Fix tests, add applications to eager loading/cache for statuses, fix 
application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from  until it's consistent with non-animated version
Effy Elden e45fed58cb Add a textual 'Back to Mastodon' link in footer of settings pages
Eugen Rochko c01dd089ff Adding about/more page with extended information that can be set up by an admin
Eugen Rochko 75f80bef10 Persist UI settings, add missing localizations for German
Jessica Stokes bb033c1d37
"Reblog" -> "boost" in more places 
A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI
Eugen Rochko 8f47f6a7ec Adding remote follow button
Eugen Rochko d7dc84439c Add ability to use remote follow function on other sites
Eugen Rochko eca6110fc4 Add preferences for follow request notification e-mails
Eugen Rochko 2146ac91a0 Follow requests send e-mail notifications, but are excluded from notifications API 
Better initial state for unlisted/nsfw toggles
Eugen Rochko 3689c119f0 Replacing follow requests in the settings area with in-UI column
Eugen Rochko b302b9202b Add page for authorizing/rejecting follow requests
Eugen Rochko 3c841c7306 Adjust wording
Eugen Rochko 05b13c38b5 Re-enable Webfinger for locked accounts but don't handle "follow" events 
coming in via Salmon.

Currently no way to prevent remote follows, but they will only receive public
and unlisted posts
Eugen Rochko b891a81008 Follow call on locked account creates follow request instead 
Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts
Eugen Rochko e09d3a2c66 Fix - use window.location hack to let people login from sandboxed iOS homescreen
Eugen 6b67b55cee Merge pull request from victorhck/master 
added two missings spanish  translations
Eugen Rochko 5ae1b39ec9 Adjusting public display of statuses to look similar to logged-in UI, 
fix  with rich OEmbed display via iframe, fix  by hiding sensitive
content behind a spoiler on public pages
victorhck f5c8d64b6d added to missings spanish translations
Eugen Rochko 0c491ea928 Fix translations
Vladyslav 2c6c912076 Fix some translation errors.
Vladyslav d85c566960 Final steps for Ukrainian translation
Eugen a910cdd54d Merge pull request from stamak/uk.yml 
Add Ukrainian localization file uk.yml
Stanislav Makar 0e18bbe3e2 Add Ukrainian localization file uk.yml 
Closes:
Eugen Rochko b362de2232 Adding configurable e-mail blacklist
Stanislav Makar ea91286aaa Add Ukrainian localization file doorkeeper.uk.yml 
Closes:
Andrea Faulds 1c1102008f Fix line endings for Portuguese locale
Eugen Rochko 1d0321fc45 Fix pt translations, improve pre-cache queries, removing will_paginate 
from accounts/tags because it's a terribly inefficient way to paginate
large sets of data
unsmell 66e55d60e1 Create pt localisation files in /config/locales/
Eugen Rochko 14bd46946d Per-status control for unlisted mode, also federation for unlisted mode 
Fix , fix
Eugen Rochko 356d3874eb Normalize localizations, add stub for admin/accounts
Eugen 26287b6e7d Merge pull request from kodacs/master 
Hungarian translation for Mastodon.
kodacs 7bd559158b fixing yamls for
kodacs 6586408c69 fix
nicolas 959e4b8198 Merge branch 'master' into french-translation
nicolas 9bb885805c Update simple_form.fr.yml
Eugen Rochko 1ff0d5aea6 Normalized locale files
Eugen 1c9e21a507 Merge pull request from nclm/french-translation 
French localisation update
Eugen Rochko 71401659b8 Fix - Options to block notifications from people you don't follow/who don't follow you
kodacs eb3a12bba6 Server side HU translation + Toot fix.
nicolas d0122045f4 Update simple_form.fr.yml
nicolas 4cc6684881 Update fr.yml
nicolas 1e95fbb10b Update doorkeeper.fr.yml 
e
nicolas 94f96a6e85 Update doorkeeper.fr.yml
Eugen Rochko 4a422650bb Fix broken locales
nicolas 82cb34916a Update fr.yml
nicolas ba4c03de71 Update simple_form.fr.yml 
silenced mode + edits
nicolas 89dab7c534 Merging code updates (Unlisted Mode)
Eugen Rochko 1788164352 Local accounts can control "silenced" attribute which removes them from public timeline
nicolas 46d9076e99 Importing doorkeeper.fr.yml 
From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml
nicolas 12e9f789ab Importing devise.fr.yml 
From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013
nicolas a3afea7b9d First version for simple_form.fr.yml
nicolas fc87243c39 First version for fr.yml
nicolas 05823c325c Create devise.fr.yml
nicolas 753115ff57 Create doorkeeper.fr.yml
nicolas 8504110d45 Create simple_form.fr.yml
nicolas e9980a9b8b Create fr.yml
Victorhck c12125e6b5 improvements in text made by Ekaitz
Victorhck 0b48973733 fix typos, and suggestions made by Ekaitz
Eugen 93e47c7135 Fix wrong language declaration
Eugen 5cda7f6bbb Fix wrong language declaration
victorhck a6ed09441c finished spanish translation config files
Eugen Rochko c7a1b78536 Activating Spanish i18n
Victorhck 367b05d733 Spanish translation for devise.es.yml
Victorhck a05fe70c24 finished spanish translation for es.yml
victorhck 084668c170 started sp translations config locales
Eugen Rochko 85d1b74ac3 Adding german localization
Eugen Rochko 2c766bd4b4 Add user locale setting
Eugen Rochko 546c4718e7 Localizations for most server-side strings
Eugen Rochko 3ce6ac0ce2 Adding some localizations
Eugen Rochko a9e40a3d80 Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting 
to the API
Waldir Pimenta 4f654eb822 use consistent capitalization for subject lines
Yann Vaillant 038a407b9e
Update default devise wording to include reference to Mastodon 
Fix
Eugen Rochko 3441361568 Adding simple_form, adding profile settings, header image
Eugen Rochko ab6696e855 Adding doorkeeper, adding a REST API 
POST /api/statuses                  Params: status (text contents), in_reply_to_id (optional)
GET  /api/statuses/:id
POST /api/statuses/:id/reblog

GET  /api/accounts/:id
GET  /api/accounts/:id/following
GET  /api/accounts/:id/followers
POST /api/accounts/:id/follow
POST /api/accounts/:id/unfollow

POST /api/follows                  Params: uri (e.g. user@domain)

OAuth authentication is currently disabled, but the API can be used with HTTP Auth.
Eugen Rochko 7e93da3f8d Removing grape and adding devise
Eugen Rochko 9c4856bdb1 Initial commit