aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,628 Commits
135 Branches
281 Tags
1.1 GiB
Commit Graph

2559 Commits (235a4cfdc8b20a9763052eeb034c33f36fe4576a)

Author SHA1 Message Date
Ratmir Karabut af7e880df5 Update Russian translation () 
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error
Svetlozar Todorov aa7bf1515c Fix - Add localization for Bulgarian () 
* 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
Matt Jankowski 137100dcf3 Clean up well-known routes/controllers () 
* 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
Matt Jankowski 3a9eb81a80 Admin accounts controller cleanup () 
* 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
Thor Harald Johansen ccaf3dbc5a Adjustments to the Norwegian translation () 
* Working translation for Norwegian.

* Fixes to Norwegian translation.

* Further adjustments to Norwegian translation.

* Further adjustments to Norwegian translation.
lindwurm 9966bd27c2 [l10n] ja: Improve Japanese Translations () 
* ja: about: Fix highlighting
* ja: Update Translations
* ja: Translate admin settings

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
pinfort 38e24a699b fix Japanese translation () 
* 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

* 文字化け修正
Manato Kameya bf3e56b8ad Fix incorrect notation in simple_form.ja.yml ()
CgX e32edd247f Update fr.yml () 
Mistake on %{link} variable
Matt Jankowski c44a700252 Quick best practice cleanup of views/helpers () 
* Remove trailing whitespace

* Use query methods instead of explicit .blank? checks
Matt Jankowski 7f0a865b05 Allow import/export of mutes list () 
* Allow export of mutes list

* Allow importing of mutes list

* Refactor to use Settings::Exports::BaseController and DRY up exports code
Carlos A. Escobar 3064ef96a1 Added missing Spanish translations strings () 
* Added missing Spanish translations strings

* fix bad translation

* resolve conflict with tootsuite/master

* agreements from spanish community

* Add some missing strings
Thomas Citharel d90d23699c Make Reporting admin section translatable () 
* 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>
Thor Harald Johansen 1f5ff46fd9 Working translation for Norwegian. ()
Matt Jankowski b352a8e5d4 Default to json type for webfinger requests ()
Koala Yeung 24eb45425e Add Traditional Chinese, Hong Kong translation (zh-HK) () 
* 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.
Eugen 40bdf43297 Change default log level in production from :debug to :info for less I/O ()
Eugen 5cdd2c2414 Fix - set a wrong default on :openssl_verify_mode ()
Matt Jankowski 3ddd936b03 Refactor exports controller () 
* 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
Thomas Citharel 327a6e166f Update french locale () 
* 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>
pinfort 6f5268b02d Add Japanese translation () 
* 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
jukper 4964433190 Revised finnish translation ()
Jantso Porali 9e3c4fd2d7 Update language files () 
* 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 

See issue 

* update translation for issue 

see issue
Eugen Rochko 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
blackle 06444bf050 Allow user to disable the boost confirm dialog in preferences
Yann GUERN a85d4473aa Avoid user enumeration with devise paranoid mode ()
Matt Jankowski 4ada50985a Pagination improvements () 
* 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
Matt Jankowski 64dbde0dbf Version bumps for ruby and misc gems () 
* 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
Alexander Mankuta 0dbbc16c69 More SMTP customization () 
* 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
Ratmir Karabut 9043b32183 Add Russian translation (ru) () 
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency
R Tucker 8bfdbf0aa6 Add comment to settings.yml to nudge admins towards editing values via Web UI () 
* 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)
David Celis d4fe6cd2bf Allow users to update their Account in the API () 
* 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>
Olivier Humbert 082bef3027 French translation update () 
* 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)
spf e6b48a7048 French typo () 
* French typo

* Datetime french translation
Matt Jankowski e5282e4ec0 Clean up about page () 
* Add InstancePresenter to expose site details

* Clean up about controller, use instance presenter
Matt Jankowski 71706f21c2 Ignore implied formats for catch all route requests () 
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.
Eugen d5a675099a Add env variable to disable prepared statements ()
Ash Furrow c3e7bac1cc Allows setting log level in env variable () 
* Allows setting log level in env variable.

* Made changes based on feedback in .
Eugen 9acdb166e8 Fix , fix , fix - 2FA requires confirmation to be enabled () 
* Fix , fix , fix  - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled

* Clean up
Thomas Citharel 41f8fde83e Update french translation () 
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>
Sebastian Hübner f860eb7d71 Fixed two translation errors () 
Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx
Korbinian 8f9a11b642 Update simple_form.de.yml ()
Jantso Porali 01d8003867 Updated about page in Finnish language () 
* 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
Olivier Humbert ed3dfd0bee French translation update () 
* Update fr.yml

one typo fix

* Update simple_form.fr.yml

one translation consistency
Shel R fef478781d Merge branch 'master' into master
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.
Eugen 0adee18d73 Merge branch 'master' into feature-customized-default-locale
Jantso Porali 786e6f94b9 Update Finnish translations, add sample Minio config ()
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
Eugen 1c351709bc Force UTF8 encoding on generated XML ()
André Lewin bf7cefa516 Merge branch 'master' into master
Eugen Rochko 29ffe1cad3 Make sure Rabl is using Oj
Jantso Porali 837030db98 updated blocking translation
Jantso Porali deb001bba8 updated two-way auth and preferences translation
Jantso Porali d3bf0307db updated translation for about page
JantsoP 20b53e6add Merge branch 'master' into master
JantsoP 3ec221d3b7 updated reblog to boost translation 
Since it is that :D
JantsoP 473e4f7813 udpdated display_name translation
JantsoP b845ef395d updated reblog translation
Eugen Rochko 667ffafef8 Fix spec
Eugen 086a88f3bb Merge pull request from Eychics/master 
Add closed_registrations message on French language
Eugen e76dd52b08 Merge pull request from JantsoP/master 
Updated Finnish Translation
Eugen c12214963e Merge pull request from kklleemm/patch-1 
Fix typos on french translations
Eugen aa8dacbc8a Merge pull request from chapeaumeinfreund/master 
Updated and fixed german orthography
Eugen ce524cbb49 Merge pull request from chapeaumeinfreund/patch-1 
Updated and fixed german orthography
Eugen 117b22e905 Merge pull request from peterkeen/email-whitelist-817 
[] Add email whitelist
Eugen 57466d542b Merge pull request from nevillepark/master 
Changed "reblogs" to "boosts"
Clément D 350958babf Fix typos on french translations
Thibaut (Eychics) 9a5d6e9715 Add closed_registrations message on French language
Pete Keen e9a6da6bc7 [] Add email whitelist 
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.

Fixes
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI
JantsoP db4a41cf58 Merge branch 'master' into master
JantsoP dc89fc17cc updated translation
Neville Park ce1ca28594 Changed "reblogs" to "boosts"
axolotl 0700521ef3 added Esperanto (eo)
Eugen Rochko 98a93aa07e Fix norwegian translation being malformed
Korbinian ec8029a955 Updated and fixed orthography
Korbinian 7dd5ba42a3 Updated and fixed german orthography
Eugen Rochko b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block
Christopher Kolstad 5cb011b66b Add Norwegian locale
JantsoP 65d667dc6c another typo. fuck me
JantsoP d3fde60297 fixed an sneaky peaky tpy
JantsoP 85a8b62ca2 add finnish translation 
add finnish translation
JantsoP 97803600ed add finnish translation 
add finnish translation
JantsoP bfa99981e5 Merge branch 'master' into master
JantsoP 6501ffdadc add finnish translation 
add finnish translation
JantsoP b0f4c9b91f finnish translation 
finnish translation
JantsoP f9b4f30de6 updated final translation 
updated final translation
JantsoP 87854745e9 Create new translation file 
Still in progress. Should be done shortly
Angristan c97fc5c1f4 Improve french translation
Valentin Lorentz fbcba65f81 Improve French translation 
Fix typos and typography. Make vocabulary and grammar more uniform.
Eugen 61894582b8 Merge pull request from eramdam/feature/improve-french-locales 
Feature/improve french locales (again)
Damien Erambert 71cf9d0608 Fix typo in simple_form.fr.yml
Damien Erambert 5e45982ed9 Improve translation of data import in fr.yml
Damien Erambert b829460b4a Better translation for revoked token in doorkeeper.fr.yml
Damien Erambert 65e6a00817 Fix date format in doorkeeper.fr.yml
Eugen 48cb2dccd2 Merge pull request from eramdam/feature/improve-french-locales 
Improve/add some French locales
Eugen Rochko 5b12624847 Add proper error page for request timeouts
Damien Erambert cb1989cbd8 Add locale in devise.fr.yml
Damien Erambert 03d676faa8 Add french translation for "scopes" in doorkeeper.fr.yml
Damien Erambert 9e26af264e Fix small typo in doorkeeper.fr.yml
Damien Erambert f9f6098e22 Complete localization of in simple_form.fr.yml
Damien Erambert 2c881e6717 Improve french locales on the backend (WIP)
Eugen Rochko 5e26295e06 Fix - hide spoilers on static pages
Eugen Rochko e8875c6046 Import feature for following/blocking lists (addresses , , , )
Eugen Rochko f864fee116 Fix up some localizations
leopku d5d5afff9c 🌐 add simplified chinese language
leopku fc9bbdfd34 🚧 chinese translation WIP
leopku 349c6cfa2b 🌐 add chinese language file
leopku c46843c65c 🔧 S3 protocol from ENV 
add support for reading S3 protocol from ENV
also add S3_HOSTNAME in .env.production.sample
Eugen Rochko d6ed2eb512 Prettier account and stream entry URLs
Eugen Rochko 05cf086766 New API method: /api/v1/search 
Returns accounts, statuses, hashtags arrays
Eugen Rochko 8803ca9efe Improved landing page
Eugen Rochko 6b1db5c2b2 Add landing strip
Eugen Rochko 56d998cbdb Export follow/block lists as CSV
Eugen Rochko 2816b1bf8e Federate header images, fix open-uri http->https redirection error
shel 38dceb3bf7 Promote Apps () 
"Various apps are available" is now a hyperlink
Eugen Rochko 6be7bde243 Fix - Add instance information API
Eugen e245115f47 Merge branch 'master' into mastodon-site-api
Eugen Rochko 02349b3269 Obfuscate filenames better, double rate limits
Eugen Rochko 1fb3e8988b Revert earlier fix due to new bug reports
Eugen Rochko ebc01bf0f6 Make the paperclip filename interpolator smarter about the :original style 
If an :original gets converted into another format, it would get saved as
original_filename *anyway*, so generating the extension is pointless and
yields bad results for when you change the style definition later. This way,
old gifs will still have correct URLs
Eugen Rochko 85fce04d1b Detect videos with no sound, handle them like gifv
Eugen Rochko 5f4e402204 Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies 
Redirect /:username to /users/:username
Redirect /:username/:id to /users/:username/updates/:id
Updated API documentation and sponsors
Eugen Rochko caf5b8e975 Fix - convert gif to webm during upload. Web UI treats them like it did 
before. In the API, attachments now can be either image, video or gifv. Gifv
is to be treated like images in terms of behaviour, but are videos by file
type.
Eugen Rochko 6b81d10030 Add digest e-mails
Kit Redgrave 442fdbfc53 Mute button progress so far. WIP, doesn't entirely work correctly.
Kibigo 620f70e42c Adds site metadata access to the API
Eugen Rochko 175a9b9caa Fix - Style OAuth authorized applications page 
Add ability to search accounts by display name
Eugen Rochko 9d4cad6307 Improve glow
Eugen Rochko 8132cf8153 Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments 
Make replies default to privacy settings of the status being replied to
Eugen Rochko d0f087db2d Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report
Eugen Rochko 24ba7c9762 Adding index overview for reports in admin UI
Eugen Rochko ff49649130 Expose Link headers via CORS
Eugen Rochko 5426f06ac2 Fix admin UI for accounts somewhat
Eugen Rochko 3b81baaaaf Adding POST /api/v1/reports API, and a UI for submitting reports
Eugen Rochko 63886bdc59 Fix - Display TOTP secret next to QR code
Eugen Rochko 138d21aea8 Update service timeout setting from 15s to 90s
Eugen Rochko 0518492158 Stop trying to shoehorn all Salmon updates into the poor database-connected 
StreamEntry model. Simply render Salmon slaps as they are needed
Eugen Rochko d2619e0b53 Site title is now a setting
shel 2d6f603c2b Add link to other instances text 
Text for link to other instances
Eugen 9d5fb49cd8 Merge pull request from evanminto/activitypub-account 
Expose ActivityStreams 2.0 representation of accounts
Eugen Rochko 347a153b3d Add API modifiers to limit returned toots from public/hashtag timelines 
to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen
Evan Minto 94e213c6c1 Reuse existing controller and route
Eugen Rochko 77e13c2bc9 Removing failed push notification API, make context loads use cache
Eugen Rochko 19b9e1e2c3 Preheat status cache
Evan Minto 8bd8ea7c04 Remove unnecessary leftover code
Evan Minto e2fbf8bc74 Add an account endpoint for ActivityPub and link to it on HTML profile pages
Eugen Rochko ccb8ac8573 Make the streaming API also handle websockets (because trying to get the browser EventSource interface to 
work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.
Eugen Rochko d9ca46b464 Cleaning up format of broadcast real-time messages, removing 
redis-backed "mentions" timeline as redundant (given notifications)
Eugen Rochko 1da0ce5c7c Looks like log level :debug is required for activerecord times to be tracked
Eugen Rochko 65402d9c09 Fix activerecord logging in production
Eugen Rochko c2fbd144cf Add "open in web" link to detailed public status pages
Eugen Rochko a2a85e8549 Add capistrano to development environment
Eugen Rochko 3f075c7794 API for apps to register for push notifications
Eugen Rochko 23b997ae55 Split 2FA login into two prompts
Eugen Rochko f4bc9620a9 Update settings to re-use admin layout, one big navigation tree, improve settings forms
Eugen Rochko 76e970c856 Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled) 
Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit
Eugen Rochko ba192f12e3 Added optional two-factor authentication
Eugen Rochko f6a5977f0b Fix key names in statsd
Eugen Rochko d567f21d4f Improve StatsD instrumentation
Eugen Rochko 7329fbd8a4 Fix up timeout, improve contrast on "show more", add responsive style 
for extremely wide monitors
Eugen Rochko cc5c1e5feb Removed accidental n+1 query from notifications, updated some deps, 
improved how "show more" link looks
Effy Elden 07b9a10d4d Add redirect for /admin => /admin/settings
Eugen Rochko 999cde94a6 Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text 
Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations
Eugen Rochko f392030ab8 Add /api/v1/notifications/clear, non-existing link cards for statuses will 
now return empty hash instead of throwing a 404 error. When following,
merge into timeline will filter statuses
Eugen 956da43e19 Fix error
Eugen Rochko 61aee0006e Override Rack::Request to use the same trusted proxy settings as Rails
Eugen Rochko 67befe5463 Allow to specify trusted proxies through env
Eugen Rochko e028406db4 Fix code style
Eugen Rochko d72dd38c13 Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master
Eugen Rochko 3a4b5961be Method to fetch a single notification
Effy Elden 5fef55c11a Set remote dev environments to use letter_opener_web, add default .env.vagrant variables
Eugen Rochko f0de621e76 Fix - Fetch and display previews of URLs using OpenGraph tags
Eugen Rochko f051c2e813 Fix statsd null backend not being initialized properly
Eugen Rochko 306eb6e9c9 Add optional StatsD performance tracking
Eugen Rochko fcb5a85cdd Add sounds for notifications. Boop by @jk@mastodon.social
Effy Elden ab4f5f5da5 Add Heroku deployment support
Eugen 16f9490d33 Merge pull request from ineffyble/fix-paperclip-s3-acl 
Fix S3 default settings
Eugen Rochko e9737c2235 Fix tests, add applications to eager loading/cache for statuses, fix 
application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from  until it's consistent with non-animated version
Effy Elden a097dd489b Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
Effy Elden e45fed58cb Add a textual 'Back to Mastodon' link in footer of settings pages
Eugen Rochko c01dd089ff Adding about/more page with extended information that can be set up by an admin
Eugen Rochko e25170f960 Add extended about page stub
Eugen Rochko b11fdc3ae3 Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings 
with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage
Eugen 4292cf60ae Fix env variable name
Eugen Rochko 75f80bef10 Persist UI settings, add missing localizations for German
Eugen Rochko 2e71bb031b Fix Paperclip timeout setting. Fix bug introduced in
Eugen Rochko 7ddec6e7c3 Add read timeout to paperclip when it's downloading remote images
Jessica Stokes bb033c1d37
"Reblog" -> "boost" in more places 
A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI
Eugen Rochko 2b0b7ff1b8 Fix - /web now loads a page
Eugen Rochko 8f47f6a7ec Adding remote follow button
Eugen Rochko a302e56f9a Add API for retrieving favourites
Eugen Rochko 49834a6e7f Add API for retrieving blocked accounts
Eugen Rochko d7dc84439c Add ability to use remote follow function on other sites
Eugen Rochko eca6110fc4 Add preferences for follow request notification e-mails
Eugen Rochko 2146ac91a0 Follow requests send e-mail notifications, but are excluded from notifications API 
Better initial state for unlisted/nsfw toggles
Eugen Rochko 3689c119f0 Replacing follow requests in the settings area with in-UI column
Eugen Rochko 004382e4d0 Adding follow requests API
Eugen Rochko b302b9202b Add page for authorizing/rejecting follow requests
Eugen Rochko 3c841c7306 Adjust wording
Eugen Rochko 05b13c38b5 Re-enable Webfinger for locked accounts but don't handle "follow" events 
coming in via Salmon.

Currently no way to prevent remote follows, but they will only receive public
and unlisted posts
Eugen Rochko b891a81008 Follow call on locked account creates follow request instead 
Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts
Eugen Rochko 2d2154ba75 Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users
Eugen Rochko 6d71044c85 Don't use rack timeout in any but production environments
Eugen Rochko e09d3a2c66 Fix - use window.location hack to let people login from sandboxed iOS homescreen
Eugen 6b67b55cee Merge pull request from victorhck/master 
added two missings spanish  translations
Eugen Rochko 5ae1b39ec9 Adjusting public display of statuses to look similar to logged-in UI, 
fix  with rich OEmbed display via iframe, fix  by hiding sensitive
content behind a spoiler on public pages
Eugen Rochko aed25932b5 Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails
Eugen Rochko 6de079a5af Removing external hub completely, fix fixing digit-only hashtags, 
removing web app capability from non-webapp pages
victorhck f5c8d64b6d added to missings spanish translations
Eugen Rochko 76ec907993 Improved admin UI
Eugen Rochko 0c491ea928 Fix translations
Stanislav Makar d2ab41aea4 Declare Ukrainian 
Closes:
Vladyslav 2c6c912076 Fix some translation errors.
Vladyslav d85c566960 Final steps for Ukrainian translation
Eugen Rochko 8b93f45f3d Fix paperclip config
Eugen Rochko f114bc7bb7 Update Paperclip config to allow plugging in Minio instead of AWS
Eugen Rochko f978b06dd1 Add suspend account functionality to admin UI
Eugen Rochko 1357c1cb3d Add single user mode
Eugen a910cdd54d Merge pull request from stamak/uk.yml 
Add Ukrainian localization file uk.yml
Stanislav Makar 0e18bbe3e2 Add Ukrainian localization file uk.yml 
Closes:
Eugen Rochko b362de2232 Adding configurable e-mail blacklist
Eugen Rochko 9d9f796130 Adding more to admin accounts UI
Eugen Rochko f763e844e8 Do not use expiring links after all
Eugen Rochko 80c44ed9c1 Do not autoplay videos, display play button instead. Use expiring links when using S3. Do not keep originals 
for avatars/headers, resize avatars down to 120x120 instead of 300x300. Set cache headers on S3 stuff, also
make it private (aka only accessible via expiring links to prevent hotlinking)
Eugen Rochko 290ffb63cd Fix cloudfront config
Eugen Rochko d3bd10dfe4 Add Cloudfront support
Stanislav Makar ea91286aaa Add Ukrainian localization file doorkeeper.uk.yml 
Closes:
Andrea Faulds 1c1102008f Fix line endings for Portuguese locale
Eugen Rochko 1d0321fc45 Fix pt translations, improve pre-cache queries, removing will_paginate 
from accounts/tags because it's a terribly inefficient way to paginate
large sets of data
unsmell 66e55d60e1 Create pt localisation files in /config/locales/
Eugen Rochko 6ff93845d5 Add basic OEmbed provider API, fix
Eugen Rochko 14bd46946d Per-status control for unlisted mode, also federation for unlisted mode 
Fix , fix
Eugen Rochko 356d3874eb Normalize localizations, add stub for admin/accounts
Eugen Rochko 5973ca3d11 Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars
Eugen Rochko cc70f28f19 Adding rack timeout of 30sec, PuSH jobs moved to push queue so they 
can be processed separately
Eugen Rochko c0555f2db6 Don't rate-limit PuSH endpoints
Eugen Rochko 4e351baf88 Fix URLs in inline-rendered XML
Eugen 41ef277da3 Fix URLs in ApplicationController.renderer
Eugen Rochko 27fc49d745 Add simple admin overview of PuSH subscriptions
Eugen Rochko 66ab0d0d56 Enabling portuguese and hungarian translations, which are awfully incomplete
Eugen Rochko 2d2c81765b Adding embedded PuSH server
Eugen 26287b6e7d Merge pull request from kodacs/master 
Hungarian translation for Mastodon.
Eugen Rochko 6c82dfcf5f Fix CDN_HOST variable requirement
Eugen Rochko dda9ac9222 Fix reset date format when rate limited
kodacs b503a5e05e fix missing i18n item
kodacs 7bd559158b fixing yamls for
kodacs 6586408c69 fix
nicolas 959e4b8198 Merge branch 'master' into french-translation
nicolas 9bb885805c Update simple_form.fr.yml
Eugen Rochko 1ff0d5aea6 Normalized locale files
Eugen 1c9e21a507 Merge pull request from nclm/french-translation 
French localisation update
Eugen Rochko 71401659b8 Fix - Options to block notifications from people you don't follow/who don't follow you
kodacs eb3a12bba6 Server side HU translation + Toot fix.
nicolas d0122045f4 Update simple_form.fr.yml
nicolas 4cc6684881 Update fr.yml
Eugen Rochko 8efa081f21 Remove Neo4J
Eugen Rochko 8e34bed7cc Mini Profiler not working well, remove it
Eugen Rochko 4f1d863615 Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users
nicolas 23677bc51e Merge branch 'master' into french-translation
nicolas 1e95fbb10b Update doorkeeper.fr.yml 
e
nicolas 94f96a6e85 Update doorkeeper.fr.yml
Eugen Rochko fc90d38893 Moving some counter queries out of subqueries in the API
Eugen Rochko 4a422650bb Fix broken locales
nicolas 82cb34916a Update fr.yml
nicolas ba4c03de71 Update simple_form.fr.yml 
silenced mode + edits
nicolas 89dab7c534 Merging code updates (Unlisted Mode)
Eugen Rochko 1788164352 Local accounts can control "silenced" attribute which removes them from public timeline
nicolas 64cfbbcc55 Adding French locale
nicolas 46d9076e99 Importing doorkeeper.fr.yml 
From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml
nicolas 12e9f789ab Importing devise.fr.yml 
From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013
Eugen Rochko 7944ed6fe5 Adding option to specify asset server, filter followers query by local accounts 
during Fan Out On Write to load less stuff into memory
nicolas a3afea7b9d First version for simple_form.fr.yml
nicolas fc87243c39 First version for fr.yml
nicolas 05823c325c Create devise.fr.yml
nicolas 753115ff57 Create doorkeeper.fr.yml
nicolas 8504110d45 Create simple_form.fr.yml
nicolas e9980a9b8b Create fr.yml
Eugen Rochko db58235930 Fixes for the Spanish translation
Eugen Rochko 38dd85daab Adding notifications column
Eugen Rochko da2ef4d676 Adding unified streamable notifications
Victorhck c12125e6b5 improvements in text made by Ekaitz
Victorhck 0b48973733 fix typos, and suggestions made by Ekaitz
Eugen Rochko 8977fde8ed Fix up Spanish translations
Victorhck d68750d7dc Finished spanish translation config files
Eugen 93e47c7135 Fix wrong language declaration
Eugen 5cda7f6bbb Fix wrong language declaration
victorhck a6ed09441c finished spanish translation config files
Eugen Rochko c7a1b78536 Activating Spanish i18n
Victorhck 367b05d733 Spanish translation for devise.es.yml
Victorhck a05fe70c24 finished spanish translation for es.yml
victorhck 084668c170 started sp translations config locales
Eugen Rochko 85d1b74ac3 Adding german localization
Eugen Rochko 116ab27e08 i18n for devise mailer too
Eugen Rochko 2c766bd4b4 Add user locale setting
Eugen Rochko 546c4718e7 Localizations for most server-side strings
Eugen Rochko 3ce6ac0ce2 Adding some localizations
Eugen Rochko fdc17bea58 Fix rubocop issues, introduce usage of frozen literal to improve performance
Eugen Rochko d42ed78aa4 Fix - Make web UI use browser history, change links in e-mails to link to that
Eugen Rochko 09218d4c01 Use full-text search for autosuggestions
Eugen Rochko ff229aa978 Fix - Add "Server: Mastodon" header to responses
Eugen Rochko 448ab18a20 Replace setting custom CORS headers with rack-cors, set it on /oauth/token endpoint
Eugen Rochko b13e7dda1f API pagination for all collections using Link header
Eugen Rochko 9aecc0f48a Move timelines API from statuses to its own controller, add a check for 
resources that require a user context vs those that don't (such as public timeline)

/api/v1/statuses/public   -> /api/v1/timelines/public
/api/v1/statuses/home     -> /api/v1/timelines/home
/api/v1/statuses/mentions -> /api/v1/timelines/mentions
/api/v1/statuses/tag/:tag -> /api/v1/timelines/tag/:tag
Eugen Rochko 86574ea524 Adding Emoji One
Eugen Rochko 2f21f4cc01 Fix region setting for AWS gem
Eugen Rochko dbe00a4156 Improved configuration from ENV, cleaned up timeline filter methods 
to be more readable, add extra logging to process feed service
Eugen Rochko b835f4aa1c Fix insecure S3 URLs
Eugen Rochko d14967e1c8 Fix URL configuration when S3 is enabled
Eugen Rochko 45230c56ab Improve S3 config
Eugen Rochko 3ab193bc3f Adding optional S3, fail-mastodon
Eugen Rochko 48b9619439 Adding hashtags
Eugen Rochko 6471a548fe Add pghero for analyzing postgres performance in production
Eugen Rochko 829d189f44 Add tests for recently added API end points
Eugen Rochko e4671adc25 Fix reblogged/favourited caching; add API endpoints for who favd/reblogged status
Eugen Rochko e7723ab662 Add puma preloading, decrease DB pool size to size of threads per worker
Eugen Rochko 53fb7b1aa8 Replace in-memory cache store with redis store, should decrease memory 
footprint of each running process by 128mb
Eugen Rochko a59d10d3df Fix missing default headers
Eugen Rochko 9467b900a2 Make cookies https-only if LOCAL_HTTPS is true, set X-Frame-Options to DENY, 
add permissive CORS to API controllers
Eugen Rochko dd03118098 Fix follow icon changing plus to minus, add terms page stub
Eugen Rochko e0a197650a Adding common followers API, fixing fallback query again
Eugen Rochko 720d1f8f3d Restrict access to oauth/applications to admins only
Eugen Rochko a9e40a3d80 Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting 
to the API
Eugen Rochko 43df35213e Improving all forms
Eugen Rochko d5e086a47b Adding application/jrd+json webfinger resource
Eugen Rochko dd02fc0ec4 More debugging
Eugen Rochko 6611e3a2ef More debugging
Eugen Rochko 4baca34a45 Do not compress JS (perhaps it removes source maps, needed for debugging)
Eugen Rochko c9a7e6e1e3 Enable source maps
Eugen Rochko e21a3fe0cd Adding sync of follow relationships to Neo4J, accounts/suggestions API
Eugen Rochko 7a6d95f70c E-mail preferences page
Eugen Rochko 1f650d327d Adding public timeline
Eugen Rochko 3554d638b3 Fix - add follow/unfollow button to public profiles
Waldir Pimenta 4f654eb822 use consistent capitalization for subject lines
Yann Vaillant 038a407b9e
Update default devise wording to include reference to Mastodon 
Fix
Eugen Rochko fe77921e47 Catching more exceptions that slipped through, removing AR logging from 
production as it's very verbose and not very useful
Eugen Rochko 7b9a4af311 API for blocking and unblocking
Eugen Rochko fc198a8b4c Adding e-mail confirmations
Eugen Rochko d74da1a89a Small fixes
Eugen Rochko f06f295890 Fix doorkeeper skip_authorization
Eugen Rochko 6d7290f47c Add API for getting info about authenticated user: /api/v1/accounts/verify_credentials
Eugen Rochko 4909bbf415 Add logging for outgoing http requests
Eugen Rochko 492224b93f Allow non-https redirect URIs for OAuth apps (AndStatus seems to require this)
Eugen Rochko e63aebff7a Adding landing page
Eugen Rochko 4f9b7432dd Fix - Add API versioning (v1)
Eugen Rochko 7e14eefc81 Replace logo, fix - delete/unreblog/unfavourite API, fix - app 
registration API
Eugen Rochko 3b56350121 Fix - Rate limit GET reqs to 300/5min, POST to 100/5min
Eugen Rochko e46abc71ca Fix notifications in UI, added new API for fetching account relationships
Eugen Rochko bd5ad304ba Adding media controller, 1 webm/compose form allowed, previews generated
Eugen Rochko 5b0cef9781 Setting up preliminary "detailed" routes in the UI, new API end-point for fetching status context
Eugen Rochko 85d89b472d Optimized n+1 queries in accounts Atom and HTML views 
Added stack trace for SQL queries in development
Removed badly thought out accounts/lookup API
Eugen Rochko 509c18eb13 Fix local follows, 404 in logs
Eugen Rochko 0f4bc56719 Improving production logs, removing n+1 on media attachments in atom, 
adding attachments display to static views
Eugen Rochko eec0dc46a6 PostStatusService can attach media to status, ProcessFeedService likewise
Eugen Rochko ae1fac0062 Add API to upload media attachments
Eugen Rochko 413e700fe0 Enhancing test suite but I think the problem might have been caching setting
Eugen Rochko 1022d682dc Normalized data in Redux, fix for asset URLs when rendered outside request
Eugen Rochko 92afd29650 The frontend will now be an OAuth app, auto-authorized. The frontend will use an access token for API requests 
Adding better errors for the API controllers, posting a simple status works from the frontend now
Eugen Rochko 44e57f64dd Improving statuses, adding a composer drawer, which doesn't work yet
Eugen Rochko bc0692d75b Removing mini-profiler that doesn't work, formatting timelines a bit better
Eugen Rochko 49520d6e62 Adding React.js, Redux, revamping dashboard
Eugen Rochko 68c93f8b85 Final fix for ActionCable origin issues
Eugen Rochko 8985f8e66c Fixing more configuration issues with ActionCable
Eugen Rochko 5a8c149f6b Fix ActionCable origin checking
Eugen Rochko 8459acd123 Fix for force SSL issue with websockets
Eugen Rochko 6426819b6f Fix tests
Eugen Rochko 6deb9f966e Live timelines using ActionCable
Eugen Rochko 10ba09f546 Upgrade to Rails 5.0.0.1
Eugen Rochko 6c480c8429 Oops, typo
Eugen Rochko 85b00d19b8 Moving Salmon notifications to background processing, fixing mini-profiler 
behaviour with Turbolinks enabled, optimizing Rabl for production
Eugen Rochko 5764d52b04 Fix Sidekiq pooling issues. Remove API docs from homepage, replace with 
a basic home timeline
Eugen Rochko bb98ee489d Up the number of pooled DB connections to cover both Sidekiq and Puma workers
Eugen Rochko 318886287b Fixing some stuff for Turbolinks, adding gzip on top, fixing a n+1 query
Eugen Rochko 36f3da3cde Adjust down the number of Sidekiq threads to 5 (default of 25 is way too high)
Eugen Rochko e24bfbde1a Fixing FanOutOnWriteService, fixing Sidekiq not having enough DB connections 
in the pool, adding a throttle of 60rpm per IP, adding mini profiler, adding
admin status to users
Eugen Rochko 42dcb0d4cb Adding Sidekiq for background processing (firstly just of mailers)
Eugen Rochko f14f462eaf Adding Turbolinks, adding status posting form on homepage
Eugen Rochko 9d55529318 Fix text color in dashboard inputs, sanitize remote status content in UI, 
simplify FanOutOnWriteService, add /api/accounts/lookup method
Eugen Rochko 253ab26520 Adding more tests for helpers
Eugen Rochko b640f35621 Writing out more tests, fixed some bugs
Eugen Rochko e2b846f630 Adding letter opener for development and Rack::Attack for future rate limiting implementations
Eugen Rochko 71ae4dd3d2 Adding public following and followers pages, fix
Eugen Rochko 9cb690c706 Access tokens no longer expire, case-insensitive local username validation, as well as case-insensitive Webfinger look-up
Eugen Rochko 48d66a2055 Fixing the docker container setup (with assets compilation &co)
Eugen Rochko 2c374cd97c Adding e-mail configuration
Eugen Rochko b17202ca0f Adding a docker-compose template for running Mastodon easily
Eugen Rochko 6fec8afc3f Bind oauth applications to users
Eugen Rochko 3441361568 Adding simple_form, adding profile settings, header image
Eugen Rochko 1aa477ac2f Customized more doorkeeper views, only logged in users can create oauth apps
Eugen Rochko aab9f57e36 Adding config for puma, dashboard layout, fixing some queries
Eugen Rochko 447cfef62d Improving feed queries, switching API to doorkeeper authentication
Eugen Rochko b919f39b31 Customizing doorkeeper views for authorizing app
Eugen Rochko 6c4c84b161 Distrubute statuses as a fan-out-on-write system, with optional precomputing
Eugen Rochko fe57f6330f API methods for retrieving home and mentions timelines
Eugen Rochko f099bc6091 Adding API for favouriting a status
Eugen Rochko ab6696e855 Adding doorkeeper, adding a REST API 
POST /api/statuses                  Params: status (text contents), in_reply_to_id (optional)
GET  /api/statuses/:id
POST /api/statuses/:id/reblog

GET  /api/accounts/:id
GET  /api/accounts/:id/following
GET  /api/accounts/:id/followers
POST /api/accounts/:id/follow
POST /api/accounts/:id/unfollow

POST /api/follows                  Params: uri (e.g. user@domain)

OAuth authentication is currently disabled, but the API can be used with HTTP Auth.
Eugen Rochko c605b828b5 Adding routes to follow, unfollow, favourite and reblog (locally known models)
Eugen Rochko 6045b6cb18 Customizing devise views and controllers
Eugen Rochko 7e93da3f8d Removing grape and adding devise
Eugen Rochko 23d08c6749 Changing the use of config constants to the Rails configuration object
Eugen Rochko 0e8f59c16f Refactoring Grape API methods into normal controllers & other things
Eugen Rochko ee73d35eea Incoming Salmon requests can be turned into follows and unfollows
Eugen Rochko fa33750105 Adding reblogs, favourites, improving atom generation
Eugen Rochko 3b0bc18db9 Improved Atom rendering templates, added README
Eugen Rochko 2bc48e9064 Individual atom entries
Eugen Rochko 1dad72bf13 Fixes and general progress
Eugen Rochko 709c6685a9 Made some progress
Eugen Rochko 9c4856bdb1 Initial commit