Koala Yeung
ec9999cdfe
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
8 years ago
Fjoerfoks
e806d3c3f0
Update nl.yml ( #1764 )
...
Some rewording, typos and switching to infinitve
8 years ago
Fjoerfoks
4ba6acd518
Update nl.jxs ( #1766 )
...
Some rewording and switching to infinitive localization.
8 years ago
Olivier Humbert
061922b38c
Update devise.fr.yml ( #1792 )
...
* Update devise.fr.yml
Consistencies across the French translation
* Update doorkeeper.fr.yml
8 years ago
Ratmir Karabut
5d8d827436
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
8 years ago
Matt Jankowski
cde1f37d93
Use site title on tags#show page ( #1802 )
8 years ago
Ben Roberts
89707ad0ac
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
8 years ago
Thor Harald Johansen
4bebeb27d3
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.
8 years ago
Joachim Viide
ef879a8839
Send initial state in a <script type="application/json"> tag ( #1806 )
8 years ago
Darío Hereñú
9240ca6cef
Mispelling & minor fixes ( #1814 )
8 years ago
Matt Jankowski
619817d29e
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.
8 years ago
Alex Dunn
0655f16cc1
[css] reduce spacing between text elements on about pages ( #1510 )
8 years ago
rysiekpl
ade004b5ee
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
8 years ago
Les Orchard
7609593e48
Add REDIS_DB env variable to configure Redis database ( #1366 )
8 years ago
ThibG
a9529d3b4b
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.
8 years ago
Pierre Ozoux
0d2910478a
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
8 years ago
Valentin Lorentz
5ab0ffc6c8
Custom Paperclip path. ( #778 )
...
* Custom Paperclip path.
* Document PAPERCLIP_ROOT.
* Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).
8 years ago
Alex Dunn
8482f67caf
update Node to 6.x LTS ( #1228 )
...
The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1 ) on 1 April.
8 years ago
Patrick Figel
fe8dd58bc1
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.
8 years ago
Chad Pytel
92cd207c50
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 624a9a7136
causing #1236 .
8 years ago
Matt Jankowski
f5cd138323
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
8 years ago
Kazuhiro NISHIYAMA
66ea015a01
Remove current directory from PATH ( #1779 )
8 years ago
Kazuhiro NISHIYAMA
1616cf98a1
Add missing Japanese translations ( #1785 )
8 years ago
Takayuki KUSANO
5aae6384ff
Fix Japanese translation for remote_follow ( #1771 )
...
Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.
8 years ago
Luc Didry
fa89deb4eb
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).
8 years ago
Matt Jankowski
26a892dd90
Fix invalid byte sequence issue in nl.jsx ( #1751 )
8 years ago
Effy Elden
8321884eef
Change usage of gsub to delete, as per Code Climate/Rubocop recommendation ( #1753 )
8 years ago
西小倉宏信
290e8ef854
Remove .keep in models ( #1748 )
8 years ago
Bryce Chidester
067eb220c6
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>
8 years ago
JP DeVries
1467515d3d
Use landmark regions on columns ( #1732 )
...
Closes mastodon#1720
8 years ago
Matt Jankowski
8b74aa4217
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
8 years ago
maxypy
a6807201d2
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
8 years ago
Ian Kelling
4445ebdad2
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
8 years ago
Effy Elden
c019b0acfd
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 )
8 years ago
Eugen Rochko
7447e7a2ea
Merge branch 'matteoaquila-master'
8 years ago
Eugen Rochko
c8be05a4a7
Fix italian translation
8 years ago
Eugen Rochko
41c697fd81
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
8 years ago
Eugen
c5afe573da
Fix drag & drop overlay not appearing on firefox ( #1721 )
8 years ago
Eugen
485310a43c
Make browserify respect changes in node_modules for asset compilation ( #1722 )
8 years ago
Matteo Aquila
9aae9ae40c
Update devise.it.yml
8 years ago
Matteo Aquila
1fb125b630
Update devise.it.yml
8 years ago
Eugen
057567d548
Make boost modal off by default ( #1719 )
8 years ago
Yusuke Abe
169c68a739
Add filename extension to paperclip ( #1718 )
8 years ago
Matt Jankowski
9f182346d7
Use english in reported by translation ( #1713 )
8 years ago
spf
a58c935c3d
Fr missing strings ( #1708 )
...
* Fix missing translation for username already taken
* fr - note too long translation
8 years ago
Thomas Citharel
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
8 years ago
James Moore
d9dc0fe84e
smtp delivery type fix ( #1556 )
...
* delivery fix
# Conflicts:
# config/environments/production.rb
* added stub in .env file
* reordered and added a comment
8 years ago
Alyssa Ross
55b56e3f95
terms: remove redundant words ( #1578 )
...
"at least X" and "X or older" have identical meanings.
Using both together feels a little jarring.
8 years ago
R Tucker
c4d39b1b3d
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
8 years ago
Eugen
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
8 years ago