41c697fd81
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
2017-04-13 22:25:07 +02:00
c5afe573da
Fix drag & drop overlay not appearing on firefox ( #1721 )
2017-04-13 22:21:34 +02:00
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
55b56e3f95
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
c4d39b1b3d
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
2017-04-13 19:37:04 +02:00
ac54da9394
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
043862f411
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
5619099564
translation: Fix comment out issue in en.jsx ( #1698 )
2017-04-13 17:11:18 +02:00
ce80d0b0a9
Fix minor jslint issue ( #1697 )
...
* Undefined propType in react component `ColumnSettings`.
Add proper PropTypes definition.
2017-04-13 17:10:48 +02:00
5f8155482a
Add overlay style to buttons, continue video after expanding it
2017-04-13 17:01:09 +02:00
efcf9448da
Update settings_helper.rb
2017-04-13 16:16:39 +02:00
e70b84b1dc
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
2017-04-13 16:14:11 +02:00
9362700137
Convert emoji shortnames when sending status ( #1666 )
2017-04-13 16:03:45 +02:00
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
edefcfcf42
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
b330d1f000
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
1a5a54eb4b
Merge branch 'master' into master
2017-04-13 16:00:20 +02:00
447b8bc44e
Do not show media attachment as og:image if it was marked as NSFW ( #1693 )
2017-04-13 15:59:43 +02:00
093879c177
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
905a4faa1c
Update settings_helper.rb
2017-04-13 15:32:31 +02:00
5355b7d930
Update settings_helper.rb
2017-04-13 15:31:38 +02:00
00cc3066a2
Allow video to be expanded into lightbox
2017-04-13 09:09:45 -04:00
a57d30c680
[l10n] ja: update missing Japanese translations ( #1687 )
2017-04-13 14:39:14 +02:00
467d32fce3
[l10n] ja: update missing Japanese translations ( #1684 )
2017-04-13 13:40:58 +02:00
282bb55c3c
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
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
af7e880df5
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
aa7bf1515c
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
4f781b17cc
Use input type `number` for Two-factor code ( #1683 )
2017-04-13 13:13:17 +02:00
137100dcf3
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
3a9eb81a80
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
0e39cc6a35
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
faefd8ec8f
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
96715d9af5
Clear spoiler when replying to toot that doesn't also have a spoiler ( #1662 )
2017-04-13 03:17:34 +02:00
af96e71883
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
ccaf3dbc5a
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
1ea662963f
Use shift+click instead of alt+click to bypass boost dialog ( #1638 )
2017-04-13 02:15:45 +02:00
bd834add56
Fix visuals introduced in #1463 ( #1634 )
2017-04-12 20:54:49 +02:00
9966bd27c2
[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
b0ab632531
Fix missing compose box when viewport width is exactly 1024px ( #1632 )
2017-04-12 20:40:03 +02:00
e1264bbd92
Added norwegian version of terms of service and privacy policy ( #1625 )
2017-04-12 20:28:56 +02:00
38e24a699b
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
9b698bf448
Update fr.jsx ( #1551 )
...
fixing to minor typos
2017-04-12 20:11:09 +02:00
0254ee9795
significant improvement in microformats markup ( #1063 )
...
* significant improvement in microformats markup
This is a huge improvement and I believe will close #965 .
Had these microformats reviewed by others in the community to help
ensure they are at least correct, if not complete.
I did not want to change the structure of the page, and so there it does
not fully mark up the entire ancestry chain, or reply chain, only the
direct decendants and direct ancestors are correctly associated, but
this is likely fine as the most important bit is to have access to the
urls for those toots which are now correctly fetchable.
* improve code climate
* trying to pass code climate tests
* code climate
* fix p-summary for content warning posts
* fix error introduced when merging via github
2017-04-12 20:04:33 +02:00
dab9b5bd3a
locale-fr: fix typo ( #1603 )
...
In this case, the adjective applies to a feminine noun.
2017-04-12 19:54:16 +02:00
c4baa9fb6b
vector (svg) logo with correct inner shape and colors ( #1362 )
...
* vector (svg) logo with correct inner shape and colors
* minimized svg logo
2017-04-12 19:10:52 +02:00
c2a31b8032
Fix target blank on "open_in_web" link ( #1612 )
...
When you render the "embed" view in an iframe, this link bugs when clicked, due to missing target blank.
2017-04-12 13:09:58 -04:00
c44a700252
Quick best practice cleanup of views/helpers ( #1546 )
...
* Remove trailing whitespace
* Use query methods instead of explicit .blank? checks
2017-04-12 18:24:18 +02:00
aa90798386
Webfinger resource to extract username from resource string ( #1607 )
...
* Add WebfingerResource class to extract usernames
* Use WebfingerResource in xrd#webfinger
2017-04-12 18:22:38 +02:00
0930ce5560
Focus textarea when text is inserted ( #1320 )
...
Place space after uploaded filenames
2017-04-12 18:21:07 +02:00
Eugen Rochko
Thomas Citharel
Alyssa Ross
R Tucker
INAGAKI Hiroshi
Koala Yeung
Matteo Aquila
Rachel H
Isabelle Knott
Matt Jankowski
YOSHIOKA Eiichiro
Musee U
Hugo Gameiro
新都心(Neet Shin)
Ratmir Karabut
Svetlozar Todorov
Daijiro Wachi
tom
Thor Harald Johansen
lindwurm
Knut Erik
pinfort
goofy-bz
Ben Roberts
karlyeurl
Julien Deswaef
David Libeau