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
8 years ago
5da8581563
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
2a06e6e979
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
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.
8 years ago
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 .
8 years ago
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
8 years ago
f09eb4b677
Remove current directory from PATH ( #1779 )
8 years ago
692199a07a
Add missing Japanese translations ( #1785 )
8 years ago
b7561baee4
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
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).
8 years ago
5fb7ab9f84
Fix invalid byte sequence issue in nl.jsx ( #1751 )
8 years ago
089c5a76ba
Change usage of gsub to delete, as per Code Climate/Rubocop recommendation ( #1753 )
8 years ago
d91b462aa1
Remove .keep in models ( #1748 )
8 years ago
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>
8 years ago
0dc20d827a
Use landmark regions on columns ( #1732 )
...
Closes mastodon#1720
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
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 )
8 years ago
cac251ace9
Merge branch 'matteoaquila-master'
8 years ago
e9261cd3b8
Fix italian translation
8 years ago
10b8829c02
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
8 years ago
b942187299
Fix drag & drop overlay not appearing on firefox ( #1721 )
8 years ago
12df378904
Make browserify respect changes in node_modules for asset compilation ( #1722 )
8 years ago
73a299b51b
Update devise.it.yml
8 years ago
9d35b8de47
Update devise.it.yml
8 years ago
0659f879d9
Make boost modal off by default ( #1719 )
8 years ago
f3ae46a512
Add filename extension to paperclip ( #1718 )
8 years ago
03fe4e36a6
Use english in reported by translation ( #1713 )
8 years ago
cbe58bb4e8
Fr missing strings ( #1708 )
...
* Fix missing translation for username already taken
* fr - note too long translation
8 years ago
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
8 years ago
31f72c39a6
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
bd0152fb39
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
376f6ce6a6
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
8 years ago
5c414c98e2
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
5f9cd9b246
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
8 years ago
553dc8dbb5
Apply `i18n-tasks normalize` to locales ( #1696 )
8 years ago
8c3b5c99e6
translation: Fix comment out issue in en.jsx ( #1698 )
8 years ago
698406f076
Fix minor jslint issue ( #1697 )
...
* Undefined propType in react component `ColumnSettings`.
Add proper PropTypes definition.
8 years ago
314e3dba6c
Merge branch 'blackle-videolightbox'
8 years ago
a148a3900e
Add overlay style to buttons, continue video after expanding it
8 years ago
f9a42acd0d
Update settings_helper.rb
8 years ago
0744eb8838
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
8 years ago
be7f1b7ecb
Ignore postgres/redis folder from docker-compose ( #1645 )
8 years ago
a6515aeea8
Convert emoji shortnames when sending status ( #1666 )
8 years ago
ff826c68eb
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
8 years ago
5c3705f4f7
Fix issue where 'sensitive content click to show' item takes up whole screen on public view ( #1692 )
8 years ago
49c3000d62
Organize coverage dirs ( #1695 )
...
* Add `Presenters` group to SimpleCov configuration
* Move validators to app/validators, add to simplecov config
8 years ago
e02486edab
Merge branch 'master' into master
8 years ago
79cefa3739
Do not show media attachment as og:image if it was marked as NSFW ( #1693 )
8 years ago
Pierre Ozoux
Valentin Lorentz
Alex Dunn
Patrick Figel
Chad Pytel
Matt Jankowski
Kazuhiro NISHIYAMA
Takayuki KUSANO
Luc Didry
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