699 Commits (ef29596d2da4f53fe3ecf0418d2b7b5d076bed92)

Author SHA1 Message Date
Ash Furrow 9b1a881d40 Removes timestamp from URLs. (#2185)
8 years ago
Miguel Jacq 2d94636b58 Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180)
8 years ago
alpaca-tc e40ea6cd9d Extract error messages to locale file (#2162)
8 years ago
Alex Dunn 06581631e8 capistrano: link robots.txt (#1576)
8 years ago
tmyt 2e1e061f24 Make configuarable s3_permissions for paperclip (#2139)
8 years ago
Yamagishi Kazutoshi a3358f438f Change to switch signature version for Amazon S3 (#2124)
8 years ago
Matt Jankowski 9a8134cea6 Restful refactor of accounts/ routes (#2133)
8 years ago
Isao Sugimoto 0961123c71 update simple_form.ja.yml (follow for #1991) (#2113)
8 years ago
Isao Sugimoto 6b86990443 update ja.yml (follow for #2106) (#2109)
8 years ago
Michel a4932b04b1 Update fr.yml (#2107)
8 years ago
Eugen 64c57b7465 Fix wording on admin instances view, fix typos in language detector spec (#2106)
8 years ago
Eugen 21816d08ec Fix #1642, fix #1912 - Dictate content-type file extension (#2078)
8 years ago
Isao Sugimoto f927f88ccb missing translate ja.yml (#2100)
8 years ago
Eugen e47b32072f Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079)
8 years ago
Matt Jankowski ce5cb2b81c Instances list in admin (#2095)
8 years ago
Matt Jankowski 4b6be67e85 Admin reports with accounts (#2092)
8 years ago
Olivier Humbert e26e32e5ae French translation update (#2063)
8 years ago
Koala Yeung 370d291081 Add Occitan (oc) translation (#2077)
8 years ago
Ratmir Karabut a62a622304 Update Russian translation (#1967)
8 years ago
Eugen Rochko 336fd904db Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
8 years ago
jeroenpraat 4cc1317571 Updated, improved and fixed Dutch language strings (#2030)
8 years ago
spf 7abb3b1b2e French i18n-tasks missing fr (#2018)
8 years ago
Matt Jankowski fd9d43b6e2 Improve handling of HTTP_ACCEPT for webfinger (#2008)
8 years ago
IWAI, Masaharu 4aa75b310a Update Japanese translation (#1993)
8 years ago
Brad Urani 3a41fe76a3 Open sidekiq and pghero admin pages in new browser tabs (#1596)
8 years ago
Patrick Figel 2fb1f07888 Add gif auto-play/pause preference
8 years ago
Miguel Jacq 609fe68e7b Allow using an SMTP server without authentication (#1597)
8 years ago
Hugo Gameiro 70d72e33cb Add Brazilian Portuguese and fix European Portuguese (#1966)
8 years ago
May Kittens Devour Your Soul 9191c664da Create hr.jsx (#1945)
8 years ago
Toshiyuki Takahashi 0e062ce3a7 Improved Japanese translation in ja.yml (#1981)
8 years ago
Ingo Blechschmidt a86f63aada Fix tiny typo (#1956)
8 years ago
Yamagishi Kazutoshi aed7a3f11e Fix minor typo in Japanese translation "保村" -> "保存" (#1968)
8 years ago
Toshiyuki Takahashi 6acfe86c0f Improved Japanese translation in devise.ja.yml (#1969)
8 years ago
Matt Jankowski ff42193176 Remove unused registrations: key from PT yml locale (#1952)
8 years ago
Matt Jankowski fff8d92577 I18n health warnings (#1949)
8 years ago
oliverkeeble 2adf65292c Fix translation of 'reblogged' in eo.yml (#1942)
8 years ago
Eduardo Elias a6beb78146 Add missing keys to PT locale (#1941)
8 years ago
Kazuhiro NISHIYAMA 5f019cf675 Add missing Japanese translations (#1923)
8 years ago
Eduardo Elias 53632f945b Improve PT locale on simple_form (#1917)
8 years ago
Matt Jankowski 798e2b328a Fix yaml issue in ja locale (#1916)
8 years ago
George Hattori 0418a1bd2d Improve Japanese translation (#1909)
8 years ago
新都心(Neet Shin) 8f7fed77ed Update Japanese Translate (#1903)
8 years ago
Alex Dunn 58c16ea3a4 lock capistrano to 3.8.0 (#1890)
8 years ago
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
Jantso Porali 16d14e854b updated two-way auth and preferences translation
8 years ago
Jantso Porali d49612327a updated translation for about page
8 years ago
JantsoP c0295924bc Merge branch 'master' into master
8 years ago
JantsoP c33a8ce307 updated reblog to boost translation
8 years ago
JantsoP 7ea7713997 udpdated display_name translation
8 years ago
JantsoP b97a8236fb updated reblog translation
8 years ago
Eugen Rochko d9f1e07c6c Fix spec
8 years ago
Eugen 05de364fbc Merge pull request #863 from Eychics/master
8 years ago
Eugen c571ed77d7 Merge pull request #818 from JantsoP/master
8 years ago
Eugen cc82f3adff Merge pull request #866 from kklleemm/patch-1
8 years ago
Eugen 45c3772ddb Merge pull request #792 from chapeaumeinfreund/master
8 years ago
Eugen 27b758f328 Merge pull request #790 from chapeaumeinfreund/patch-1
8 years ago
Eugen 4751381a24 Merge pull request #852 from peterkeen/email-whitelist-817
8 years ago
Eugen 2f7da4167f Merge pull request #805 from nevillepark/master
8 years ago
Clément D ba8744d0a7 Fix typos on french translations
8 years ago
Thibaut (Eychics) 6afd3a6eab Add closed_registrations message on French language
8 years ago
Pete Keen f28fcf9080 [#817] Add email whitelist
8 years ago
Eugen Rochko 353a30810c New admin setting: open/close registrations, with custom message, from the admin UI
8 years ago
JantsoP 0c0e1c2519 Merge branch 'master' into master
8 years ago
JantsoP 0c0acb22e6 updated translation
8 years ago
Neville Park 7b297cc6d2 Changed "reblogs" to "boosts"
8 years ago
axolotl d6d192c914 added Esperanto (eo)
8 years ago
Eugen Rochko c23ef9a706 Fix norwegian translation being malformed
8 years ago
Korbinian ce9bb73e96 Updated and fixed orthography
8 years ago
Korbinian b8324b3aed Updated and fixed german orthography
8 years ago
Eugen Rochko 6ebe31e716 Make default admin UI page reports. Add admin UI for creating a domain block
8 years ago
Christopher Kolstad c1f52eaff1 Add Norwegian locale
8 years ago
JantsoP e74a4efa20 another typo. fuck me
8 years ago
JantsoP 54db5aa06c fixed an sneaky peaky tpy
8 years ago
JantsoP bed61b7cc4 add finnish translation
8 years ago
JantsoP aa77d63da9 add finnish translation
8 years ago
JantsoP 35ad63910d Merge branch 'master' into master
8 years ago
JantsoP 1c84f62d6d add finnish translation
8 years ago
JantsoP cbff9a2e15 finnish translation
8 years ago
JantsoP 5045c23636 updated final translation
8 years ago
JantsoP 7606beb4dd Create new translation file
8 years ago
Angristan 38bf31d425 Improve french translation
8 years ago
Valentin Lorentz 7d5921dd5c Improve French translation
8 years ago
Eugen 720922cd13 Merge pull request #746 from eramdam/feature/improve-french-locales
8 years ago
Damien Erambert 066b904205 Fix typo in simple_form.fr.yml
8 years ago
Damien Erambert b7554089cb Improve translation of data import in fr.yml
8 years ago
Damien Erambert 6162adec16 Better translation for revoked token in doorkeeper.fr.yml
8 years ago
Damien Erambert 53e0834cf4 Fix date format in doorkeeper.fr.yml
8 years ago
Eugen 0335a52e28 Merge pull request #741 from eramdam/feature/improve-french-locales
8 years ago
Eugen Rochko 00e99e58db Add proper error page for request timeouts
8 years ago
Damien Erambert 180edd4baa Add locale in devise.fr.yml
8 years ago
Damien Erambert 9ba1d01fe4 Add french translation for "scopes" in doorkeeper.fr.yml
8 years ago
Damien Erambert cfc96a619c Fix small typo in doorkeeper.fr.yml
8 years ago
Damien Erambert ef1c4de714 Complete localization of in simple_form.fr.yml
8 years ago
Damien Erambert b256d43b14 Improve french locales on the backend (WIP)
8 years ago
Eugen Rochko be9accbacc Fix #700 - hide spoilers on static pages
8 years ago
Eugen Rochko 244da78105 Import feature for following/blocking lists (addresses #62, #177, #201, #454)
8 years ago
Eugen Rochko 74fb333eb7 Fix up some localizations
8 years ago
leopku 58c9d97d07 🌐 add simplified chinese language
8 years ago
leopku e4205b09d1 🚧 chinese translation WIP
8 years ago
leopku 017e3b7da8 🌐 add chinese language file
8 years ago
leopku 11f8faa6ba 🔧 S3 protocol from ENV
8 years ago
Eugen Rochko b3cb765a94 Prettier account and stream entry URLs
8 years ago
Eugen Rochko 3893f75a51 New API method: /api/v1/search
8 years ago
Eugen Rochko 8785e271bf Improved landing page
8 years ago
Eugen Rochko 47c74efa85 Add landing strip
8 years ago
Eugen Rochko b339e488fe Export follow/block lists as CSV
8 years ago
Eugen Rochko a19062b726 Federate header images, fix open-uri http->https redirection error
8 years ago
shel 5c7b222769 Promote Apps (#670)
8 years ago
Eugen Rochko c97f817e40 Fix #525 - Add instance information API
8 years ago
Eugen 6599b27b2b Merge branch 'master' into mastodon-site-api
8 years ago
Eugen Rochko 453d65e6da Obfuscate filenames better, double rate limits
8 years ago
Eugen Rochko 250beb1971 Revert earlier fix due to new bug reports
8 years ago
Eugen Rochko 65b49d95b7 Make the paperclip filename interpolator smarter about the :original style
8 years ago
Eugen Rochko c911ade272 Detect videos with no sound, handle them like gifv
8 years ago
Eugen Rochko d1e1f26878 Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies
8 years ago
Eugen Rochko 4b93cf88e5 Fix #431 - convert gif to webm during upload. Web UI treats them like it did
8 years ago
Eugen Rochko 0cb5a2a0a7 Add digest e-mails
8 years ago
Kit Redgrave 4554ccd5d0 Mute button progress so far. WIP, doesn't entirely work correctly.
8 years ago
Kibigo b39356835b Adds site metadata access to the API
8 years ago
Eugen Rochko a741049a77 Fix #104 - Style OAuth authorized applications page
8 years ago
Eugen Rochko 75d5dc1df8 Improve glow
8 years ago
Eugen Rochko 7f9d6d0160 Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments
8 years ago
Eugen Rochko 0613d66df8 Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report
8 years ago
Eugen Rochko 6917e53fe0 Adding index overview for reports in admin UI
8 years ago
Eugen Rochko 0fe2cc37ee Expose Link headers via CORS
8 years ago
Eugen Rochko 513a78d67b Fix admin UI for accounts somewhat
8 years ago
Eugen Rochko 2cc31b3194 Adding POST /api/v1/reports API, and a UI for submitting reports
8 years ago
Eugen Rochko a83dc927d8 Fix #587 - Display TOTP secret next to QR code
8 years ago
Eugen Rochko 03ce24d3bf Update service timeout setting from 15s to 90s
8 years ago
Eugen Rochko f9f8f52fe9 Stop trying to shoehorn all Salmon updates into the poor database-connected
8 years ago
Eugen Rochko 32580cc661 Site title is now a setting
8 years ago
shel 3f854bd75c Add link to other instances text
8 years ago
Eugen 7037774d6e Merge pull request #603 from evanminto/activitypub-account
8 years ago
Eugen Rochko b1f2683ecc Add API modifiers to limit returned toots from public/hashtag timelines
8 years ago
Evan Minto db7affbf5b Reuse existing controller and route
8 years ago
Eugen Rochko 2f126b1225 Removing failed push notification API, make context loads use cache
8 years ago
Eugen Rochko efa4065029 Preheat status cache
8 years ago
Evan Minto e02bfd0aa2 Remove unnecessary leftover code
8 years ago
Evan Minto b56d24ed71 Add an account endpoint for ActivityPub and link to it on HTML profile pages
8 years ago
Eugen Rochko 9bd2b6be86 Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
8 years ago
Eugen Rochko 727d236fcc Cleaning up format of broadcast real-time messages, removing
8 years ago
Eugen Rochko 1e89e8e74d Looks like log level :debug is required for activerecord times to be tracked
8 years ago
Eugen Rochko 8f9729ec2d Fix activerecord logging in production
8 years ago
Eugen Rochko 38b7551359 Add "open in web" link to detailed public status pages
8 years ago
Eugen Rochko 28e528bfcb Add capistrano to development environment
8 years ago
Eugen Rochko 9327d05bf7 API for apps to register for push notifications
8 years ago
Eugen Rochko c58da52e9f Split 2FA login into two prompts
8 years ago
Eugen Rochko 557de8e24c Update settings to re-use admin layout, one big navigation tree, improve settings forms
8 years ago
Eugen Rochko 0bf8c1b5d8 Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled)
8 years ago
Eugen Rochko 9b8670c939 Added optional two-factor authentication
8 years ago
Eugen Rochko 8008b60324 Fix key names in statsd
8 years ago