George Hattori and Eugen
6df63465b9
Improve Japanese translation ( #1909 )
2017-04-16 13:44:57 +02:00
新都心(Neet Shin) and Eugen
f2997c9715
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
Alex Dunn and Eugen
865cb39e9b
lock capistrano to 3.8.0 ( #1890 )
2017-04-16 12:52:18 +02:00
Eugen and GitHub
5d710b1139
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
Joachim Viide and Eugen
363de2dffd
Leave out the "Expires" header from S3 uploads ( #1886 )
2017-04-16 04:01:58 +02:00
Alex Dunn and Eugen
6a1ac9b31f
capistrano: allow overriding repo_url and branch ( #1889 )
2017-04-16 04:01:27 +02:00
Ash Furrow and Eugen
0f8b7d0660
Removed Heroku in-process spawning. ( #1873 )
2017-04-15 23:02:13 +02:00
Naouak and Eugen
3d3e32befb
Check for a custom css file to help customization of instances ( #1368 )
...
* User can create a custom.scss to customize their instance without modifying gitted files.
* Add documentation for customization.
* Forgot the helper file
* Fix Style to pass codeclimate
* Requests from maintainer.
2017-04-15 22:47:48 +02:00
oliverkeeble and Eugen
28606d730a
Fix typo in simple_form.eo.yml ( #1848 )
2017-04-15 16:46:48 +02:00
Matt Jankowski and Eugen
6670e6d33f
Add password reset for users from admin accounts area ( #1841 )
2017-04-15 16:44:59 +02:00
Patrick Figel and Eugen
df4ff9a8e1
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 and Eugen
67ad84b7eb
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 and Eugen
9e620ca16c
Fix Japanese translation of ja.yml ( #1835 )
2017-04-15 13:18:08 +02:00
goofy-bz and Eugen
a3aa9381c4
Update devise.fr.yml ( #1728 )
...
Very light grammar fix to improve gender-neutral
2017-04-15 02:55:43 +02:00
Shouko Yu and Eugen
120a37a197
Add translations for zh-TW (Taiwan) ( #1794 )
2017-04-15 02:49:43 +02:00
Koala Yeung and Eugen
ec9999cdfe
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 and Eugen
e806d3c3f0
Update nl.yml ( #1764 )
...
Some rewording, typos and switching to infinitve
2017-04-15 02:45:46 +02:00
Olivier Humbert and Eugen
061922b38c
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 and Eugen
4bebeb27d3
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ñú and Eugen
9240ca6cef
Mispelling & minor fixes ( #1814 )
2017-04-15 02:31:16 +02:00
Matt Jankowski and Eugen
619817d29e
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 and Eugen
ade004b5ee
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
Les Orchard and Eugen
7609593e48
Add REDIS_DB env variable to configure Redis database ( #1366 )
2017-04-15 02:21:13 +02:00
ThibG and Eugen
a9529d3b4b
Allow running mastodon on a different domain as the one used for identifying users ( #1267 )
...
* Allow running mastodon on a different domain as the one used for identifying users
* Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing
* Compare to web_domain instead of local_domain when dealing with feeds/API
* Correctly identify mentions to local accounts
Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.
2017-04-15 02:15:46 +02:00
Valentin Lorentz and Eugen
5ab0ffc6c8
Custom Paperclip path. ( #778 )
...
* Custom Paperclip path.
* Document PAPERCLIP_ROOT.
* Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).
2017-04-15 02:07:21 +02:00
Kazuhiro NISHIYAMA and Eugen
1616cf98a1
Add missing Japanese translations ( #1785 )
2017-04-14 19:10:12 +02:00
Takayuki KUSANO and Eugen
5aae6384ff
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
Matt Jankowski and Eugen
8b74aa4217
Admin reports controller improvements ( #1714 )
...
* Simplify admin/reports controller filtering for index
* Rename parameter to resolved
* Fix issue where reports view could not access filter_link_to
* Add coverage for admin/reports controller
* DRY up resolution of related reports for target account
* Clean up admin/reports routes
* Add Report#statuses method
* DRY up current account action taken params
* Rubocop styles
2017-04-14 11:10:28 +02:00
Effy Elden and Eugen
c019b0acfd
Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. ( #1745 )
2017-04-14 11:02:25 +02:00
Eugen Rochko
c8be05a4a7
Fix italian translation
2017-04-13 22:26:32 +02:00
Eugen Rochko
41c697fd81
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
2017-04-13 22:25:07 +02:00
Eugen and GitHub
485310a43c
Make browserify respect changes in node_modules for asset compilation ( #1722 )
2017-04-13 22:21:20 +02:00
Matteo Aquila and GitHub
9aae9ae40c
Update devise.it.yml
2017-04-13 22:09:47 +02:00
Matteo Aquila and GitHub
1fb125b630
Update devise.it.yml
2017-04-13 22:06:19 +02:00
Eugen and GitHub
057567d548
Make boost modal off by default ( #1719 )
2017-04-13 21:53:59 +02:00
Yusuke Abe and Eugen
169c68a739
Add filename extension to paperclip ( #1718 )
2017-04-13 21:52:56 +02:00
Matt Jankowski and Eugen
9f182346d7
Use english in reported by translation ( #1713 )
2017-04-13 21:49:46 +02:00
spf and Eugen
a58c935c3d
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 and Eugen
c0c56db0fa
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
James Moore and Eugen
d9dc0fe84e
smtp delivery type fix ( #1556 )
...
* delivery fix
# Conflicts:
# config/environments/production.rb
* added stub in .env file
* reordered and added a comment
2017-04-13 19:51:49 +02:00
Eugen and GitHub
9e5c1c487e
Apply i18n-tasks normalize to locales ( #1696 )
2017-04-13 19:18:32 +02:00
Koala Yeung and Eugen
1206627c59
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 and GitHub
0220f3a171
Update application.rb
2017-04-13 15:33:45 +02:00
Matteo Aquila and GitHub
3f42ad7d1a
Rename simple_form.it.yml to config/locales/simple_form.it.yml
2017-04-13 15:28:30 +02:00
Matteo Aquila and GitHub
f7c466c8d8
Rename devise.it.yml to config/locales/devise.it.yml
2017-04-13 15:28:15 +02:00
Matteo Aquila and GitHub
245b9cb4ba
Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml
2017-04-13 15:27:56 +02:00
Matteo Aquila and GitHub
9275f92972
Rename it.yml to config/locales/it.yml
2017-04-13 15:27:37 +02:00
Musee U and Eugen
467d32fce3
[l10n] ja: update missing Japanese translations ( #1684 )
2017-04-13 13:40:58 +02:00
May Kittens Devour Your Soul and Eugen
90d0018fd5
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) and Eugen
0e4479bb3a
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
George HattoriandEugen
新都心(Neet Shin)andEugen
Alex DunnandEugen
Joachim ViideandEugen
Ash FurrowandEugen
NaouakandEugen
oliverkeebleandEugen
Matt JankowskiandEugen
Patrick FigelandEugen
luigiandEugen
SetuuandEugen
goofy-bzandEugen
Shouko YuandEugen
Koala YeungandEugen
FjoerfoksandEugen
Olivier HumbertandEugen
Thor Harald JohansenandEugen
Darío HereñúandEugen
rysiekplandEugen
Les OrchardandEugen
ThibGandEugen
Valentin LorentzandEugen
Kazuhiro NISHIYAMAandEugen
Takayuki KUSANOandEugen
Effy EldenandEugen
Matteo AquilaandGitHub
Yusuke AbeandEugen
spfandEugen
Thomas CitharelandEugen
James MooreandEugen
Musee UandEugen
May Kittens Devour Your SoulandEugen