506 Commits (21c1b4bf8a948cc8282ec676c1fb5732e81fc82b)

Author SHA1 Message Date
Eugen ba6b4c6e62 Make file attachment on MediaAttachment optional (#1865)
8 years ago
Joachim Viide c923b8bb63 Leave out the "Expires" header from S3 uploads (#1886)
8 years ago
Alex Dunn 625fd572b6 capistrano: allow overriding repo_url and branch (#1889)
8 years ago
Ash Furrow 57e0b5064b Removed Heroku in-process spawning. (#1873)
8 years ago
Naouak 85ff7666f3 Check for a custom css file to help customization of instances (#1368)
8 years ago
oliverkeeble 7889295f71 Fix typo in simple_form.eo.yml (#1848)
8 years ago
Matt Jankowski c0f0bcf17d Add password reset for users from admin accounts area (#1841)
8 years ago
Patrick Figel 15b393201e Add recovery code support for two-factor auth (#1773)
8 years ago
luigi 1549a9d997 Add some missing Spanish translations (#1818)
8 years ago
Setuu a1d00eb993 Fix Japanese translation of ja.yml (#1835)
8 years ago
goofy-bz 5e32054802 Update devise.fr.yml (#1728)
8 years ago
Shouko Yu 3c90f2bd4c Add translations for zh-TW (Taiwan) (#1794)
8 years ago
Koala Yeung 3264c6d658 Update Traditional Chinese, HK (zh-HK) translation (#1759)
8 years ago
Fjoerfoks ade4168f91 Update nl.yml (#1764)
8 years ago
Olivier Humbert 44b0f14f5f Update devise.fr.yml (#1792)
8 years ago
Thor Harald Johansen 66da14e13b More Norwegian translations (#1805)
8 years ago
Darío Hereñú dfb94fed43 Mispelling & minor fixes (#1814)
8 years ago
Matt Jankowski 3e08188dca Remove unused will_paginate.page_gap key from i18n (#1815)
8 years ago
rysiekpl 16004237f2 Polish translation (needs more love though) (#807)
8 years ago
Les Orchard 492e8ec00e Add REDIS_DB env variable to configure Redis database (#1366)
8 years ago
ThibG c45c67c2ac Allow running mastodon on a different domain as the one used for identifying users (#1267)
8 years ago
Valentin Lorentz 5da8581563 Custom Paperclip path. (#778)
8 years ago
Kazuhiro NISHIYAMA 692199a07a Add missing Japanese translations (#1785)
8 years ago
Takayuki KUSANO b7561baee4 Fix Japanese translation for remote_follow (#1771)
8 years ago
Matt Jankowski 22f1d9099a Admin reports controller improvements (#1714)
8 years ago
Effy Elden 98aa3c9ccb 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 e9261cd3b8 Fix italian translation
8 years ago
Eugen Rochko 10b8829c02 Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
8 years ago
Eugen 12df378904 Make browserify respect changes in node_modules for asset compilation (#1722)
8 years ago
Matteo Aquila 73a299b51b Update devise.it.yml
8 years ago
Matteo Aquila 9d35b8de47 Update devise.it.yml
8 years ago
Eugen 0659f879d9 Make boost modal off by default (#1719)
8 years ago
Yusuke Abe f3ae46a512 Add filename extension to paperclip (#1718)
8 years ago
Matt Jankowski 03fe4e36a6 Use english in reported by translation (#1713)
8 years ago
spf cbe58bb4e8 Fr missing strings (#1708)
8 years ago
Thomas Citharel 6524136728 Translate admin (#1702)
8 years ago
James Moore 31f72c39a6 smtp delivery type fix (#1556)
8 years ago
Eugen 553dc8dbb5 Apply `i18n-tasks normalize` to locales (#1696)
8 years ago
Koala Yeung ff826c68eb Add Dutch translation (nl) (#1682)
8 years ago
Matteo Aquila b57c52c7e7 Update application.rb
8 years ago
Matteo Aquila 9410b7cbc6 Rename simple_form.it.yml to config/locales/simple_form.it.yml
8 years ago
Matteo Aquila 3281686b5c Rename devise.it.yml to config/locales/devise.it.yml
8 years ago
Matteo Aquila 125657117b Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml
8 years ago
Matteo Aquila c1e2949b86 Rename it.yml to config/locales/it.yml
8 years ago
Musee U a3019ede5a [l10n] ja: update missing Japanese translations (#1684)
8 years ago
May Kittens Devour Your Soul 81b05262f5 Adds Croatian language [Hrvatski] (#1000)
8 years ago
新都心(Neet Shin) 67ed9d8f18 Update Japanese translation files (#1640)
8 years ago
Ratmir Karabut 5a7354ef00 Update Russian translation (#1570)
8 years ago
Svetlozar Todorov 651b89199a Fix #624 - Add localization for Bulgarian (#645)
8 years ago
Matt Jankowski d8789124ae Clean up well-known routes/controllers (#1649)
8 years ago
Matt Jankowski 26ea2f70bd Admin accounts controller cleanup (#1664)
8 years ago
Thor Harald Johansen d898b8d958 Adjustments to the Norwegian translation (#1648)
8 years ago
lindwurm caddfb64aa [l10n] ja: Improve Japanese Translations (#1631)
8 years ago
pinfort 6ffc89a2e7 fix Japanese translation (#1623)
8 years ago
Manato Kameya 39dd2aaae7 Fix incorrect notation in simple_form.ja.yml (#1620)
8 years ago
CgX 2d2b114d9b Update fr.yml (#1600)
8 years ago
Matt Jankowski d1ebb63c54 Quick best practice cleanup of views/helpers (#1546)
8 years ago
Matt Jankowski bf7306636e Allow import/export of mutes list (#1541)
8 years ago
Carlos A. Escobar 7fd5075806 Added missing Spanish translations strings (#1292)
8 years ago
Thomas Citharel cd2324b07b Make Reporting admin section translatable (#1549)
8 years ago
Thor Harald Johansen b2c1df5c20 Working translation for Norwegian. (#1611)
8 years ago
Matt Jankowski c27253cbb6 Default to json type for webfinger requests (#1583)
8 years ago
Koala Yeung a3bfac26fb Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544)
8 years ago
Eugen 9dac43b6d1 Change default log level in production from :debug to :info for less I/O (#1579)
8 years ago
Eugen 3120d41c53 Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563)
8 years ago
Matt Jankowski 63e46e27f0 Refactor exports controller (#1567)
8 years ago
Thomas Citharel c471e5c694 Update french locale (#1525)
8 years ago
pinfort 601d93bfc3 Add Japanese translation (#1552)
8 years ago
jukper 58a75b4bed Revised finnish translation (#1537)
8 years ago
Jantso Porali b1b9d0fee7 Update language files (#1516)
8 years ago
Eugen Rochko b440b2a9ee Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
blackle e7d77f4e13 Allow user to disable the boost confirm dialog in preferences
8 years ago
Yann GUERN dc7ea0225a Avoid user enumeration with devise paranoid mode (#1527)
8 years ago
Matt Jankowski fcec9fcd99 Pagination improvements (#1445)
8 years ago
Matt Jankowski b4950a59bb Version bumps for ruby and misc gems (#1159)
8 years ago
Alexander Mankuta 7ff773bed5 More SMTP customization (#1372)
8 years ago
Ratmir Karabut ac50bab158 Add Russian translation (ru) (#1023)
8 years ago
R Tucker ef5d7dec72 Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289)
8 years ago
David Celis 6e0b4032b3 Allow users to update their Account in the API (#1179)
8 years ago
Olivier Humbert d473a092e3 French translation update (#1271)
8 years ago
spf 3bfac1374d French typo (#1257)
8 years ago
Matt Jankowski 41b79ae693 Clean up about page (#1282)
8 years ago
Matt Jankowski 27ab3d3d36 Ignore implied formats for catch all route requests (#1340)
8 years ago
Eugen 0cec9862db Add env variable to disable prepared statements (#1293)
8 years ago
Ash Furrow 90101a724c Allows setting log level in env variable (#1290)
8 years ago
Eugen b532134503 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
8 years ago
Thomas Citharel a9863c1708 Update french translation (#1148)
8 years ago
Sebastian Hübner 201019e2c3 Fixed two translation errors (#1139)
8 years ago
Korbinian 58fcc553f3 Update simple_form.de.yml (#971)
8 years ago
Jantso Porali 3c063ae050 Updated about page in Finnish language (#1170)
8 years ago
Olivier Humbert 10a0055a2a French translation update (#1188)
8 years ago
Shel R 3b9a56d4b3 Merge branch 'master' into master
8 years ago
Chad Pytel 1a82d2bde6 Use I18n for media attachment validation errors
8 years ago
Eugen ef7240169a Merge branch 'master' into feature-customized-default-locale
8 years ago
Jantso Porali fb0ce9d38d Update Finnish translations, add sample Minio config (#954)
8 years ago
Eugen Rochko 9bb84337a7 Allow setting of default language through config
8 years ago
Eugen 1781fcaea4 Force UTF8 encoding on generated XML (#1140)
8 years ago
André Lewin 783de713cd Merge branch 'master' into master
8 years ago
Eugen Rochko 06e3d9bdd8 Make sure Rabl is using Oj
8 years ago
Jantso Porali 5c414eeb45 updated blocking translation
8 years ago