505 Commits (ceecf962081b858f40978829041bfc2b282ddcae)

Author	SHA1	Message	Date
Joachim Viide	363de2dffd	Leave out the "Expires" header from S3 uploads (#1886)	8 years ago
Alex Dunn	6a1ac9b31f	capistrano: allow overriding repo_url and branch (#1889)	8 years ago
Ash Furrow	0f8b7d0660	Removed Heroku in-process spawning. (#1873)	8 years ago
Naouak	3d3e32befb	Check for a custom css file to help customization of instances (#1368) ... * User can create a custom.scss to customize their instance without modifying gitted files. * Add documentation for customization. * Forgot the helper file * Fix Style to pass codeclimate * Requests from maintainer.	8 years ago
oliverkeeble	28606d730a	Fix typo in simple_form.eo.yml (#1848)	8 years ago
Matt Jankowski	6670e6d33f	Add password reset for users from admin accounts area (#1841)	8 years ago
Patrick Figel	df4ff9a8e1	Add recovery code support for two-factor auth (#1773) ... * Add recovery code support for two-factor auth When users enable two-factor auth, the app now generates ten single-use recovery codes. Users are encouraged to print the codes and store them in a safe place. The two-factor prompt during login now accepts both OTP codes and recovery codes. The two-factor settings UI allows users to regenerated lost recovery codes. Users who have set up two-factor auth prior to this feature being added can use it to generate recovery codes for the first time. Fixes #563 and fixes #987 * Set OTP_SECRET in test enviroment * add missing .html to view file names	8 years ago
luigi	67ad84b7eb	Add some missing Spanish translations (#1818) ... * Add missing spanish translations on user settings simple_form.es.yml * Fix typo: Aute/ción. should be Autenticación	8 years ago
Setuu	9e620ca16c	Fix Japanese translation of ja.yml (#1835)	8 years ago
goofy-bz	a3aa9381c4	Update devise.fr.yml (#1728) ... Very light grammar fix to improve gender-neutral	8 years ago
Shouko Yu	120a37a197	Add translations for zh-TW (Taiwan) (#1794)	8 years ago
Koala Yeung	ec9999cdfe	Update Traditional Chinese, HK (zh-HK) translation (#1759) ... * Fix missing string in javascript locale (zh-HK) * Change javascript locale (zh-HK) * Fix some other strings that were still English. * Improve `search.status_by`. * Fix `notification.follow`. ("開始開始你") * Changes according to user feedback. * "Back": "較前顯示" -> "返回" * "Home": "家" -> "主頁" * Update ruby locale (zh-HK) * Fix missing translation * Normalize yml * Update translation strings	8 years ago
Fjoerfoks	e806d3c3f0	Update nl.yml (#1764) ... Some rewording, typos and switching to infinitve	8 years ago
Olivier Humbert	061922b38c	Update devise.fr.yml (#1792) ... * Update devise.fr.yml Consistencies across the French translation * Update doorkeeper.fr.yml	8 years ago
Thor Harald Johansen	4bebeb27d3	More Norwegian translations (#1805) ... * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation. * Yet more improvements to the Norwegian translation. * More Norwegian translations. Better terminology.	8 years ago
Darío Hereñú	9240ca6cef	Mispelling & minor fixes (#1814)	8 years ago
Matt Jankowski	619817d29e	Remove unused will_paginate.page_gap key from i18n (#1815) ... This value was changed recently, and every locale which had it set was using the same value as the default. This value is still the default in the new location.	8 years ago
rysiekpl	ade004b5ee	Polish translation (needs more love though) (#807) ... * Polish translation (needs more love though) * Polish translation bugfix * bugfix for new colon-containing texts * another bugfix. yaml is evil * minor fix * fixing issues pointed out by reviewers * Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer * Etyczny dizajn zbyt sarkastyczny, to będą założenia	8 years ago
Les Orchard	7609593e48	Add REDIS_DB env variable to configure Redis database (#1366)	8 years ago
ThibG	a9529d3b4b	Allow running mastodon on a different domain as the one used for identifying users (#1267) ... * Allow running mastodon on a different domain as the one used for identifying users * Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing * Compare to web_domain instead of local_domain when dealing with feeds/API * Correctly identify mentions to local accounts Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.	8 years ago
Valentin Lorentz	5ab0ffc6c8	Custom Paperclip path. (#778) ... * Custom Paperclip path. * Document PAPERCLIP_ROOT. * Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).	8 years ago
Kazuhiro NISHIYAMA	1616cf98a1	Add missing Japanese translations (#1785)	8 years ago
Takayuki KUSANO	5aae6384ff	Fix Japanese translation for remote_follow (#1771) ... Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.	8 years ago
Matt Jankowski	8b74aa4217	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	8 years ago
Effy Elden	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)	8 years ago
Eugen Rochko	c8be05a4a7	Fix italian translation	8 years ago
Eugen Rochko	41c697fd81	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	8 years ago
Eugen	485310a43c	Make browserify respect changes in node_modules for asset compilation (#1722)	8 years ago
Matteo Aquila	9aae9ae40c	Update devise.it.yml	8 years ago
Matteo Aquila	1fb125b630	Update devise.it.yml	8 years ago
Eugen	057567d548	Make boost modal off by default (#1719)	8 years ago
Yusuke Abe	169c68a739	Add filename extension to paperclip (#1718)	8 years ago
Matt Jankowski	9f182346d7	Use english in reported by translation (#1713)	8 years ago
spf	a58c935c3d	Fr missing strings (#1708) ... * Fix missing translation for username already taken * fr - note too long translation	8 years ago
Thomas Citharel	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	8 years ago
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	8 years ago
Eugen	9e5c1c487e	Apply `i18n-tasks normalize` to locales (#1696)	8 years ago
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	8 years ago
Matteo Aquila	0220f3a171	Update application.rb	8 years ago
Matteo Aquila	3f42ad7d1a	Rename simple_form.it.yml to config/locales/simple_form.it.yml	8 years ago
Matteo Aquila	f7c466c8d8	Rename devise.it.yml to config/locales/devise.it.yml	8 years ago
Matteo Aquila	245b9cb4ba	Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml	8 years ago
Matteo Aquila	9275f92972	Rename it.yml to config/locales/it.yml	8 years ago
Musee U	467d32fce3	[l10n] ja: update missing Japanese translations (#1684)	8 years ago
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	8 years ago
新都心(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	8 years ago
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	8 years ago
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	8 years ago
Matt Jankowski	137100dcf3	Clean up well-known routes/controllers (#1649) ... * Add request spec for host meta route returning xml * Add routing spec for xrd routes * Update well-known routes * Move webfinger and host-meta actions to their own controllers	8 years ago
Matt Jankowski	3a9eb81a80	Admin accounts controller cleanup (#1664) ... * Remove unused account_params method in admin/accounts controller * Introduce AccountFilter to find accounts * Use AccountFilter in admin/accounts controller * Use more restful routes admin silence and suspension area * Add admin/silences and admin/suspensions controllers	8 years ago
Thor Harald Johansen	ccaf3dbc5a	Adjustments to the Norwegian translation (#1648) ... * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation.	8 years ago
lindwurm	9966bd27c2	[l10n] ja: Improve Japanese Translations (#1631) ... * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com>	8 years ago
pinfort	38e24a699b	fix Japanese translation (#1623) ... * add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx * fix translations 翻訳の誤りの修正と改善 * freeの訳修正 * いいねをお気に入りに統一 * Revert "いいねをお気に入りに統一" This reverts commit 568d5cccfa. 間違ってtranslateブランチにコミットしたため取り消し * Revert "freeの訳修正" This reverts commit 565658a605. * revertでミスったので戻す * Revert "ミスったので戻す" This reverts commit 00be7a748a, reversing changes made to b4e1e06503. * freeの訳修正 * いいねをお気に入りに統一 * 一回戻す * 戻しきれてなかった * 再度変更 * 戻す * 再度変更 * 再度変更 * Update doorkeeper.ja.yml Fixed a lot of unnatural translations * Update ja.yml 資格情報 isn't easy to understanding. so fixed to ログイン情報. * Update ja.yml fixed some unnatural translations * Update simple_form.ja.yml Fixed wrong translate 「アカウント」 to 「アイコン画像」 * Update simple_form.ja.yml * Update doorkeeper.ja.yml * Revert "多くの不自然な翻訳を解消しました。" * Update ja.jsx fixed typo * 文字化け修正	8 years ago
Manato Kameya	bf3e56b8ad	Fix incorrect notation in simple_form.ja.yml (#1620)	8 years ago
CgX	e32edd247f	Update fr.yml (#1600) ... Mistake on %{link} variable	8 years ago
Matt Jankowski	c44a700252	Quick best practice cleanup of views/helpers (#1546) ... * Remove trailing whitespace * Use query methods instead of explicit .blank? checks	8 years ago
Matt Jankowski	7f0a865b05	Allow import/export of mutes list (#1541) ... * Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code	8 years ago
Carlos A. Escobar	3064ef96a1	Added missing Spanish translations strings (#1292) ... * Added missing Spanish translations strings * fix bad translation * resolve conflict with tootsuite/master * agreements from spanish community * Add some missing strings	8 years ago
Thomas Citharel	d90d23699c	Make Reporting admin section translatable (#1549) ... * Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
Thor Harald Johansen	1f5ff46fd9	Working translation for Norwegian. (#1611)	8 years ago
Matt Jankowski	b352a8e5d4	Default to json type for webfinger requests (#1583)	8 years ago
Koala Yeung	24eb45425e	Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544) ... * Added Chinese Traditional Hong Kong (zh-HK) for Ruby * Added translations for Ruby. * Added Chinese Traditional Hong Kong (zh-HK) for JS * Added translations for javascript code. * Rearrange language references in mastodon.jsx * Break `addLocaleData` into multiple lines. Make future commit more readable. * Roughly re-sort the languages in alphabetical orders (only manually put English on top because it is default). * Sort application.rb locale with alphabetical order With exception that English (default language) goes first. Improve code readability. * Resort language selection box alphabetically Sort HUMAN_LOCALES in the alphabetical order of display name (except English, the default language, come first). Improve usability.	8 years ago
Eugen	40bdf43297	Change default log level in production from :debug to :info for less I/O (#1579)	8 years ago
Eugen	5cdd2c2414	Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563)	8 years ago
Matt Jankowski	3ddd936b03	Refactor exports controller (#1567) ... * Add basic coverage for settings/exports controller * Remove unused @account variable from settings/exports controller * Add coverage for download export actions * Remove deprecated `render :text` in favor of `send_data` for csv downloads * Add model to handle exports * Use Export class in settings/exports controller * Simplify settings/exports controller methods * Move settings/export to more restful routes	8 years ago
Thomas Citharel	327a6e166f	Update french locale (#1525) ... * Update devise.fr.yml fixing minor typos * add missing strings * Fix a translation and add translation for devise part Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
pinfort	6f5268b02d	Add Japanese translation (#1552) ... * add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx	8 years ago
jukper	4964433190	Revised finnish translation (#1537)	8 years ago
Jantso Porali	9e3c4fd2d7	Update language files (#1516) ... * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation * fix for Amazon S3/Minio instance setups If you were using S3 or Minio for your files, this will fix the Import issue :) * update translation according to issue #1515 See issue #1515 * update translation for issue #1515 see issue #1515	8 years ago
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	8 years ago
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	8 years ago
Yann GUERN	a85d4473aa	Avoid user enumeration with devise paranoid mode (#1527)	8 years ago
Matt Jankowski	4ada50985a	Pagination improvements (#1445) ... * Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views	8 years ago
Matt Jankowski	64dbde0dbf	Version bumps for ruby and misc gems (#1159) ... * Update rspec-rails to version 3.5.2 * Update addressable to version 2.5.1 * Update autoprefixer-rails to version 6.7.7.1 * Update bullet to version 5.5.1 * Update domain_name to version 0.5.20170404 * Update letter_opener_web to version 1.3.1 * Upate redis-rails to version 5.0.2 * Update active_record_query_trace to version 1.5.4 * Update capistrano-rails to version 1.2.3 * Update dotenv-rails to version 2.2.0 * Update pg to version 0.20.0 * Update tilt to version 2.0.7 * Update warden to version 1.2.7 * Update tins to version 1.13.2 * Update terminal-table to version 1.7.3 * Update oj to version 2.18.5 * Update simplecov to version 0.14.1 * Update uglifier to version 3.1.13 * Update hashdiff to version 0.3.2 * Update webmock to version 2.3.2 * Update devise to version 4.2.1 * Use ruby version 2.4.1 * Update sass to version 3.4.23 * Update puma to version 3.8.2 * Update will_paginate to version 3.1.5 * Update font-awesome-rails to version 4.7.0.1 * Update fuubar to version 2.2.0 * Update pry-rails to version 0.3.6 * Update simple-navigation to version 4.0.5 * Update rubocop to version 0.48.1 * Update doorkeeper to version 4.2.5 * Update faker to version 1.7.3 * Update aws-sdk to version 2.9.5 * Update fabrication to version 2.16.1 * Update hamlit-rails to version 0.2.0 * Update http to version 2.2.1 * Update httplog to version 0.99.2 * Update sidekiq to version 4.2.10 * Update rspec-sidekiq to version 3.0.0 * Update pghero to version 1.6.4 * Update rack-cors to version 0.4.1 * Update i18n-tasks to version 0.9.13 * Update ruby-oembed to version 0.12.0 * Update jquery-rails to version 4.3.1 * Update simple_form to version 3.4.0 * Update react-rails to version 1.11.0 * Update aws-sdk to version 2.9.6 * Update sidekiq-unique-jobs to version 5.0.0 * Update uglifier to version 3.2.0	8 years ago
Alexander Mankuta	0dbbc16c69	More SMTP customization (#1372) ... * Allow SMTP auth method customization * Add SMTP openssl_verify_mode option support Allows one use self-signed certs with their SMTP server. * Add SMTP enable_starttls_auto option support	8 years ago
Ratmir Karabut	9043b32183	Add Russian translation (ru) (#1023) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency	8 years ago
R Tucker	8bfdbf0aa6	Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289) ... * Put a useful message for new admins on /about/more I totally failed to realize this file was just defaults. I think this message would be a good default for people like me. * Revert default site description, expand comment This will keep setup-related stuff from leaking into public views, while still hopefully keeping over-eager admins from editing this file unnecessarily before RTFMing. (e.g., me)	8 years ago
David Celis	d4fe6cd2bf	Allow users to update their Account in the API (#1179) ... * Allow users to update their Account in the API It would be nice for API clients to be able to allow users to update their accounts without having to wrap Mastodon in a web view. This patch adds an API endpoint to let users submit a PATCH for their account. Signed-off-by: David Celis <me@davidcel.is> * Add /api/v1/accounts/update_credentials to the API docs Signed-off-by: David Celis <me@davidcel.is>	8 years ago
Olivier Humbert	082bef3027	French translation update (#1271) ... * Update confirmation_instructions.fr.html.erb consistency across the French translation * Update consistency across the French translation * Update fr.yml a bunch of consistency across the French translation + a few typos * Update doorkeeper.fr.yml consistency across the French translation (punctuation)	8 years ago
spf	e6b48a7048	French typo (#1257) ... * French typo * Datetime french translation	8 years ago
Matt Jankowski	e5282e4ec0	Clean up about page (#1282) ... * Add InstancePresenter to expose site details * Clean up about controller, use instance presenter	8 years ago
Matt Jankowski	71706f21c2	Ignore implied formats for catch all route requests (#1340) ... A request to `/test` would show the custom 404 page, but a request to `/test.test` would return a 404 with an empty body. This change ignores the format on incoming catch all route requests, so that the html 404 page is returned on these requests.	8 years ago
Eugen	d5a675099a	Add env variable to disable prepared statements (#1293)	8 years ago
Ash Furrow	c3e7bac1cc	Allows setting log level in env variable (#1290) ... * Allows setting log level in env variable. * Made changes based on feedback in #1290.	8 years ago
Eugen	9acdb166e8	Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) ... * Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled * Clean up	8 years ago
Thomas Citharel	41f8fde83e	Update french translation (#1148) ... Add french translation for emails sent Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add non-breaking spaces Signed-off-by: Thomas Citharel <tcit@tcit.fr> changes and fixes to the nbsps Signed-off-by: Thomas Citharel <tcit@tcit.fr> French update a few fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr> fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
Sebastian Hübner	f860eb7d71	Fixed two translation errors (#1139) ... Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx	8 years ago
Korbinian	8f9a11b642	Update simple_form.de.yml (#971)	8 years ago
Jantso Porali	01d8003867	Updated about page in Finnish language (#1170) ... * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation	8 years ago
Olivier Humbert	ed3dfd0bee	French translation update (#1188) ... * Update fr.yml one typo fix * Update simple_form.fr.yml one translation consistency	8 years ago
Shel R	fef478781d	Merge branch 'master' into master	8 years ago
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.	8 years ago
Eugen	0adee18d73	Merge branch 'master' into feature-customized-default-locale	8 years ago
Jantso Porali	786e6f94b9	Update Finnish translations, add sample Minio config (#954)	8 years ago
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	8 years ago
Eugen	1c351709bc	Force UTF8 encoding on generated XML (#1140)	8 years ago
André Lewin	bf7cefa516	Merge branch 'master' into master	8 years ago
Eugen Rochko	29ffe1cad3	Make sure Rabl is using Oj	8 years ago
Jantso Porali	837030db98	updated blocking translation	8 years ago
Jantso Porali	deb001bba8	updated two-way auth and preferences translation	8 years ago