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
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
2017-04-13 19:36:41 +02:00
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
2017-04-13 19:23:36 +02:00
553dc8dbb5
Apply `i18n-tasks normalize` to locales ( #1696 )
2017-04-13 19:18:32 +02:00
8c3b5c99e6
translation: Fix comment out issue in en.jsx ( #1698 )
2017-04-13 17:11:18 +02:00
698406f076
Fix minor jslint issue ( #1697 )
...
* Undefined propType in react component `ColumnSettings`.
Add proper PropTypes definition.
2017-04-13 17:10:48 +02:00
314e3dba6c
Merge branch 'blackle-videolightbox'
2017-04-13 17:01:52 +02:00
a148a3900e
Add overlay style to buttons, continue video after expanding it
2017-04-13 17:01:09 +02:00
f9a42acd0d
Update settings_helper.rb
2017-04-13 16:16:39 +02:00
0744eb8838
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
2017-04-13 16:14:11 +02:00
be7f1b7ecb
Ignore postgres/redis folder from docker-compose ( #1645 )
2017-04-13 16:04:20 +02:00
a6515aeea8
Convert emoji shortnames when sending status ( #1666 )
2017-04-13 16:03:45 +02:00
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
2017-04-13 16:02:23 +02:00
5c3705f4f7
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
49c3000d62
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
e02486edab
Merge branch 'master' into master
2017-04-13 16:00:20 +02:00
79cefa3739
Do not show media attachment as og:image if it was marked as NSFW ( #1693 )
2017-04-13 15:59:43 +02:00
38c0a6fee2
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
f756a96056
Merge remote-tracking branch 'origin/master'
2017-04-13 15:33:53 +02:00
b57c52c7e7
Update application.rb
2017-04-13 15:33:45 +02:00
e891a97787
Update settings_helper.rb
2017-04-13 15:32:31 +02:00
3ace439512
Update settings_helper.rb
2017-04-13 15:31:38 +02:00
20b56f3511
Merge remote-tracking branch 'tootsuite/master'
2017-04-13 15:30:04 +02:00
3beb0c0bef
Fix csv export coverage in export spec ( #1691 )
2017-04-13 15:29:30 +02:00
9410b7cbc6
Rename simple_form.it.yml to config/locales/simple_form.it.yml
2017-04-13 15:28:30 +02:00
3281686b5c
Rename devise.it.yml to config/locales/devise.it.yml
2017-04-13 15:28:15 +02:00
125657117b
Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml
2017-04-13 15:27:56 +02:00
c1e2949b86
Rename it.yml to config/locales/it.yml
2017-04-13 15:27:37 +02:00
4e4817ec8e
Merge pull request #1 from tootsuite/master
...
update
2017-04-13 15:23:20 +02:00
924a6d7cd8
Allow video to be expanded into lightbox
2017-04-13 09:09:45 -04:00
c8af1e96a5
[l10n] ja: update missing Japanese translations ( #1687 )
2017-04-13 14:39:14 +02:00
JP DeVries