about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-13Merge branch 'master' into masterEugen
2017-04-13fix Portuguese translation (#1661)Hugo Gameiro
* update portuguese translation added the missing fields and improved the translation * pt translations fix * improve last translation commit * fix damn quotes
2017-04-13Update Japanese translation files (#1640)新都心(Neet Shin)
* [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-13Update Russian translation (#1570)Ratmir Karabut
* 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-13Fix #624 - Add localization for Bulgarian (#645)Svetlozar Todorov
* 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-13Use input type `number` for Two-factor code (#1683)Daijiro Wachi
2017-04-13Clean up well-known routes/controllers (#1649)Matt Jankowski
* 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-13Admin accounts controller cleanup (#1664)Matt Jankowski
* 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-13Settings export refactor (#1646)Matt Jankowski
* Refactor Export to take an account and know about the export types * Use Export instance in settings/exports#show
2017-04-13Update javascript English translation files and some defaultValue (#1676)Koala Yeung
* 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-13Added Italian language (it)matteoaquila
2017-04-13Clear spoiler when replying to toot that doesn't also have a spoiler (#1662)Isabelle Knott
2017-04-13Remove pending specs for methods that dont exist (#1658)Matt Jankowski
* 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-13Smoother scrolling on older iOS devices (#1654)tom
This may address the scrolling issues mentioned here: https://github.com/tootsuite/mastodon/issues/1622
2017-04-13Fix tests issue introduced in #1607 (#1639)Eugen
2017-04-13Adjustments to the Norwegian translation (#1648)Thor Harald Johansen
* Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation.
2017-04-13Use shift+click instead of alt+click to bypass boost dialog (#1638)Isabelle Knott
2017-04-12Fix visuals introduced in #1463 (#1634)Eugen
2017-04-12[l10n] ja: Improve Japanese Translations (#1631)lindwurm
* ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-04-12Fix missing compose box when viewport width is exactly 1024px (#1632)Isabelle Knott
2017-04-12Added norwegian version of terms of service and privacy policy (#1625)Knut Erik
2017-04-12fix Japanese translation (#1623)pinfort
* 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-12Fix incorrect notation in simple_form.ja.yml (#1620)Manato Kameya
2017-04-12Update fr.jsx (#1551)goofy-bz
fixing to minor typos
2017-04-12significant improvement in microformats markup (#1063)Ben Roberts
* 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-12Update fr.yml (#1600)CgX
Mistake on %{link} variable
2017-04-12locale-fr: fix typo (#1603)karlyeurl
In this case, the adjective applies to a feminine noun.
2017-04-12Improve docker update instructions (#1619)Eugen
2017-04-12vector (svg) logo with correct inner shape and colors (#1362)Julien Deswaef
* vector (svg) logo with correct inner shape and colors * minimized svg logo
2017-04-12Fix target blank on "open_in_web" link (#1612)David Libeau
When you render the "embed" view in an iframe, this link bugs when clicked, due to missing target blank.
2017-04-12Request documentation (#1616)Shel R
This addition to the submission guidelines requests that contributors remember to document their code. It's not a hard fast rule just a reminder.
2017-04-12Quick best practice cleanup of views/helpers (#1546)Matt Jankowski
* Remove trailing whitespace * Use query methods instead of explicit .blank? checks
2017-04-12Webfinger resource to extract username from resource string (#1607)Matt Jankowski
* Add WebfingerResource class to extract usernames * Use WebfingerResource in xrd#webfinger
2017-04-12Focus textarea when text is inserted (#1320)Rachel H
Place space after uploaded filenames
2017-04-12Allow import/export of mutes list (#1541)Matt Jankowski
* Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code
2017-04-12Add unit tests for https://github.com/tootsuite/mastodon/pull/1574 (#1584)Henry Smith
2017-04-12Added missing Spanish translations strings (#1292)Carlos A. Escobar
* Added missing Spanish translations strings * fix bad translation * resolve conflict with tootsuite/master * agreements from spanish community * Add some missing strings
2017-04-12[web] Moving docs link to tootsuite/documentation (#1581)lindwurm
related: https://github.com/tootsuite/mastodon/commit/1236529e39a7e2534fdd34686a749b5a386c109b and https://github.com/tootsuite/mastodon/commit/fc47c1d00e507f0bee2575c91822d68b72a22bac Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-04-12Make Reporting admin section translatable (#1549)Thomas Citharel
* 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-12Working translation for Norwegian. (#1611)Thor Harald Johansen
2017-04-12Params compact deprecation warning (#1580)Matt Jankowski
* Move filter_link_to class formation to separate method in admin/accounts helper * Remove deprecated #compact method usage on strong parameters
2017-04-12Simplify the way the embed view is created (#1590)Matt Jankowski
* Add coverage for embedded status view * Refactor embed view to eliminate @external_links variable
2017-04-12Default to json type for webfinger requests (#1583)Matt Jankowski
2017-04-12Clean up stylesheet organization (#1591)Matt Jankowski
2017-04-12Silence more scope order warnings (#1604)Matt Jankowski
2017-04-12Fix issue with intermittent api/v1/notifications failure (#1606)Matt Jankowski
The spec was checking the activity_id of the activities held in notifications within the controller. Because the activities are different models, it is possible that they are created with the same database IDs, and when they are this spec fails because an activity which should not count as a match is counted as one.
2017-04-12Fix redirect link on Tuning.md (#1595)Christopher Su
2017-04-12Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544)Koala Yeung
* 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-12update Docker section of README (#1231)Eric Blade
Re-ordered the steps so it doesn't read "Do this, but first, do this other step" Added note about keeping the REDIS and DB settings as they are for Docker use Add which variables you will NEED to set to make the Mastodon work Add how to generate the secrets Add how to connect to your Mastodon Add a note to read the Production-guide
2017-04-11Change default log level in production from :debug to :info for less I/O (#1579)Eugen