3c90f2bd4c
Add translations for zh-TW (Taiwan) ( #1794 )
2017-04-15 02:49:43 +02:00
3264c6d658
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
ade4168f91
Update nl.yml ( #1764 )
...
Some rewording, typos and switching to infinitve
2017-04-15 02:45:46 +02:00
afc2847470
Update nl.jxs ( #1766 )
...
Some rewording and switching to infinitive localization.
2017-04-15 02:44:33 +02:00
44b0f14f5f
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
329b86ab58
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
2017-04-15 02:43:51 +02:00
c784b1f95a
Use site title on tags#show page ( #1802 )
2017-04-15 02:37:20 +02:00
90aa720d2e
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
2017-04-15 02:37:00 +02:00
66da14e13b
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
cbf0e1b1c8
Send initial state in a <script type="application/json"> tag ( #1806 )
2017-04-15 02:32:42 +02:00
dfb94fed43
Mispelling & minor fixes ( #1814 )
2017-04-15 02:31:16 +02:00
3e08188dca
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
91bbd2851f
[css] reduce spacing between text elements on about pages ( #1510 )
2017-04-15 02:29:32 +02:00
16004237f2
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
492e8ec00e
Add REDIS_DB env variable to configure Redis database ( #1366 )
2017-04-15 02:21:13 +02:00
c45c67c2ac
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
823f220f2b
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
2017-04-15 02:07:59 +02:00
5da8581563
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
2a06e6e979
update Node to 6.x LTS ( #1228 )
...
The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1 ) on 1 April.
2017-04-15 02:05:41 +02:00
30e815a78e
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.
2017-04-15 01:23:49 +02:00
29f169f7f0
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 a1c63cb01d#1236 .
2017-04-15 01:21:02 +02:00
20170cb4f3
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
2017-04-15 01:12:39 +02:00
f09eb4b677
Remove current directory from PATH ( #1779 )
2017-04-14 19:10:38 +02:00
692199a07a
Add missing Japanese translations ( #1785 )
2017-04-14 19:10:12 +02:00
b7561baee4
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
95932656af
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).
2017-04-14 13:22:56 +02:00
5fb7ab9f84
Fix invalid byte sequence issue in nl.jsx ( #1751 )
2017-04-14 13:00:03 +02:00
089c5a76ba
Change usage of gsub to delete, as per Code Climate/Rubocop recommendation ( #1753 )
2017-04-14 12:50:00 +02:00
d91b462aa1
Remove .keep in models ( #1748 )
2017-04-14 12:43:29 +02:00
c4fd19a841
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>
2017-04-14 11:15:03 +02:00
0dc20d827a
Use landmark regions on columns ( #1732 )
...
Closes mastodon#1720
2017-04-14 11:12:59 +02:00
22f1d9099a
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
c06f09dfe2
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
2017-04-14 11:09:20 +02:00
b0aec511ab
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
2017-04-14 11:04:19 +02:00
98aa3c9ccb
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
cac251ace9
Merge branch 'matteoaquila-master'
2017-04-13 22:26:54 +02:00
e9261cd3b8
Fix italian translation
2017-04-13 22:26:32 +02:00
10b8829c02
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
2017-04-13 22:25:07 +02:00
b942187299
Fix drag & drop overlay not appearing on firefox ( #1721 )
2017-04-13 22:21:34 +02:00
12df378904
Make browserify respect changes in node_modules for asset compilation ( #1722 )
2017-04-13 22:21:20 +02:00
73a299b51b
Update devise.it.yml
2017-04-13 22:09:47 +02:00
9d35b8de47
Update devise.it.yml
2017-04-13 22:06:19 +02:00
0659f879d9
Make boost modal off by default ( #1719 )
2017-04-13 21:53:59 +02:00
f3ae46a512
Add filename extension to paperclip ( #1718 )
2017-04-13 21:52:56 +02:00
03fe4e36a6
Use english in reported by translation ( #1713 )
2017-04-13 21:49:46 +02:00
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
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
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
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
376f6ce6a6
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
2017-04-13 19:37:04 +02:00
Shouko Yu