specter/mastodon
1
0
Fork 1
forked from fedi/mastodon
Code Pull requests Activity
1957 commits 82 branches 202 tags 316 MiB
Commit graph

365 commits

Author SHA1 Message Date
Shel R fef478781d Merge branch 'master' into master 2017-04-07 22:21:21 -04:00
Chad Pytel ad5ddd5e95 Use I18n for media attachment validation errors 
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
 2017-04-07 14:23:18 -04:00
Eugen 0adee18d73 Merge branch 'master' into feature-customized-default-locale 2017-04-07 13:07:03 +02:00
Jantso Porali 786e6f94b9 Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Eugen Rochko e3a3422a65 Allow setting of default language through config 
Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug
 2017-04-07 12:40:26 +02:00
Eugen 1c351709bc Force UTF8 encoding on generated XML (#1140) 2017-04-07 11:09:14 +02:00
André Lewin bf7cefa516 Merge branch 'master' into master 2017-04-05 20:28:58 +02:00
Eugen Rochko 29ffe1cad3 Make sure Rabl is using Oj 2017-04-05 19:29:30 +02:00
Jantso Porali 837030db98 updated blocking translation 2017-04-05 14:53:35 +02:00
Jantso Porali deb001bba8 updated two-way auth and preferences translation 2017-04-05 14:49:29 +02:00
Jantso Porali d3bf0307db updated translation for about page 2017-04-05 14:47:42 +02:00
JantsoP 20b53e6add Merge branch 'master' into master 2017-04-05 10:07:17 +02:00
JantsoP 3ec221d3b7 updated reblog to boost translation 
Since it is that :D
 2017-04-05 09:57:25 +02:00
JantsoP 473e4f7813 udpdated display_name translation 2017-04-05 09:52:31 +02:00
JantsoP b845ef395d updated reblog translation 2017-04-05 09:51:35 +02:00
Eugen Rochko 667ffafef8 Fix spec 2017-04-05 03:31:26 +02:00
Eugen 086a88f3bb Merge pull request #863 from Eychics/master 
Add closed_registrations message on French language
 2017-04-05 03:11:13 +02:00
Eugen e76dd52b08 Merge pull request #818 from JantsoP/master 
Updated Finnish Translation
 2017-04-05 03:09:20 +02:00
Eugen c12214963e Merge pull request #866 from kklleemm/patch-1 
Fix typos on french translations
 2017-04-05 03:06:41 +02:00
Eugen aa8dacbc8a Merge pull request #792 from chapeaumeinfreund/master 
Updated and fixed german orthography
 2017-04-05 03:05:50 +02:00
Eugen ce524cbb49 Merge pull request #790 from chapeaumeinfreund/patch-1 
Updated and fixed german orthography
 2017-04-05 03:05:31 +02:00
Eugen 117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817 
[#817] Add email whitelist
 2017-04-05 03:04:58 +02:00
Eugen 57466d542b Merge pull request #805 from nevillepark/master 
Changed "reblogs" to "boosts"
 2017-04-05 03:00:57 +02:00
Clément D 350958babf Fix typos on french translations 2017-04-04 19:09:54 +02:00
Thibaut (Eychics) 9a5d6e9715 Add closed_registrations message on French language 2017-04-04 18:58:19 +02:00
Pete Keen e9a6da6bc7 [#817] Add email whitelist 
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.

Fixes #817
 2017-04-04 11:20:15 -04:00
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI 2017-04-04 15:28:12 +02:00
JantsoP db4a41cf58 Merge branch 'master' into master 2017-04-04 08:41:46 +02:00
JantsoP dc89fc17cc updated translation 2017-04-04 08:29:53 +02:00
Neville Park ce1ca28594 Changed "reblogs" to "boosts" 2017-04-03 17:45:36 -04:00
axolotl 0700521ef3 added Esperanto (eo) 2017-04-03 20:22:50 +02:00
Eugen Rochko 98a93aa07e Fix norwegian translation being malformed 2017-04-03 19:50:55 +02:00
Korbinian ec8029a955 Updated and fixed orthography 2017-04-03 19:10:48 +02:00
Korbinian 7dd5ba42a3 Updated and fixed german orthography 2017-04-03 19:01:17 +02:00
Eugen Rochko b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block 2017-04-03 18:55:06 +02:00
Christopher Kolstad 5cb011b66b Add Norwegian locale 2017-04-03 16:32:03 +02:00
JantsoP 65d667dc6c another typo. fuck me 2017-04-03 14:56:13 +02:00
JantsoP d3fde60297 fixed an sneaky peaky tpy 2017-04-03 14:54:53 +02:00
JantsoP 85a8b62ca2 add finnish translation 
add finnish translation
 2017-04-03 14:43:07 +02:00
JantsoP 97803600ed add finnish translation 
add finnish translation
 2017-04-03 14:20:50 +02:00
JantsoP bfa99981e5 Merge branch 'master' into master 2017-04-03 13:50:57 +02:00
JantsoP 6501ffdadc add finnish translation 
add finnish translation
 2017-04-03 13:35:12 +02:00
JantsoP b0f4c9b91f finnish translation 
finnish translation
 2017-04-03 13:25:46 +02:00
JantsoP f9b4f30de6 updated final translation 
updated final translation
 2017-04-03 13:07:09 +02:00
JantsoP 87854745e9 Create new translation file 
Still in progress. Should be done shortly
 2017-04-03 12:42:09 +02:00
Angristan c97fc5c1f4 Improve french translation 2017-04-03 11:04:00 +02:00
Valentin Lorentz fbcba65f81 Improve French translation 
Fix typos and typography. Make vocabulary and grammar more uniform.
 2017-04-03 03:16:37 +02:00
Eugen 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales 
Feature/improve french locales (again)
 2017-04-03 00:25:56 +02:00
Damien Erambert 71cf9d0608 Fix typo in simple_form.fr.yml 2017-04-02 14:04:06 -07:00
Damien Erambert 5e45982ed9 Improve translation of data import in fr.yml 2017-04-02 14:03:57 -07:00