]>
cat aescling's git repositories - mastodon.git/log
Shouko Yu [Sat, 15 Apr 2017 00:49:43 +0000 (08:49 +0800)]
Add translations for zh-TW (Taiwan) (#1794)
Koala Yeung [Sat, 15 Apr 2017 00:48:30 +0000 (08:48 +0800)]
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
Fjoerfoks [Sat, 15 Apr 2017 00:45:46 +0000 (02:45 +0200)]
Update nl.yml (#1764)
Some rewording, typos and switching to infinitve
Fjoerfoks [Sat, 15 Apr 2017 00:44:33 +0000 (02:44 +0200)]
Update nl.jxs (#1766)
Some rewording and switching to infinitive localization.
Olivier Humbert [Sat, 15 Apr 2017 00:44:10 +0000 (02:44 +0200)]
Update devise.fr.yml (#1792)
* Update devise.fr.yml
Consistencies across the French translation
* Update doorkeeper.fr.yml
Ratmir Karabut [Sat, 15 Apr 2017 00:43:51 +0000 (03:43 +0300)]
Update Russian translation (#1733)
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
Matt Jankowski [Sat, 15 Apr 2017 00:37:20 +0000 (20:37 -0400)]
Use site title on tags#show page (#1802)
Ben Roberts [Sat, 15 Apr 2017 00:37:00 +0000 (20:37 -0400)]
add basic microformats tests (#1803)
as suggested, moving to view tests rather than a controller test
replaces https://github.com/tootsuite/mastodon/pull/1786 which i will
close momentary
Thor Harald Johansen [Sat, 15 Apr 2017 00:33:37 +0000 (02:33 +0200)]
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.
Joachim Viide [Sat, 15 Apr 2017 00:32:42 +0000 (03:32 +0300)]
Send initial state in a <script type="application/json"> tag (#1806)
Darío Hereñú [Sat, 15 Apr 2017 00:31:16 +0000 (21:31 -0300)]
Mispelling & minor fixes (#1814)
Matt Jankowski [Sat, 15 Apr 2017 00:30:55 +0000 (20:30 -0400)]
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.
Alex Dunn [Sat, 15 Apr 2017 00:29:32 +0000 (17:29 -0700)]
[css] reduce spacing between text elements on about pages (#1510)
rysiekpl [Sat, 15 Apr 2017 00:22:46 +0000 (02:22 +0200)]
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
Les Orchard [Sat, 15 Apr 2017 00:21:13 +0000 (20:21 -0400)]
Add REDIS_DB env variable to configure Redis database (#1366)
ThibG [Sat, 15 Apr 2017 00:15:46 +0000 (02:15 +0200)]
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.
Pierre Ozoux [Sat, 15 Apr 2017 00:07:59 +0000 (01:07 +0100)]
Use image too in docker-compose (#1109)
* Use image too in docker-compose
It is possible with version 2 of compose to use both `build` and `image`
* Update docker-compose.yml
Valentin Lorentz [Sat, 15 Apr 2017 00:07:21 +0000 (02:07 +0200)]
Custom Paperclip path. (#778)
* Custom Paperclip path.
* Document PAPERCLIP_ROOT.
* Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).
Alex Dunn [Sat, 15 Apr 2017 00:05:41 +0000 (17:05 -0700)]
update Node to 6.x LTS (#1228)
The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.
Patrick Figel [Fri, 14 Apr 2017 23:23:49 +0000 (01:23 +0200)]
Add list of muted user to UI and Getting Started (#1799)
Add the same UI that already exists for blocked users for muted
ones and add it to the "Getting Started" menu.
Chad Pytel [Fri, 14 Apr 2017 23:21:02 +0000 (19:21 -0400)]
Introduce capybara and first feature spec (#1801)
This commit introduces Capybara and the first feature spec.
I focused on coverage for log in for the first feature spec because that would
have prevented
624a9a7136159d460228a0c2f5df18a9ead3b7f2 causing #1236.
Matt Jankowski [Fri, 14 Apr 2017 23:12:39 +0000 (19:12 -0400)]
Improve i18n chooser (#1804)
* Add locale spec with failing locale plus region check
* Use a more accurate locale when supplied by browser headers
Previously we were using a matching option which would use the first locale
available which matched the locale portion, even if a region was specified.
This changes to first try to find an exact match, and then fall back to the
region, and then fall back to the default.
* Clean up default_locale method
Kazuhiro NISHIYAMA [Fri, 14 Apr 2017 17:10:38 +0000 (02:10 +0900)]
Remove current directory from PATH (#1779)
Kazuhiro NISHIYAMA [Fri, 14 Apr 2017 17:10:12 +0000 (02:10 +0900)]
Add missing Japanese translations (#1785)
Takayuki KUSANO [Fri, 14 Apr 2017 17:09:52 +0000 (02:09 +0900)]
Fix Japanese translation for remote_follow (#1771)
Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.
Luc Didry [Fri, 14 Apr 2017 11:22:56 +0000 (13:22 +0200)]
Add title attribute to URLs in statuses (#1755)
Since URLs in statuses are truncated, it would be pleasant to see the
full URL when hovering the URL (like on twitter, yes).
Matt Jankowski [Fri, 14 Apr 2017 11:00:03 +0000 (07:00 -0400)]
Fix invalid byte sequence issue in nl.jsx (#1751)
Effy Elden [Fri, 14 Apr 2017 10:50:00 +0000 (20:50 +1000)]
Change usage of gsub to delete, as per Code Climate/Rubocop recommendation (#1753)
西小倉宏信 [Fri, 14 Apr 2017 10:43:29 +0000 (19:43 +0900)]
Remove .keep in models (#1748)
Bryce Chidester [Fri, 14 Apr 2017 09:15:03 +0000 (02:15 -0700)]
Include pkg-config as a gem dependency. (#1717)
The pkg-config gem was necessary in order for nokogiri to find the system
libraries when building on OpenBSD.
Closes #1637
Signed-off-by: Bryce Chidester <bryce@cobryce.com>
JP DeVries [Fri, 14 Apr 2017 09:12:59 +0000 (11:12 +0200)]
Use landmark regions on columns (#1732)
Closes mastodon#1720
Matt Jankowski [Fri, 14 Apr 2017 09:10:28 +0000 (05:10 -0400)]
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
maxypy [Fri, 14 Apr 2017 09:09:20 +0000 (11:09 +0200)]
Implementing Subresource Integrity (#1729)
* Add sprockets-rails to Gemfile
* Add sprockets-rails to Gemfile.lock
* Update show.html.haml
* Update index.html.haml
* Update admin.html.haml
* Update auth.html.haml
* Update embedded.html.haml
* Update public.html.haml
Ian Kelling [Fri, 14 Apr 2017 09:04:19 +0000 (01:04 -0800)]
Fix getting started commands out of order (#1737)
In current order, docker-compose build results in
ERROR: Couldn't find env file: /a/hopt/mastodon/.env.production
Effy Elden [Fri, 14 Apr 2017 09:02:25 +0000 (19:02 +1000)]
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)
Eugen Rochko [Thu, 13 Apr 2017 20:26:54 +0000 (22:26 +0200)]
Merge branch 'matteoaquila-master'
Eugen Rochko [Thu, 13 Apr 2017 20:26:32 +0000 (22:26 +0200)]
Fix italian translation
Eugen Rochko [Thu, 13 Apr 2017 20:25:07 +0000 (22:25 +0200)]
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
Eugen [Thu, 13 Apr 2017 20:21:34 +0000 (22:21 +0200)]
Fix drag & drop overlay not appearing on firefox (#1721)
Eugen [Thu, 13 Apr 2017 20:21:20 +0000 (22:21 +0200)]
Make browserify respect changes in node_modules for asset compilation (#1722)
Matteo Aquila [Thu, 13 Apr 2017 20:09:47 +0000 (22:09 +0200)]
Update devise.it.yml
Matteo Aquila [Thu, 13 Apr 2017 20:06:19 +0000 (22:06 +0200)]
Update devise.it.yml
Eugen [Thu, 13 Apr 2017 19:53:59 +0000 (21:53 +0200)]
Make boost modal off by default (#1719)
Yusuke Abe [Thu, 13 Apr 2017 19:52:56 +0000 (04:52 +0900)]
Add filename extension to paperclip (#1718)
Matt Jankowski [Thu, 13 Apr 2017 19:49:46 +0000 (15:49 -0400)]
Use english in reported by translation (#1713)
spf [Thu, 13 Apr 2017 19:49:34 +0000 (21:49 +0200)]
Fr missing strings (#1708)
* Fix missing translation for username already taken
* fr - note too long translation
Thomas Citharel [Thu, 13 Apr 2017 19:49:07 +0000 (21:49 +0200)]
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
James Moore [Thu, 13 Apr 2017 17:51:49 +0000 (10:51 -0700)]
smtp delivery type fix (#1556)
* delivery fix
# Conflicts:
# config/environments/production.rb
* added stub in .env file
* reordered and added a comment
Alyssa Ross [Thu, 13 Apr 2017 17:50:19 +0000 (18:50 +0100)]
terms: remove redundant words (#1578)
"at least X" and "X or older" have identical meanings.
Using both together feels a little jarring.
R Tucker [Thu, 13 Apr 2017 17:37:04 +0000 (13:37 -0400)]
quick typo fix in en.jsx: Rejec -> Reject (#1701)
Eugen [Thu, 13 Apr 2017 17:36:41 +0000 (19:36 +0200)]
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
Eugen [Thu, 13 Apr 2017 17:23:36 +0000 (19:23 +0200)]
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
Eugen [Thu, 13 Apr 2017 17:18:32 +0000 (19:18 +0200)]
Apply `i18n-tasks normalize` to locales (#1696)
INAGAKI Hiroshi [Thu, 13 Apr 2017 15:11:18 +0000 (00:11 +0900)]
translation: Fix comment out issue in en.jsx (#1698)
Koala Yeung [Thu, 13 Apr 2017 15:10:48 +0000 (23:10 +0800)]
Fix minor jslint issue (#1697)
* Undefined propType in react component `ColumnSettings`.
Add proper PropTypes definition.
Eugen Rochko [Thu, 13 Apr 2017 15:01:52 +0000 (17:01 +0200)]
Merge branch 'blackle-videolightbox'
Eugen Rochko [Thu, 13 Apr 2017 15:01:09 +0000 (17:01 +0200)]
Add overlay style to buttons, continue video after expanding it
Matteo Aquila [Thu, 13 Apr 2017 14:16:39 +0000 (16:16 +0200)]
Update settings_helper.rb
Eugen Rochko [Thu, 13 Apr 2017 14:14:11 +0000 (16:14 +0200)]
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
Lukas Burk [Thu, 13 Apr 2017 14:04:20 +0000 (16:04 +0200)]
Ignore postgres/redis folder from docker-compose (#1645)
Rachel H [Thu, 13 Apr 2017 14:03:45 +0000 (07:03 -0700)]
Convert emoji shortnames when sending status (#1666)
Koala Yeung [Thu, 13 Apr 2017 14:02:23 +0000 (22:02 +0800)]
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
Isabelle Knott [Thu, 13 Apr 2017 14:00:56 +0000 (10:00 -0400)]
Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692)
Matt Jankowski [Thu, 13 Apr 2017 14:00:31 +0000 (10:00 -0400)]
Organize coverage dirs (#1695)
* Add `Presenters` group to SimpleCov configuration
* Move validators to app/validators, add to simplecov config
Eugen [Thu, 13 Apr 2017 14:00:20 +0000 (16:00 +0200)]
Merge branch 'master' into master
Isabelle Knott [Thu, 13 Apr 2017 13:59:43 +0000 (09:59 -0400)]
Do not show media attachment as og:image if it was marked as NSFW (#1693)
Matt Jankowski [Thu, 13 Apr 2017 13:59:12 +0000 (09:59 -0400)]
Fix language export variables (#1689)
* Fix naming of JS locale constants
* Improve the translation instructions re: const names
Matteo Aquila [Thu, 13 Apr 2017 13:33:53 +0000 (15:33 +0200)]
Merge remote-tracking branch 'origin/master'
Matteo Aquila [Thu, 13 Apr 2017 13:33:45 +0000 (15:33 +0200)]
Update application.rb
Matteo Aquila [Thu, 13 Apr 2017 13:32:31 +0000 (15:32 +0200)]
Update settings_helper.rb
Matteo Aquila [Thu, 13 Apr 2017 13:31:38 +0000 (15:31 +0200)]
Update settings_helper.rb
Matteo Aquila [Thu, 13 Apr 2017 13:30:04 +0000 (15:30 +0200)]
Merge remote-tracking branch 'tootsuite/master'
Matt Jankowski [Thu, 13 Apr 2017 13:29:30 +0000 (09:29 -0400)]
Fix csv export coverage in export spec (#1691)
Matteo Aquila [Thu, 13 Apr 2017 13:28:30 +0000 (15:28 +0200)]
Rename simple_form.it.yml to config/locales/simple_form.it.yml
Matteo Aquila [Thu, 13 Apr 2017 13:28:15 +0000 (15:28 +0200)]
Rename devise.it.yml to config/locales/devise.it.yml
Matteo Aquila [Thu, 13 Apr 2017 13:27:56 +0000 (15:27 +0200)]
Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml
Matteo Aquila [Thu, 13 Apr 2017 13:27:37 +0000 (15:27 +0200)]
Rename it.yml to config/locales/it.yml
Matteo Aquila [Thu, 13 Apr 2017 13:23:20 +0000 (15:23 +0200)]
Merge pull request #1 from tootsuite/master
update
blackle [Thu, 13 Apr 2017 13:04:18 +0000 (09:04 -0400)]
Allow video to be expanded into lightbox
YOSHIOKA Eiichiro [Thu, 13 Apr 2017 12:39:14 +0000 (21:39 +0900)]
[l10n] ja: update missing Japanese translations (#1687)
Musee U [Thu, 13 Apr 2017 11:40:58 +0000 (04:40 -0700)]
[l10n] ja: update missing Japanese translations (#1684)
Koala Yeung [Thu, 13 Apr 2017 11:40:25 +0000 (19:40 +0800)]
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)
Matteo Aquila [Thu, 13 Apr 2017 11:39:00 +0000 (13:39 +0200)]
Added Italian language (it) (#1679)
May Kittens Devour Your Soul [Thu, 13 Apr 2017 11:38:44 +0000 (13:38 +0200)]
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
Eugen [Thu, 13 Apr 2017 11:26:16 +0000 (13:26 +0200)]
Merge branch 'master' into master
Hugo Gameiro [Thu, 13 Apr 2017 11:25:34 +0000 (12:25 +0100)]
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
新都心(Neet Shin) [Thu, 13 Apr 2017 11:23:45 +0000 (16:53 +0530)]
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
Ratmir Karabut [Thu, 13 Apr 2017 11:23:23 +0000 (14:23 +0300)]
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
Svetlozar Todorov [Thu, 13 Apr 2017 11:16:28 +0000 (14:16 +0300)]
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
Daijiro Wachi [Thu, 13 Apr 2017 11:13:17 +0000 (13:13 +0200)]
Use input type `number` for Two-factor code (#1683)
Matt Jankowski [Thu, 13 Apr 2017 11:09:07 +0000 (07:09 -0400)]
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
Matt Jankowski [Thu, 13 Apr 2017 11:04:23 +0000 (07:04 -0400)]
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
Matt Jankowski [Thu, 13 Apr 2017 11:02:02 +0000 (07:02 -0400)]
Settings export refactor (#1646)
* Refactor Export to take an account and know about the export types
* Use Export instance in settings/exports#show
Koala Yeung [Thu, 13 Apr 2017 10:57:41 +0000 (18:57 +0800)]
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.
matteoaquila [Thu, 13 Apr 2017 09:47:03 +0000 (11:47 +0200)]
Added Italian language (it)
Isabelle Knott [Thu, 13 Apr 2017 01:17:34 +0000 (21:17 -0400)]
Clear spoiler when replying to toot that doesn't also have a spoiler (#1662)
Matt Jankowski [Thu, 13 Apr 2017 00:51:13 +0000 (20:51 -0400)]
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
tom [Thu, 13 Apr 2017 00:50:56 +0000 (20:50 -0400)]
Smoother scrolling on older iOS devices (#1654)
This may address the scrolling issues mentioned here: https://github.com/tootsuite/mastodon/issues/1622
Eugen [Thu, 13 Apr 2017 00:17:40 +0000 (02:17 +0200)]
Fix tests issue introduced in #1607 (#1639)
Thor Harald Johansen [Thu, 13 Apr 2017 00:17:26 +0000 (02:17 +0200)]
Adjustments to the Norwegian translation (#1648)
* Working translation for Norwegian.
* Fixes to Norwegian translation.
* Further adjustments to Norwegian translation.
* Further adjustments to Norwegian translation.