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 )
7 years ago
7447e7a2ea
Merge branch 'matteoaquila-master'
7 years ago
c8be05a4a7
Fix italian translation
7 years ago
41c697fd81
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
7 years ago
c5afe573da
Fix drag & drop overlay not appearing on firefox ( #1721 )
7 years ago
485310a43c
Make browserify respect changes in node_modules for asset compilation ( #1722 )
7 years ago
9aae9ae40c
Update devise.it.yml
7 years ago
1fb125b630
Update devise.it.yml
7 years ago
057567d548
Make boost modal off by default ( #1719 )
7 years ago
169c68a739
Add filename extension to paperclip ( #1718 )
7 years ago
9f182346d7
Use english in reported by translation ( #1713 )
7 years ago
a58c935c3d
Fr missing strings ( #1708 )
...
* Fix missing translation for username already taken
* fr - note too long translation
7 years ago
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
7 years ago
d9dc0fe84e
smtp delivery type fix ( #1556 )
...
* delivery fix
# Conflicts:
# config/environments/production.rb
* added stub in .env file
* reordered and added a comment
7 years ago
55b56e3f95
terms: remove redundant words ( #1578 )
...
"at least X" and "X or older" have identical meanings.
Using both together feels a little jarring.
7 years ago
c4d39b1b3d
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
7 years ago
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
7 years ago
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
7 years ago
9e5c1c487e
Apply `i18n-tasks normalize` to locales ( #1696 )
7 years ago
5619099564
translation: Fix comment out issue in en.jsx ( #1698 )
7 years ago
ce80d0b0a9
Fix minor jslint issue ( #1697 )
...
* Undefined propType in react component `ColumnSettings`.
Add proper PropTypes definition.
7 years ago
6327f69cab
Merge branch 'blackle-videolightbox'
7 years ago
5f8155482a
Add overlay style to buttons, continue video after expanding it
7 years ago
efcf9448da
Update settings_helper.rb
7 years ago
e70b84b1dc
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
7 years ago
d7a4e8739a
Ignore postgres/redis folder from docker-compose ( #1645 )
7 years ago
9362700137
Convert emoji shortnames when sending status ( #1666 )
7 years ago
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
7 years ago
edefcfcf42
Fix issue where 'sensitive content click to show' item takes up whole screen on public view ( #1692 )
7 years ago
b330d1f000
Organize coverage dirs ( #1695 )
...
* Add `Presenters` group to SimpleCov configuration
* Move validators to app/validators, add to simplecov config
7 years ago
1a5a54eb4b
Merge branch 'master' into master
7 years ago
447b8bc44e
Do not show media attachment as og:image if it was marked as NSFW ( #1693 )
7 years ago
093879c177
Fix language export variables ( #1689 )
...
* Fix naming of JS locale constants
* Improve the translation instructions re: const names
7 years ago
d2c20936f3
Merge remote-tracking branch 'origin/master'
7 years ago
0220f3a171
Update application.rb
7 years ago
905a4faa1c
Update settings_helper.rb
7 years ago
5355b7d930
Update settings_helper.rb
7 years ago
aec2458d81
Merge remote-tracking branch 'tootsuite/master'
7 years ago
4fe5e04ea4
Fix csv export coverage in export spec ( #1691 )
7 years ago
3f42ad7d1a
Rename simple_form.it.yml to config/locales/simple_form.it.yml
7 years ago
f7c466c8d8
Rename devise.it.yml to config/locales/devise.it.yml
7 years ago
245b9cb4ba
Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml
7 years ago
9275f92972
Rename it.yml to config/locales/it.yml
7 years ago
4a6d3bac86
Merge pull request #1 from tootsuite/master
...
update
7 years ago
00cc3066a2
Allow video to be expanded into lightbox
7 years ago
a57d30c680
[l10n] ja: update missing Japanese translations ( #1687 )
7 years ago
467d32fce3
[l10n] ja: update missing Japanese translations ( #1684 )
7 years ago
8aadb7b0b2
Exclude javascript locale file from dup check ( #1677 )
...
* Exclude javascript locale files form Code Climate's duplication
engine. It is silly to have duplication check with locale files.
They are supposed to look similar.
* Prevent unnecessary blocking for translation updates (like #1661 )
7 years ago
79546799af
Added Italian language (it) ( #1679 )
7 years ago
90d0018fd5
Adds Croatian language [Hrvatski] ( #1000 )
...
* Create simple.form.hr.yml
* Create hr.yml
* Update hr.yml
* Update hr.yml
* Create doorkeeper.hr.yml
* Create devise.hr.yml
7 years ago
Effy Elden