1616cf98a1
Add missing Japanese translations ( #1785 )
2017-04-14 19:10:12 +02:00
5aae6384ff
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
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).
2017-04-14 13:22:56 +02:00
26a892dd90
Fix invalid byte sequence issue in nl.jsx ( #1751 )
2017-04-14 13:00:03 +02:00
8321884eef
Change usage of gsub to delete, as per Code Climate/Rubocop recommendation ( #1753 )
2017-04-14 12:50:00 +02:00
290e8ef854
Remove .keep in models ( #1748 )
2017-04-14 12:43:29 +02:00
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>
2017-04-14 11:15:03 +02:00
1467515d3d
Use landmark regions on columns ( #1732 )
...
Closes mastodon#1720
2017-04-14 11:12:59 +02:00
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
2017-04-14 11:10:28 +02:00
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
2017-04-14 11:09:20 +02:00
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
2017-04-14 11:04:19 +02:00
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 )
2017-04-14 11:02:25 +02:00
7447e7a2ea
Merge branch 'matteoaquila-master'
2017-04-13 22:26:54 +02:00
c8be05a4a7
Fix italian translation
2017-04-13 22:26:32 +02:00
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
485310a43c
Make browserify respect changes in node_modules for asset compilation ( #1722 )
2017-04-13 22:21:20 +02:00
9aae9ae40c
Update devise.it.yml
2017-04-13 22:09:47 +02:00
1fb125b630
Update devise.it.yml
2017-04-13 22:06:19 +02:00
057567d548
Make boost modal off by default ( #1719 )
2017-04-13 21:53:59 +02:00
169c68a739
Add filename extension to paperclip ( #1718 )
2017-04-13 21:52:56 +02:00
9f182346d7
Use english in reported by translation ( #1713 )
2017-04-13 21:49:46 +02:00
a58c935c3d
Fr missing strings ( #1708 )
...
* Fix missing translation for username already taken
* fr - note too long translation
2017-04-13 21:49: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
d9dc0fe84e
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
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
9e5c1c487e
Apply `i18n-tasks normalize` to locales ( #1696 )
2017-04-13 19:18:32 +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
6327f69cab
Merge branch 'blackle-videolightbox'
2017-04-13 17:01:52 +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
d7a4e8739a
Ignore postgres/redis folder from docker-compose ( #1645 )
2017-04-13 16:04:20 +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
d2c20936f3
Merge remote-tracking branch 'origin/master'
2017-04-13 15:33:53 +02:00
0220f3a171
Update application.rb
2017-04-13 15:33:45 +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
aec2458d81
Merge remote-tracking branch 'tootsuite/master'
2017-04-13 15:30:04 +02:00
4fe5e04ea4
Fix csv export coverage in export spec ( #1691 )
2017-04-13 15:29:30 +02:00
Kazuhiro NISHIYAMA
Takayuki KUSANO
Luc Didry
Matt Jankowski
Effy Elden
西小倉宏信
Bryce Chidester
JP DeVries
maxypy
Ian Kelling
Eugen Rochko
Matteo Aquila
Yusuke Abe
spf
Thomas Citharel
James Moore
Alyssa Ross
R Tucker
INAGAKI Hiroshi
Koala Yeung
Lukas Burk
Rachel H
Isabelle Knott