Matteo Aquila
9aae9ae40c
Update devise.it.yml
2017-04-13 22:09:47 +02:00
Matteo Aquila
1fb125b630
Update devise.it.yml
2017-04-13 22:06:19 +02:00
Eugen
057567d548
Make boost modal off by default ( #1719 )
2017-04-13 21:53:59 +02:00
Yusuke Abe
169c68a739
Add filename extension to paperclip ( #1718 )
2017-04-13 21:52:56 +02:00
Matt Jankowski
9f182346d7
Use english in reported by translation ( #1713 )
2017-04-13 21:49:46 +02:00
spf
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
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
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
c4d39b1b3d
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
2017-04-13 19:37:04 +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
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
9e5c1c487e
Apply i18n-tasks normalize to locales ( #1696 )
2017-04-13 19:18:32 +02:00
INAGAKI Hiroshi
5619099564
translation: Fix comment out issue in en.jsx ( #1698 )
2017-04-13 17:11:18 +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
6327f69cab
Merge branch 'blackle-videolightbox'
2017-04-13 17:01:52 +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
efcf9448da
Update settings_helper.rb
2017-04-13 16:16:39 +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
d7a4e8739a
Ignore postgres/redis folder from docker-compose ( #1645 )
2017-04-13 16:04:20 +02:00
Rachel H
9362700137
Convert emoji shortnames when sending status ( #1666 )
2017-04-13 16:03:45 +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
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
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
1a5a54eb4b
Merge branch 'master' into master
2017-04-13 16:00:20 +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
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
d2c20936f3
Merge remote-tracking branch 'origin/master'
2017-04-13 15:33:53 +02:00
Matteo Aquila
0220f3a171
Update application.rb
2017-04-13 15:33:45 +02:00
Matteo Aquila
905a4faa1c
Update settings_helper.rb
2017-04-13 15:32:31 +02:00
Matteo Aquila
5355b7d930
Update settings_helper.rb
2017-04-13 15:31:38 +02:00
Matteo Aquila
aec2458d81
Merge remote-tracking branch 'tootsuite/master'
2017-04-13 15:30:04 +02:00
Matt Jankowski
4fe5e04ea4
Fix csv export coverage in export spec ( #1691 )
2017-04-13 15:29:30 +02:00
Matteo Aquila
3f42ad7d1a
Rename simple_form.it.yml to config/locales/simple_form.it.yml
2017-04-13 15:28:30 +02:00
Matteo Aquila
f7c466c8d8
Rename devise.it.yml to config/locales/devise.it.yml
2017-04-13 15:28:15 +02:00
Matteo Aquila
245b9cb4ba
Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml
2017-04-13 15:27:56 +02:00
Matteo Aquila
9275f92972
Rename it.yml to config/locales/it.yml
2017-04-13 15:27:37 +02:00
Matteo Aquila
4a6d3bac86
Merge pull request #1 from tootsuite/master
...
update
2017-04-13 15:23:20 +02:00
blackle
00cc3066a2
Allow video to be expanded into lightbox
2017-04-13 09:09:45 -04:00
YOSHIOKA Eiichiro
a57d30c680
[l10n] ja: update missing Japanese translations ( #1687 )
2017-04-13 14:39:14 +02:00
Musee U
467d32fce3
[l10n] ja: update missing Japanese translations ( #1684 )
2017-04-13 13:40:58 +02:00
Koala Yeung
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 )
2017-04-13 13:40:25 +02:00
Matteo Aquila
79546799af
Added Italian language (it) ( #1679 )
2017-04-13 13:39:00 +02:00
May Kittens Devour Your Soul
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
2017-04-13 13:38:44 +02:00
Eugen
1a12fd14d4
Merge branch 'master' into master
2017-04-13 13:26:16 +02:00
Hugo Gameiro
282bb55c3c
fix Portuguese translation ( #1661 )
...
* update portuguese translation
added the missing fields and improved the translation
* pt translations fix
* improve last translation commit
* fix damn quotes
2017-04-13 13:25:34 +02:00
新都心(Neet Shin)
0e4479bb3a
Update Japanese translation files ( #1640 )
...
* [l10n] ja: Improve Japanese Translations
* ja: about: Fix highlighting
* ja: Update Translations
* ja: Translate admin settings
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
* Update ja.jsx
* Update doorkeeper.ja.yml
* Update ja.yml
* Update ja.jsx
* Update ja.jsx
2017-04-13 13:23:45 +02:00
Ratmir Karabut
af7e880df5
Update Russian translation ( #1570 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
2017-04-13 13:23:23 +02:00
Svetlozar Todorov
aa7bf1515c
Fix #624 - Add localization for Bulgarian ( #645 )
...
* Add translation files and declarations for Bulgarian
* Add a bunch of translations to bg.jsx
* Add rest of translations to bg.jsx
* Add devise translations
* Fix devise translations
2017-04-13 13:16:28 +02:00
Daijiro Wachi
4f781b17cc
Use input type number for Two-factor code ( #1683 )
2017-04-13 13:13:17 +02:00
