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
2017-04-13 19:51:49 +02:00
Alyssa Ross
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
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.
2017-04-13 19:50:19 +02:00
R Tucker
376f6ce6a6
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
2017-04-13 19:37:04 +02:00
R Tucker
c4d39b1b3d
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
2017-04-13 19:37:04 +02:00
Eugen
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
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
2017-04-13 19:36:41 +02:00
Eugen
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
Eugen
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
Eugen
553dc8dbb5
Apply i18n-tasks normalize to locales ( #1696 )
2017-04-13 19:18:32 +02:00
Eugen
9e5c1c487e
Apply i18n-tasks normalize to locales ( #1696 )
2017-04-13 19:18:32 +02:00
INAGAKI Hiroshi
8c3b5c99e6
translation: Fix comment out issue in en.jsx ( #1698 )
2017-04-13 17:11:18 +02:00
INAGAKI Hiroshi
5619099564
translation: Fix comment out issue in en.jsx ( #1698 )
2017-04-13 17:11:18 +02:00
Koala Yeung
698406f076
Fix minor jslint issue ( #1697 )
...
* Undefined propType in react component `ColumnSettings`.
Add proper PropTypes definition.
2017-04-13 17:10:48 +02:00
Koala Yeung
ce80d0b0a9
Fix minor jslint issue ( #1697 )
...
* Undefined propType in react component `ColumnSettings`.
Add proper PropTypes definition.
2017-04-13 17:10:48 +02:00
Eugen Rochko
314e3dba6c
Merge branch 'blackle-videolightbox'
2017-04-13 17:01:52 +02:00
Eugen Rochko
6327f69cab
Merge branch 'blackle-videolightbox'
2017-04-13 17:01:52 +02:00
Eugen Rochko
a148a3900e
Add overlay style to buttons, continue video after expanding it
2017-04-13 17:01:09 +02:00
Eugen Rochko
5f8155482a
Add overlay style to buttons, continue video after expanding it
2017-04-13 17:01:09 +02:00
Matteo Aquila
f9a42acd0d
Update settings_helper.rb
2017-04-13 16:16:39 +02:00
Matteo Aquila
efcf9448da
Update settings_helper.rb
2017-04-13 16:16:39 +02:00
Eugen Rochko
0744eb8838
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
2017-04-13 16:14:11 +02:00
Eugen Rochko
e70b84b1dc
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
2017-04-13 16:14:11 +02:00
Lukas Burk
be7f1b7ecb
Ignore postgres/redis folder from docker-compose ( #1645 )
2017-04-13 16:04:20 +02:00
Lukas Burk
d7a4e8739a
Ignore postgres/redis folder from docker-compose ( #1645 )
2017-04-13 16:04:20 +02:00
Rachel H
a6515aeea8
Convert emoji shortnames when sending status ( #1666 )
2017-04-13 16:03:45 +02:00
Rachel H
9362700137
Convert emoji shortnames when sending status ( #1666 )
2017-04-13 16:03:45 +02:00
Koala Yeung
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
Koala Yeung
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
Isabelle Knott
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
Isabelle Knott
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
Matt Jankowski
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
Matt Jankowski
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
Eugen
e02486edab
Merge branch 'master' into master
2017-04-13 16:00:20 +02:00
Eugen
1a5a54eb4b
Merge branch 'master' into master
2017-04-13 16:00:20 +02:00
Isabelle Knott
79cefa3739
Do not show media attachment as og:image if it was marked as NSFW ( #1693 )
2017-04-13 15:59:43 +02:00
Isabelle Knott
447b8bc44e
Do not show media attachment as og:image if it was marked as NSFW ( #1693 )
2017-04-13 15:59:43 +02:00
Matt Jankowski
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
Matt Jankowski
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
Matteo Aquila
f756a96056
Merge remote-tracking branch 'origin/master'
2017-04-13 15:33:53 +02:00
Matteo Aquila
d2c20936f3
Merge remote-tracking branch 'origin/master'
2017-04-13 15:33:53 +02:00
Matteo Aquila
b57c52c7e7
Update application.rb
2017-04-13 15:33:45 +02:00
Matteo Aquila
0220f3a171
Update application.rb
2017-04-13 15:33:45 +02:00
Matteo Aquila
e891a97787
Update settings_helper.rb
2017-04-13 15:32:31 +02:00
Matteo Aquila
905a4faa1c
Update settings_helper.rb
2017-04-13 15:32:31 +02:00
Matteo Aquila
3ace439512
Update settings_helper.rb
2017-04-13 15:31:38 +02:00
Matteo Aquila
5355b7d930
Update settings_helper.rb
2017-04-13 15:31:38 +02:00
Matteo Aquila
20b56f3511
Merge remote-tracking branch 'tootsuite/master'
2017-04-13 15:30:04 +02:00
Matteo Aquila
aec2458d81
Merge remote-tracking branch 'tootsuite/master'
2017-04-13 15:30:04 +02:00
Matt Jankowski
3beb0c0bef
Fix csv export coverage in export spec ( #1691 )
2017-04-13 15:29:30 +02:00
