Yusuke Abe
f3ae46a512
Add filename extension to paperclip ( #1718 )
2017-04-13 21:52:56 +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
James Moore
31f72c39a6
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
Alyssa Ross
bd0152fb39
terms: remove redundant words ( #1578 )
...
"at least X" and "X or older" have identical meanings.
Using both together feels a little jarring.
2017-04-13 19:50:19 +02:00
R Tucker
376f6ce6a6
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
2017-04-13 19:37:04 +02:00
Eugen
5c414c98e2
Fix #1220 , fix #1671 - Hook up comment box to the Redux comment value ( #1699 )
...
Fix username styling regression introduced in #1063
Fix report screen background regression introduced in #1415
2017-04-13 19:36:41 +02:00
Eugen
5f9cd9b246
Fix #1609 , fix #1628 - Revert #1397 ( #1700 )
...
When transmitting data in a HTML-encoded element like <content type="html" />,
relying on newlines being preserved is not wise, since HTML by itself
does not care for newlines - it cares for <p> and <br>
Additional fix: reset NSFW toggle after sending toot
2017-04-13 19:23:36 +02:00
Eugen
553dc8dbb5
Apply i18n-tasks normalize to locales ( #1696 )
2017-04-13 19:18:32 +02:00
INAGAKI Hiroshi
8c3b5c99e6
translation: Fix comment out issue in en.jsx ( #1698 )
2017-04-13 17:11:18 +02:00
Koala Yeung
698406f076
Fix minor jslint issue ( #1697 )
...
* Undefined propType in react component `ColumnSettings`.
Add proper PropTypes definition.
2017-04-13 17:10:48 +02:00
Eugen Rochko
314e3dba6c
Merge branch 'blackle-videolightbox'
2017-04-13 17:01:52 +02:00
Eugen Rochko
a148a3900e
Add overlay style to buttons, continue video after expanding it
2017-04-13 17:01:09 +02:00
Eugen Rochko
0744eb8838
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
2017-04-13 16:14:11 +02:00
Lukas Burk
be7f1b7ecb
Ignore postgres/redis folder from docker-compose ( #1645 )
2017-04-13 16:04:20 +02:00
Rachel H
a6515aeea8
Convert emoji shortnames when sending status ( #1666 )
2017-04-13 16:03:45 +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
Isabelle Knott
5c3705f4f7
Fix issue where 'sensitive content click to show' item takes up whole screen on public view ( #1692 )
2017-04-13 16:00:56 +02:00
Matt Jankowski
49c3000d62
Organize coverage dirs ( #1695 )
...
* Add `Presenters` group to SimpleCov configuration
* Move validators to app/validators, add to simplecov config
2017-04-13 16:00:31 +02:00
Isabelle Knott
79cefa3739
Do not show media attachment as og:image if it was marked as NSFW ( #1693 )
2017-04-13 15:59:43 +02:00
Matt Jankowski
38c0a6fee2
Fix language export variables ( #1689 )
...
* Fix naming of JS locale constants
* Improve the translation instructions re: const names
2017-04-13 15:59:12 +02:00
Matt Jankowski
3beb0c0bef
Fix csv export coverage in export spec ( #1691 )
2017-04-13 15:29:30 +02:00
blackle
924a6d7cd8
Allow video to be expanded into lightbox
2017-04-13 09:09:45 -04:00
YOSHIOKA Eiichiro
c8af1e96a5
[l10n] ja: update missing Japanese translations ( #1687 )
2017-04-13 14:39:14 +02:00
Musee U
a3019ede5a
[l10n] ja: update missing Japanese translations ( #1684 )
2017-04-13 13:40:58 +02:00
Koala Yeung
79763fa14c
Exclude javascript locale file from dup check ( #1677 )
...
* Exclude javascript locale files form Code Climate's duplication
engine. It is silly to have duplication check with locale files.
They are supposed to look similar.
* Prevent unnecessary blocking for translation updates (like #1661 )
2017-04-13 13:40:25 +02:00
Matteo Aquila
17913dd648
Added Italian language (it) ( #1679 )
2017-04-13 13:39:00 +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
Hugo Gameiro
990bbacb93
fix Portuguese translation ( #1661 )
...
* update portuguese translation
added the missing fields and improved the translation
* pt translations fix
* improve last translation commit
* fix damn quotes
2017-04-13 13:25:34 +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
Daijiro Wachi
16204ba91f
Use input type number for Two-factor code ( #1683 )
2017-04-13 13:13:17 +02:00
Matt Jankowski
d8789124ae
Clean up well-known routes/controllers ( #1649 )
...
* Add request spec for host meta route returning xml
* Add routing spec for xrd routes
* Update well-known routes
* Move webfinger and host-meta actions to their own controllers
2017-04-13 13:09:07 +02:00
Matt Jankowski
26ea2f70bd
Admin accounts controller cleanup ( #1664 )
...
* Remove unused account_params method in admin/accounts controller
* Introduce AccountFilter to find accounts
* Use AccountFilter in admin/accounts controller
* Use more restful routes admin silence and suspension area
* Add admin/silences and admin/suspensions controllers
2017-04-13 13:04:23 +02:00
Matt Jankowski
0a6cfca260
Settings export refactor ( #1646 )
...
* Refactor Export to take an account and know about the export types
* Use Export instance in settings/exports#show
2017-04-13 13:02:02 +02:00
Koala Yeung
94ff16be71
Update javascript English translation files and some defaultValue ( #1676 )
...
* Reorder javascript English locale file
* Reorder translation string in order of the locale key.
* Add javascript English locale missing language keys
* Search all javascript language keys by command:
`grep -REho '<FormattedMessage .*\/>' ./app/assets/javascripts/.`
* Add all the missing language keys and their values to `en.jsx`.
* Add javascript English locale missing language keys (2)
* Find all `defineMessages` calls with this command:
`grep -Rl 'defineMessages({.*' ./app/assets/javascripts/.`
* Open all these files. Find the language key (`id`) in these
statements.
* Add all the missing language keys and their values to `en.jsx`.
* Remove javascript English locale obsoleted language keys
* Find all language keys that no longer exists in the source code
and remove them. The removed keys include:
* "compose_form.private"
* "compose_form.unlisted"
* "getting_started.about_addressing"
* "getting_started.about_shortcuts"
* "notification.mention"
* "search.account"
* "search.hashtag"
* "tabs_bar.mentions"
* "tabs_bar.public"
* Javascript English locale file add note
* Add notes to contributors about the English translation files.
Hope that will make translation process smoother.
* Update javascript locale defaultValue in code
* Update the defaultValue in code according to the relevant
translation in English locale file.
2017-04-13 12:57:41 +02:00
Isabelle Knott
68e1307371
Clear spoiler when replying to toot that doesn't also have a spoiler ( #1662 )
2017-04-13 03:17:34 +02:00
Matt Jankowski
bcf45f1783
Remove pending specs for methods that dont exist ( #1658 )
...
* Remote spec for non-existent entry_classes helper method
This method no longer exists, and is handled by a local variable in a partial
instead.
* Remove spec for non-existent Account#ping! method
2017-04-13 02:51:13 +02:00
tom
168265c708
Smoother scrolling on older iOS devices ( #1654 )
...
This may address the scrolling issues mentioned here: https://github.com/tootsuite/mastodon/issues/1622
2017-04-13 02:50:56 +02:00
Eugen
4df3f306fe
Fix tests issue introduced in #1607 ( #1639 )
2017-04-13 02:17:40 +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
Isabelle Knott
36ba70310a
Use shift+click instead of alt+click to bypass boost dialog ( #1638 )
2017-04-13 02:15:45 +02:00
Eugen
389c300c1f
Fix visuals introduced in #1463 ( #1634 )
2017-04-12 20:54:49 +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
Isabelle Knott
8df158aa6f
Fix missing compose box when viewport width is exactly 1024px ( #1632 )
2017-04-12 20:40:03 +02:00
Knut Erik
3689d4aa7b
Added norwegian version of terms of service and privacy policy ( #1625 )
2017-04-12 20:28:56 +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
