me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8864 commits 2 branches 0 tags 429 MiB
Commit graph

1174 commits

Author SHA1 Message Date
spf
7abb3b1b2e French i18n-tasks missing fr (#2018) 2017-04-17 20:27:11 +02:00
IWAI, Masaharu
4aa75b310a Update Japanese translation (#1993) 
Sync text for toot form
 2017-04-17 15:15:24 +02:00
Patrick Figel
2fb1f07888 Add gif auto-play/pause preference 
This introduces a new per-user preference called
"Auto-play animated GIFs", which is enabled by default. When a
user disables this setting, gifs in toots become click-to-play.

Previews of animated gifs were changed to display the video play
button so that users can distinguish them from regular images.

This setting also affects account avatars in the detailed account
view, which was changed to use the same hover-to-play mechanism
that is used for animated avatars in timelines.

Fixes #1652
 2017-04-17 12:14:03 +02:00
Hugo Gameiro
70d72e33cb Add Brazilian Portuguese and fix European Portuguese (#1966) 
* update portuguese translation

added the missing fields and improved the translation

* pt translations fix

* improve last translation commit

* fix damn quotes

* add pt_br to index.jsx

* add pt-BR to import index.jsx

* add pt-BR to mastodon.jsx

* add pt-BR to settings_helper.rb

* add pt-BR to application.rb

* order alphabetically pt.jsx

* create pt-BR.jsx

* Create devise.pt-BR.yml

* language improvements to devise.pt.yml

* created doorkeeper.pt-BR.yml

* fixes to doorkeeper.pt.yml

* create pt-BR.yml

* improvements to pt.yml

* Create simple_form.pt-BR.yml

* Improvements to simple_form.pt.yml

* improvements to pt.yml
 2017-04-17 10:38:27 +02:00
Toshiyuki Takahashi
0e062ce3a7 Improved Japanese translation in ja.yml (#1981) 2017-04-17 10:32:41 +02:00
Ingo Blechschmidt
a86f63aada Fix tiny typo (#1956) 2017-04-17 10:29:49 +02:00
Yamagishi Kazutoshi
aed7a3f11e Fix minor typo in Japanese translation "保村" -> "保存" (#1968) 2017-04-17 04:22:14 +02:00
Toshiyuki Takahashi
6acfe86c0f Improved Japanese translation in devise.ja.yml (#1969) 2017-04-17 04:22:09 +02:00
Matt Jankowski
ff42193176 Remove unused registrations: key from PT yml locale (#1952) 2017-04-16 20:53:16 +02:00
Matt Jankowski
fff8d92577 I18n health warnings (#1949) 
* Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement

* Use implicit controller/action path for i18n in admin/domain_blocks

* Add DomainBlock#accounts has_many

* Avoid i18n health warning for `en` locale by using symbol scope with :count

* Remove unused i18n key: plaintext_secret_html

* Remove unused i18n key two_factor_auth.warning

* Remove final will_paginate i18n keys

* Remove unused key two_factor_auth.recovery_codes

* Remove unused key: admin.reports.comment.none

* Remove unused reports. i18n namespace (moved to admin.reports)

* Ignore keys from locales which override activemodel and activerecord errors

* Revert "Remove unused key: admin.reports.comment.none"

This reverts commit 350ef2685fadc069e619bb6d1066190de195d942.

* Update i18n key reference to match moved location

* Add missing `en` keys to i18n

* Tell i18n-tasks to ignore missing attributes that dont need overwriting

* Add i18n-tasks unused to travis
 2017-04-16 19:37:01 +02:00
oliverkeeble
2adf65292c Fix translation of 'reblogged' in eo.yml (#1942) 2017-04-16 18:11:07 +02:00
Eduardo Elias
a6beb78146 Add missing keys to PT locale (#1941) 2017-04-16 18:04:19 +02:00
Kazuhiro NISHIYAMA
5f019cf675 Add missing Japanese translations (#1923) 
And `i18n-tasks add-missing -l ja` changes some quotes.
 2017-04-16 16:07:45 +02:00
Eduardo Elias
53632f945b Improve PT locale on simple_form (#1917) 
* Improve PT locale on simple_form

* Add missing keys to PT locale
 2017-04-16 14:56:04 +02:00
Matt Jankowski
798e2b328a Fix yaml issue in ja locale (#1916) 
* Fix yaml parse issue in ja.yml locale

* Fix issue in locales/ja.jsx
 2017-04-16 14:55:04 +02:00
George Hattori
0418a1bd2d Improve Japanese translation (#1909) 2017-04-16 13:44:57 +02:00
新都心(Neet Shin)
8f7fed77ed Update Japanese Translate (#1903) 
* [Update ja.jsx] Add Muted, Video_error and sorted

* [Update ja] Added Recovery code's translation

* [Update ja] Added Two-fact/Recovery's translation

* Update ja.jsx
 2017-04-16 13:42:16 +02:00
Eugen
ba6b4c6e62 Make file attachment on MediaAttachment optional (#1865) 
Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true
Clean up old media files when creating a new domain block with reject_media set to true
Return remote_url in media attachments API if local file is not present
Undo domain block action in admin UI
Ability to enable reject_media from admin UI
 2017-04-16 12:51:30 +02:00
oliverkeeble
7889295f71 Fix typo in simple_form.eo.yml (#1848) 2017-04-15 16:46:48 +02:00
Patrick Figel
15b393201e Add recovery code support for two-factor auth (#1773) 
* Add recovery code support for two-factor auth

When users enable two-factor auth, the app now generates ten
single-use recovery codes. Users are encouraged to print the codes
and store them in a safe place.

The two-factor prompt during login now accepts both OTP codes and
recovery codes.

The two-factor settings UI allows users to regenerated lost
recovery codes. Users who have set up two-factor auth prior to
this feature being added can use it to generate recovery codes
for the first time.

Fixes #563 and fixes #987

* Set OTP_SECRET in test enviroment

* add missing .html to view file names
 2017-04-15 13:26:03 +02:00
luigi
1549a9d997 Add some missing Spanish translations (#1818) 
* Add missing spanish translations on user settings

simple_form.es.yml

* Fix typo: Aute/ción. should be Autenticación
 2017-04-15 13:25:00 +02:00
Setuu
a1d00eb993 Fix Japanese translation of ja.yml (#1835) 2017-04-15 13:18:08 +02:00
goofy-bz
5e32054802 Update devise.fr.yml (#1728) 
Very light grammar fix to improve gender-neutral
 2017-04-15 02:55:43 +02:00
Shouko Yu
3c90f2bd4c Add translations for zh-TW (Taiwan) (#1794) 2017-04-15 02:49:43 +02:00
Koala Yeung
3264c6d658 Update Traditional Chinese, HK (zh-HK) translation (#1759) 
* Fix missing string in javascript locale (zh-HK)

* Change javascript locale (zh-HK)

* Fix some other strings that were still English.
* Improve `search.status_by`.
* Fix `notification.follow`. ("開始開始你")
* Changes according to user feedback.
  * "Back": "較前顯示" -> "返回"
  * "Home": "家" -> "主頁"

* Update ruby locale (zh-HK)

* Fix missing translation
* Normalize yml
* Update translation strings
 2017-04-15 02:48:30 +02:00
Fjoerfoks
ade4168f91 Update nl.yml (#1764) 
Some rewording, typos and switching to infinitve
 2017-04-15 02:45:46 +02:00
Olivier Humbert
44b0f14f5f Update devise.fr.yml (#1792) 
* Update devise.fr.yml

Consistencies across the French translation

* Update doorkeeper.fr.yml
 2017-04-15 02:44:10 +02:00
Thor Harald Johansen
66da14e13b More Norwegian translations (#1805) 
* Working translation for Norwegian.

* Fixes to Norwegian translation.

* Further adjustments to Norwegian translation.

* Further adjustments to Norwegian translation.

* Yet more improvements to the Norwegian translation.

* More Norwegian translations. Better terminology.
 2017-04-15 02:33:37 +02:00
Darío Hereñú
dfb94fed43 Mispelling & minor fixes (#1814) 2017-04-15 02:31:16 +02:00
Matt Jankowski
3e08188dca Remove unused will_paginate.page_gap key from i18n (#1815) 
This value was changed recently, and every locale which had it set was using the
same value as the default. This value is still the default in the new location.
 2017-04-15 02:30:55 +02:00
rysiekpl
16004237f2 Polish translation (needs more love though) (#807) 
* Polish translation (needs more love though)

* Polish translation bugfix

* bugfix for new colon-containing texts

* another bugfix. yaml is evil

* minor fix

* fixing issues pointed out by reviewers

* Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer

* Etyczny dizajn zbyt sarkastyczny, to będą założenia
 2017-04-15 02:22:46 +02:00
Kazuhiro NISHIYAMA
692199a07a Add missing Japanese translations (#1785) 2017-04-14 19:10:12 +02:00
Takayuki KUSANO
b7561baee4 Fix Japanese translation for remote_follow (#1771) 
Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.
 2017-04-14 19:09:52 +02:00
Eugen Rochko
e9261cd3b8 Fix italian translation 2017-04-13 22:26:32 +02:00
Eugen Rochko
10b8829c02 Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master 2017-04-13 22:25:07 +02:00
Matteo Aquila
73a299b51b Update devise.it.yml 2017-04-13 22:09:47 +02:00
Matteo Aquila
9d35b8de47 Update devise.it.yml 2017-04-13 22:06:19 +02:00
Eugen
0659f879d9 Make boost modal off by default (#1719) 2017-04-13 21:53:59 +02:00
Matt Jankowski
03fe4e36a6 Use english in reported by translation (#1713) 2017-04-13 21:49:46 +02:00
spf
cbe58bb4e8 Fr missing strings (#1708) 
* Fix missing translation for username already taken

* fr - note too long translation
 2017-04-13 21:49:34 +02:00
Thomas Citharel
6524136728 Translate admin (#1702) 
* Translate the domain_block panel

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

* Translate PubSubHubbub section

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

* translate account section and correct typos

* move reports translation & translate sidebar

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

* normalize l18n
 2017-04-13 21:49:07 +02:00
Eugen
553dc8dbb5 Apply i18n-tasks normalize to locales (#1696) 2017-04-13 19:18:32 +02:00
Koala Yeung
ff826c68eb Add Dutch translation (nl) (#1682) 
* Dutch language files for Ruby code

 * Created RoR translation ymls:
   * config/locales/devise.nl.yml
   * config/locales/doorkeeper.nl.yml
   * config/locales/nl.yml
   * config/locales/simple_form.nl.yml

 * Modified RoR config and helper
   * app/helpers/settings_helper.rb
   * config/application.rb

* Dutch language javascript locale

 * Created javascript locale files:
   * app/assets/javascripts/components/locales/index.jsx
   * app/assets/javascripts/components/locales/nl.jsx

 * Reference the newly created locale files:
   * app/assets/javascripts/components/containers/mastodon.jsx

* Fix syntax error in locale file (nl)

* Fix missing translate in js locale (nl)

* Convert all ruby Dutch locale (nl) file to utf8

Fix yml conversion issues.

* Fix duplicated key in devise.nl.yml

* Fix indentation error in doorkeeper.nl.yml
 2017-04-13 16:02:23 +02:00
Matteo Aquila
9410b7cbc6 Rename simple_form.it.yml to config/locales/simple_form.it.yml 2017-04-13 15:28:30 +02:00
Matteo Aquila
3281686b5c Rename devise.it.yml to config/locales/devise.it.yml 2017-04-13 15:28:15 +02:00
Matteo Aquila
125657117b Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml 2017-04-13 15:27:56 +02:00
Matteo Aquila
c1e2949b86 Rename it.yml to config/locales/it.yml 2017-04-13 15:27:37 +02:00
Musee U
a3019ede5a [l10n] ja: update missing Japanese translations (#1684) 2017-04-13 13:40:58 +02:00
May Kittens Devour Your Soul
81b05262f5 Adds Croatian language [Hrvatski] (#1000) 
* Create simple.form.hr.yml

* Create hr.yml

* Update hr.yml

* Update hr.yml

* Create doorkeeper.hr.yml

* Create devise.hr.yml
 2017-04-13 13:38:44 +02:00
新都心(Neet Shin)
67ed9d8f18 Update Japanese translation files (#1640) 
* [l10n] ja: Improve Japanese Translations

* ja: about: Fix highlighting
* ja: Update Translations
* ja: Translate admin settings

Signed-off-by: lindwurm <lindwurm.q@gmail.com>

* Update ja.jsx

* Update doorkeeper.ja.yml

* Update ja.yml

* Update ja.jsx

* Update ja.jsx
 2017-04-13 13:23:45 +02:00
Ratmir Karabut
5a7354ef00 Update Russian translation (#1570) 
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error
 2017-04-13 13:23:23 +02:00
Svetlozar Todorov
651b89199a Fix #624 - Add localization for Bulgarian (#645) 
* Add translation files and declarations for Bulgarian

* Add a bunch of translations to bg.jsx

* Add rest of translations to bg.jsx

* Add devise translations

* Fix devise translations
 2017-04-13 13:16:28 +02:00
Thor Harald Johansen
d898b8d958 Adjustments to the Norwegian translation (#1648) 
* Working translation for Norwegian.

* Fixes to Norwegian translation.

* Further adjustments to Norwegian translation.

* Further adjustments to Norwegian translation.
 2017-04-13 02:17:26 +02:00
lindwurm
caddfb64aa [l10n] ja: Improve Japanese Translations (#1631) 
* ja: about: Fix highlighting
* ja: Update Translations
* ja: Translate admin settings

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
 2017-04-12 20:41:50 +02:00
pinfort
6ffc89a2e7 fix Japanese translation (#1623) 
* 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

* fix translations
翻訳の誤りの修正と改善

* freeの訳修正

* いいねをお気に入りに統一

* Revert "いいねをお気に入りに統一"

This reverts commit 568d5cccfa0b6620ccb6c9db8346c52c0396d99f.
間違ってtranslateブランチにコミットしたため取り消し

* Revert "freeの訳修正"

This reverts commit 565658a60583ff7e1e7a63ef597bf3ac6118e1bf.

* revertでミスったので戻す

* Revert "ミスったので戻す"

This reverts commit 00be7a748a6a2ae85a62be847172424278c52ec7, reversing
changes made to b4e1e06503c77e079cb2569a53ab4d6fcfcfd116.

* freeの訳修正

* いいねをお気に入りに統一

* 一回戻す

* 戻しきれてなかった

* 再度変更

* 戻す

* 再度変更

* 再度変更

* Update doorkeeper.ja.yml

Fixed a lot of unnatural translations

* Update ja.yml

資格情報 isn't easy to understanding. so fixed to ログイン情報.

* Update ja.yml

fixed some unnatural translations

* Update simple_form.ja.yml

Fixed wrong translate 「アカウント」 to 「アイコン画像」

* Update simple_form.ja.yml

* Update doorkeeper.ja.yml

* Revert "多くの不自然な翻訳を解消しました。"

* Update ja.jsx

fixed typo

* 文字化け修正
 2017-04-12 20:19:38 +02:00
Manato Kameya
39dd2aaae7 Fix incorrect notation in simple_form.ja.yml (#1620) 2017-04-12 20:19:27 +02:00
CgX
2d2b114d9b Update fr.yml (#1600) 
Mistake on %{link} variable
 2017-04-12 19:56:09 +02:00
Matt Jankowski
bf7306636e Allow import/export of mutes list (#1541) 
* Allow export of mutes list

* Allow importing of mutes list

* Refactor to use Settings::Exports::BaseController and DRY up exports code
 2017-04-12 18:20:44 +02:00
Carlos A. Escobar
7fd5075806 Added missing Spanish translations strings (#1292) 
* Added missing Spanish translations strings

* fix bad translation

* resolve conflict with tootsuite/master

* agreements from spanish community

* Add some missing strings
 2017-04-12 17:16:40 +02:00
Thomas Citharel
cd2324b07b Make Reporting admin section translatable (#1549) 
* 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>
 2017-04-12 17:11:49 +02:00
Thor Harald Johansen
b2c1df5c20 Working translation for Norwegian. (#1611) 2017-04-12 17:07:51 +02:00
Koala Yeung
a3bfac26fb Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544) 
* 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.
 2017-04-12 08:50:50 +02:00
Thomas Citharel
c471e5c694 Update french locale (#1525) 
* 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>
 2017-04-11 21:54:40 +02:00
pinfort
601d93bfc3 Add Japanese translation (#1552) 
* 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
 2017-04-11 21:52:09 +02:00
jukper
58a75b4bed Revised finnish translation (#1537) 2017-04-11 21:41:40 +02:00
Jantso Porali
b1b9d0fee7 Update language files (#1516) 
* 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 #1515

See issue #1515

* update translation for issue #1515

see issue #1515
 2017-04-11 21:41:29 +02:00
Eugen Rochko
b440b2a9ee Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master 2017-04-11 20:43:56 +02:00
blackle
e7d77f4e13 Allow user to disable the boost confirm dialog in preferences 2017-04-11 10:10:16 -04:00
Matt Jankowski
fcec9fcd99 Pagination improvements (#1445) 
* 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
 2017-04-11 01:11:41 +02:00
Ratmir Karabut
ac50bab158 Add Russian translation (ru) (#1023) 
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency
 2017-04-10 12:52:06 +02:00
Olivier Humbert
d473a092e3 French translation update (#1271) 
* 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)
 2017-04-09 14:55:58 +02:00
spf
3bfac1374d French typo (#1257) 
* French typo

* Datetime french translation
 2017-04-09 14:54:47 +02:00
Eugen
b532134503 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) 
* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled

* Clean up
 2017-04-08 22:20:08 +02:00
Thomas Citharel
a9863c1708 Update french translation (#1148) 
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>
 2017-04-08 13:11:16 +02:00
Sebastian Hübner
201019e2c3 Fixed two translation errors (#1139) 
Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx
 2017-04-08 13:03:11 +02:00
Korbinian
58fcc553f3 Update simple_form.de.yml (#971) 2017-04-08 13:02:07 +02:00
Jantso Porali
3c063ae050 Updated about page in Finnish language (#1170) 
* 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
 2017-04-08 12:17:34 +02:00
Olivier Humbert
10a0055a2a French translation update (#1188) 
* Update fr.yml

one typo fix

* Update simple_form.fr.yml

one translation consistency
 2017-04-08 12:16:49 +02:00
Shel R
3b9a56d4b3 Merge branch 'master' into master 2017-04-07 22:21:21 -04:00
Chad Pytel
1a82d2bde6 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.
 2017-04-07 14:23:18 -04:00
Jantso Porali
fb0ce9d38d Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
André Lewin
783de713cd Merge branch 'master' into master 2017-04-05 20:28:58 +02:00
Jantso Porali
5c414eeb45 updated blocking translation 2017-04-05 14:53:35 +02:00
Jantso Porali
16d14e854b updated two-way auth and preferences translation 2017-04-05 14:49:29 +02:00
Jantso Porali
d49612327a updated translation for about page 2017-04-05 14:47:42 +02:00
JantsoP
c0295924bc Merge branch 'master' into master 2017-04-05 10:07:17 +02:00
JantsoP
c33a8ce307 updated reblog to boost translation 
Since it is that :D
 2017-04-05 09:57:25 +02:00
JantsoP
7ea7713997 udpdated display_name translation 2017-04-05 09:52:31 +02:00
JantsoP
b97a8236fb updated reblog translation 2017-04-05 09:51:35 +02:00
Eugen Rochko
d9f1e07c6c Fix spec 2017-04-05 03:31:26 +02:00
Eugen
05de364fbc Merge pull request #863 from Eychics/master 
Add closed_registrations message on French language
 2017-04-05 03:11:13 +02:00
Eugen
c571ed77d7 Merge pull request #818 from JantsoP/master 
Updated Finnish Translation
 2017-04-05 03:09:20 +02:00
Eugen
cc82f3adff Merge pull request #866 from kklleemm/patch-1 
Fix typos on french translations
 2017-04-05 03:06:41 +02:00
Eugen
45c3772ddb Merge pull request #792 from chapeaumeinfreund/master 
Updated and fixed german orthography
 2017-04-05 03:05:50 +02:00
Eugen
27b758f328 Merge pull request #790 from chapeaumeinfreund/patch-1 
Updated and fixed german orthography
 2017-04-05 03:05:31 +02:00
Eugen
2f7da4167f Merge pull request #805 from nevillepark/master 
Changed "reblogs" to "boosts"
 2017-04-05 03:00:57 +02:00
Clément D
ba8744d0a7 Fix typos on french translations 2017-04-04 19:09:54 +02:00
Thibaut (Eychics)
6afd3a6eab Add closed_registrations message on French language 2017-04-04 18:58:19 +02:00
Eugen Rochko
353a30810c New admin setting: open/close registrations, with custom message, from the admin UI 2017-04-04 15:28:12 +02:00
JantsoP
0c0e1c2519 Merge branch 'master' into master 2017-04-04 08:41:46 +02:00
JantsoP
0c0acb22e6 updated translation 2017-04-04 08:29:53 +02:00
Neville Park
7b297cc6d2 Changed "reblogs" to "boosts" 2017-04-03 17:45:36 -04:00
axolotl
d6d192c914 added Esperanto (eo) 2017-04-03 20:22:50 +02:00
Eugen Rochko
c23ef9a706 Fix norwegian translation being malformed 2017-04-03 19:50:55 +02:00
Korbinian
ce9bb73e96 Updated and fixed orthography 2017-04-03 19:10:48 +02:00
Korbinian
b8324b3aed Updated and fixed german orthography 2017-04-03 19:01:17 +02:00
Eugen Rochko
6ebe31e716 Make default admin UI page reports. Add admin UI for creating a domain block 2017-04-03 18:55:06 +02:00
Christopher Kolstad
c1f52eaff1 Add Norwegian locale 2017-04-03 16:32:03 +02:00
JantsoP
e74a4efa20 another typo. fuck me 2017-04-03 14:56:13 +02:00
JantsoP
54db5aa06c fixed an sneaky peaky tpy 2017-04-03 14:54:53 +02:00
JantsoP
bed61b7cc4 add finnish translation 
add finnish translation
 2017-04-03 14:43:07 +02:00
JantsoP
aa77d63da9 add finnish translation 
add finnish translation
 2017-04-03 14:20:50 +02:00
JantsoP
35ad63910d Merge branch 'master' into master 2017-04-03 13:50:57 +02:00
JantsoP
cbff9a2e15 finnish translation 
finnish translation
 2017-04-03 13:25:46 +02:00
JantsoP
5045c23636 updated final translation 
updated final translation
 2017-04-03 13:07:09 +02:00
JantsoP
7606beb4dd Create new translation file 
Still in progress. Should be done shortly
 2017-04-03 12:42:09 +02:00
Angristan
38bf31d425 Improve french translation 2017-04-03 11:04:00 +02:00
Valentin Lorentz
7d5921dd5c Improve French translation 
Fix typos and typography. Make vocabulary and grammar more uniform.
 2017-04-03 03:16:37 +02:00
Damien Erambert
066b904205 Fix typo in simple_form.fr.yml 2017-04-02 14:04:06 -07:00
Damien Erambert
b7554089cb Improve translation of data import in fr.yml 2017-04-02 14:03:57 -07:00
Damien Erambert
6162adec16 Better translation for revoked token in doorkeeper.fr.yml 2017-04-02 14:03:41 -07:00
Damien Erambert
53e0834cf4 Fix date format in doorkeeper.fr.yml 2017-04-02 14:03:31 -07:00
Damien Erambert
180edd4baa Add locale in devise.fr.yml 2017-04-01 23:38:40 -07:00
Damien Erambert
9ba1d01fe4 Add french translation for "scopes" in doorkeeper.fr.yml 2017-04-01 23:35:11 -07:00
Damien Erambert
cfc96a619c Fix small typo in doorkeeper.fr.yml 2017-04-01 23:34:37 -07:00
Damien Erambert
ef1c4de714 Complete localization of in simple_form.fr.yml 2017-04-01 23:26:26 -07:00
Damien Erambert
b256d43b14 Improve french locales on the backend (WIP) 2017-04-01 23:15:49 -07:00
Eugen Rochko
be9accbacc Fix #700 - hide spoilers on static pages 2017-03-31 13:54:36 +02:00
Eugen Rochko
244da78105 Import feature for following/blocking lists (addresses #62, #177, #201, #454) 2017-03-30 19:42:33 +02:00
Eugen Rochko
74fb333eb7 Fix up some localizations 2017-03-26 13:22:38 +02:00
leopku
58c9d97d07 🌐 add simplified chinese language 2017-03-26 14:13:18 +08:00
leopku
e4205b09d1 🚧 chinese translation WIP 2017-03-24 19:03:14 +08:00
leopku
017e3b7da8 🌐 add chinese language file 2017-03-24 18:53:41 +08:00
Eugen Rochko
8785e271bf Improved landing page 2017-03-21 19:18:37 +01:00
Eugen Rochko
47c74efa85 Add landing strip 2017-03-20 03:36:29 +01:00
Eugen Rochko
b339e488fe Export follow/block lists as CSV 2017-03-19 20:29:41 +01:00
shel
5c7b222769 Promote Apps (#670) 
"Various apps are available" is now a hyperlink
 2017-03-17 16:16:39 +01:00
Eugen Rochko
0cb5a2a0a7 Add digest e-mails 2017-03-04 00:00:48 +01:00
Eugen Rochko
a741049a77 Fix #104 - Style OAuth authorized applications page 
Add ability to search accounts by display name
 2017-02-27 00:15:00 +01:00
Eugen Rochko
a83dc927d8 Fix #587 - Display TOTP secret next to QR code 2017-02-13 20:56:03 +01:00
Eugen Rochko
32580cc661 Site title is now a setting 2017-02-10 22:37:11 +01:00
shel
3f854bd75c Add link to other instances text 
Text for link to other instances
 2017-02-10 13:08:47 -05:00
Eugen Rochko
b1f2683ecc 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
 2017-02-06 23:16:20 +01:00
Eugen Rochko
38b7551359 Add "open in web" link to detailed public status pages 2017-01-30 23:01:37 +01:00
Eugen Rochko
c58da52e9f Split 2FA login into two prompts 2017-01-28 20:43:38 +01:00
Eugen Rochko
557de8e24c Update settings to re-use admin layout, one big navigation tree, improve settings forms 2017-01-28 03:56:10 +01:00
Eugen Rochko
9b8670c939 Added optional two-factor authentication 2017-01-27 20:35:16 +01:00
Eugen Rochko
959e064186 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
 2017-01-25 01:29:16 +01:00
Eugen Rochko
5d88ef90c9 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 #464 until it's consistent with non-animated version
 2017-01-15 14:01:33 +01:00
Effy Elden
21c888fefd Add a textual 'Back to Mastodon' link in footer of settings pages 2017-01-15 11:03:35 +11:00
Eugen Rochko
f2667139ad Adding about/more page with extended information that can be set up by an admin 2017-01-13 20:16:38 +01:00
Eugen Rochko
4293e132d1 Persist UI settings, add missing localizations for German 2017-01-09 14:00:55 +01:00
Jessica Stokes
b115602bb7 "Reblog" -> "boost" in more places 
A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI
 2017-01-04 18:00:50 -08:00
Eugen Rochko
df2f14d2dd Adding remote follow button 2017-01-01 19:54:34 +01:00
Eugen Rochko
57f6f80838 Add ability to use remote follow function on other sites 2016-12-29 16:54:54 +01:00
Eugen Rochko
fde1917a54 Add preferences for follow request notification e-mails 2016-12-26 22:04:16 +01:00
Eugen Rochko
cef68b9b1c Follow requests send e-mail notifications, but are excluded from notifications API 
Better initial state for unlisted/nsfw toggles
 2016-12-26 21:52:03 +01:00
Eugen Rochko
6a54df90c8 Replacing follow requests in the settings area with in-UI column 2016-12-26 21:33:51 +01:00
Eugen Rochko
302051ffcb Add page for authorizing/rejecting follow requests 2016-12-23 00:04:52 +01:00
Eugen Rochko
6931b9bf32 Adjust wording 2016-12-22 23:24:46 +01:00
Eugen Rochko
77cd58545d 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
 2016-12-22 23:17:57 +01:00
Eugen Rochko
238233440f 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
 2016-12-22 23:03:57 +01:00
Eugen Rochko
090e3a245d Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen 2016-12-21 00:13:13 +01:00
Eugen
4bfaca1470 Merge pull request #356 from victorhck/master 
added two missings spanish  translations
 2016-12-18 21:22:46 +01:00
Eugen Rochko
346aae50b0 Adjusting public display of statuses to look similar to logged-in UI, 
fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive
content behind a spoiler on public pages
 2016-12-18 19:47:11 +01:00
victorhck
b254629157 added to missings spanish translations 2016-12-14 18:43:00 +01:00
Eugen Rochko
7fb69d5153 Fix translations 2016-12-09 11:52:09 +01:00
Vladyslav
7a08597e6e Fix some translation errors. 2016-12-07 21:13:57 +02:00
Vladyslav
8266ff2d69 Final steps for Ukrainian translation 2016-12-07 20:39:22 +02:00
Eugen
83cb3eecd2 Merge pull request #338 from stamak/uk.yml 
Add Ukrainian localization file uk.yml
 2016-12-05 12:30:07 +01:00
Stanislav Makar
01623e2650 Add Ukrainian localization file uk.yml 
Closes: #337
 2016-12-05 07:40:45 +02:00
Eugen Rochko
e5e702a976 Adding configurable e-mail blacklist 2016-12-04 19:07:02 +01:00
Stanislav Makar
5c6faa8cc4 Add Ukrainian localization file doorkeeper.uk.yml 
Closes: #334
 2016-12-03 09:46:26 +02:00
Andrea Faulds
3966353feb Fix line endings for Portuguese locale 2016-12-01 17:27:47 +00:00
Eugen Rochko
8260628fc8 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
 2016-12-01 16:26:25 +01:00
unsmell
1028ee341b Create pt localisation files in /config/locales/ 2016-11-30 23:04:53 -01:00
Eugen Rochko
8d4ef0b6c3 Per-status control for unlisted mode, also federation for unlisted mode 
Fix #233, fix #268
 2016-11-30 21:34:59 +01:00
Eugen Rochko
329b2a326d Normalize localizations, add stub for admin/accounts 2016-11-30 15:32:26 +01:00
Eugen
313ebb4962 Merge pull request #275 from kodacs/master 
Hungarian translation for Mastodon.
 2016-11-26 18:33:48 +01:00
kodacs
2774adc6fe fixing yamls for #275 2016-11-25 13:57:37 +01:00
kodacs
9849c564de fix #275 2016-11-25 13:35:08 +01:00
nicolas
8cd2d6a174 Merge branch 'master' into french-translation 2016-11-25 13:33:00 +01:00
nicolas
3958b6c655 Update simple_form.fr.yml 2016-11-25 13:30:52 +01:00
Eugen Rochko
9798cf624a Normalized locale files 2016-11-25 13:15:07 +01:00
Eugen
8183330361 Merge pull request #273 from nclm/french-translation 
French localisation update
 2016-11-25 13:14:30 +01:00
Eugen Rochko
ea0846645a Fix #65 - Options to block notifications from people you don't follow/who don't follow you 2016-11-25 13:13:16 +01:00
kodacs
6d952d6815 Server side HU translation + Toot fix. 2016-11-25 12:43:23 +01:00
nicolas
283623e3d4 Update simple_form.fr.yml 2016-11-25 09:25:31 +01:00
nicolas
ed8361b57a Update fr.yml 2016-11-25 09:25:29 +01:00
nicolas
cb19a97e3e Update doorkeeper.fr.yml 
e
 2016-11-23 14:47:41 +01:00
nicolas
85e53eb127 Update doorkeeper.fr.yml 2016-11-23 14:45:31 +01:00
Eugen Rochko
33ccf97c49 Fix broken locales 2016-11-22 11:34:36 +01:00
nicolas
a731b0d15a Update fr.yml 2016-11-22 10:39:15 +01:00
nicolas
9725264490 Update simple_form.fr.yml 
silenced mode + edits
 2016-11-22 10:32:43 +01:00
nicolas
1a9ad408e8 Merging code updates (Unlisted Mode) 2016-11-22 10:25:17 +01:00
Eugen Rochko
74df3ba1d7 Local accounts can control "silenced" attribute which removes them from public timeline 2016-11-21 23:06:41 +01:00
nicolas
d20ba4c34c Importing doorkeeper.fr.yml 
From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml
 2016-11-21 22:39:20 +01:00
nicolas
324fe9b102 Importing devise.fr.yml 
From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013
 2016-11-21 22:34:50 +01:00
nicolas
8532fe10d6 First version for simple_form.fr.yml 2016-11-21 21:30:13 +01:00
nicolas
a100ad0334 First version for fr.yml 2016-11-21 21:25:27 +01:00
nicolas
fd49a94259 Create devise.fr.yml 2016-11-21 20:59:41 +01:00
nicolas
cdf8b2019a Create doorkeeper.fr.yml 2016-11-21 20:59:13 +01:00
nicolas
2bf59ee5c5 Create simple_form.fr.yml 2016-11-21 20:58:43 +01:00
nicolas
d9c0211b88 Create fr.yml 2016-11-21 20:57:28 +01:00
Victorhck
29928a1082 improvements in text made by Ekaitz 2016-11-20 00:52:06 +01:00
Victorhck
6185b4167f fix typos, and suggestions made by Ekaitz 2016-11-20 00:50:45 +01:00
Eugen
132d231107 Fix wrong language declaration 2016-11-19 18:31:36 +01:00
Eugen
9d766cd6bf Fix wrong language declaration 2016-11-19 18:31:21 +01:00
victorhck
d3aa9f7961 finished spanish translation config files 2016-11-19 17:45:45 +01:00
Eugen Rochko
42fb16ec3a Activating Spanish i18n 2016-11-19 00:10:47 +01:00
Victorhck
c12e893e7e Spanish translation for devise.es.yml 2016-11-18 23:57:03 +01:00
Victorhck
84db0df531 finished spanish translation for es.yml 2016-11-18 23:04:26 +01:00
victorhck
689077f743 started sp translations config locales 2016-11-18 20:39:40 +01:00
Eugen Rochko
a82a15a38e Adding german localization 2016-11-18 15:53:46 +01:00
Eugen Rochko
b8e6ca45e5 Add user locale setting 2016-11-16 17:56:31 +01:00
Eugen Rochko
1b61e404b4 Localizations for most server-side strings 2016-11-16 00:55:33 +01:00
Eugen Rochko
0e956910c3 Adding some localizations 2016-11-15 23:02:57 +01:00
Eugen Rochko
6657414266 Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting 
to the API
 2016-10-22 19:39:44 +02:00
Waldir Pimenta
9f2df5672e use consistent capitalization for subject lines 2016-10-06 11:16:59 +01:00
Yann Vaillant
043ff2f616 Update default devise wording to include reference to Mastodon 
Fix #68
 2016-10-06 07:45:07 +02:00
Eugen Rochko
3441361568 Adding simple_form, adding profile settings, header image 2016-03-12 20:47:22 +01:00
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.
 2016-03-07 12:42:33 +01:00
Eugen Rochko
7e93da3f8d Removing grape and adding devise 2016-03-05 13:12:24 +01:00
Eugen Rochko
9c4856bdb1 Initial commit 2016-02-20 22:53:20 +01:00