Commit Graph

523 Commits (219fb317eeee47e91066b8baebcaf02ef9e0c0bf)

Author SHA1 Message Date
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
Jantso Porali d3bf0307db updated translation for about page 8 years ago
JantsoP 20b53e6add Merge branch 'master' into master 8 years ago
JantsoP 3ec221d3b7 updated reblog to boost translation
Since it is that :D
8 years ago
JantsoP 473e4f7813 udpdated display_name translation 8 years ago
JantsoP b845ef395d updated reblog translation 8 years ago
Eugen Rochko 667ffafef8 Fix spec 8 years ago
Eugen 086a88f3bb Merge pull request #863 from Eychics/master
Add closed_registrations message on French language
8 years ago
Eugen e76dd52b08 Merge pull request #818 from JantsoP/master
Updated Finnish Translation
8 years ago
Eugen c12214963e Merge pull request #866 from kklleemm/patch-1
Fix typos on french translations
8 years ago
Eugen aa8dacbc8a Merge pull request #792 from chapeaumeinfreund/master
Updated and fixed german orthography
8 years ago
Eugen ce524cbb49 Merge pull request #790 from chapeaumeinfreund/patch-1
Updated and fixed german orthography
8 years ago
Eugen 117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817
[#817] Add email whitelist
8 years ago
Eugen 57466d542b Merge pull request #805 from nevillepark/master
Changed "reblogs" to "boosts"
8 years ago
Clément D 350958babf Fix typos on french translations 8 years ago
Thibaut (Eychics) 9a5d6e9715 Add closed_registrations message on French language 8 years ago
Pete Keen e9a6da6bc7 [#817] Add email whitelist
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.

Fixes #817
8 years ago
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI 8 years ago
JantsoP db4a41cf58 Merge branch 'master' into master 8 years ago
JantsoP dc89fc17cc updated translation 8 years ago
Neville Park ce1ca28594 Changed "reblogs" to "boosts" 8 years ago
axolotl 0700521ef3 added Esperanto (eo) 8 years ago
Eugen Rochko 98a93aa07e Fix norwegian translation being malformed 8 years ago
Korbinian ec8029a955 Updated and fixed orthography 8 years ago
Korbinian 7dd5ba42a3 Updated and fixed german orthography 8 years ago
Eugen Rochko b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block 8 years ago
Christopher Kolstad 5cb011b66b Add Norwegian locale 8 years ago
JantsoP 65d667dc6c another typo. fuck me 8 years ago
JantsoP d3fde60297 fixed an sneaky peaky tpy 8 years ago
JantsoP 85a8b62ca2 add finnish translation
add finnish translation
8 years ago
JantsoP 97803600ed add finnish translation
add finnish translation
8 years ago
JantsoP bfa99981e5 Merge branch 'master' into master 8 years ago
JantsoP 6501ffdadc add finnish translation
add finnish translation
8 years ago
JantsoP b0f4c9b91f finnish translation
finnish translation
8 years ago
JantsoP f9b4f30de6 updated final translation
updated final translation
8 years ago
JantsoP 87854745e9 Create new translation file
Still in progress. Should be done shortly
8 years ago
Angristan c97fc5c1f4 Improve french translation 8 years ago
Valentin Lorentz fbcba65f81 Improve French translation
Fix typos and typography. Make vocabulary and grammar more uniform.
8 years ago
Eugen 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales
Feature/improve french locales (again)
8 years ago
Damien Erambert 71cf9d0608 Fix typo in simple_form.fr.yml 8 years ago
Damien Erambert 5e45982ed9 Improve translation of data import in fr.yml 8 years ago
Damien Erambert b829460b4a Better translation for revoked token in doorkeeper.fr.yml 8 years ago
Damien Erambert 65e6a00817 Fix date format in doorkeeper.fr.yml 8 years ago
Eugen 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales
Improve/add some French locales
8 years ago
Eugen Rochko 5b12624847 Add proper error page for request timeouts 8 years ago
Damien Erambert cb1989cbd8 Add locale in devise.fr.yml 8 years ago
Damien Erambert 03d676faa8 Add french translation for "scopes" in doorkeeper.fr.yml 8 years ago
Damien Erambert 9e26af264e Fix small typo in doorkeeper.fr.yml 8 years ago
Damien Erambert f9f6098e22 Complete localization of in simple_form.fr.yml 8 years ago
Damien Erambert 2c881e6717 Improve french locales on the backend (WIP) 8 years ago
Eugen Rochko 5e26295e06 Fix #700 - hide spoilers on static pages 8 years ago
Eugen Rochko e8875c6046 Import feature for following/blocking lists (addresses #62, #177, #201, #454) 8 years ago
Eugen Rochko f864fee116 Fix up some localizations 8 years ago
leopku d5d5afff9c 🌐 add simplified chinese language 8 years ago
leopku fc9bbdfd34 🚧 chinese translation WIP 8 years ago
leopku 349c6cfa2b 🌐 add chinese language file 8 years ago
leopku c46843c65c 🔧 S3 protocol from ENV
add support for reading S3 protocol from ENV
also add S3_HOSTNAME in .env.production.sample
8 years ago
Eugen Rochko d6ed2eb512 Prettier account and stream entry URLs 8 years ago
Eugen Rochko 05cf086766 New API method: /api/v1/search
Returns accounts, statuses, hashtags arrays
8 years ago
Eugen Rochko 8803ca9efe Improved landing page 8 years ago
Eugen Rochko 6b1db5c2b2 Add landing strip 8 years ago
Eugen Rochko 56d998cbdb Export follow/block lists as CSV 8 years ago
Eugen Rochko 2816b1bf8e Federate header images, fix open-uri http->https redirection error 8 years ago
shel 38dceb3bf7 Promote Apps (#670)
"Various apps are available" is now a hyperlink
8 years ago
Eugen Rochko 6be7bde243 Fix #525 - Add instance information API 8 years ago
Eugen e245115f47 Merge branch 'master' into mastodon-site-api 8 years ago
Eugen Rochko 02349b3269 Obfuscate filenames better, double rate limits 8 years ago
Eugen Rochko 1fb3e8988b Revert earlier fix due to new bug reports 8 years ago
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
8 years ago
Eugen Rochko 85fce04d1b Detect videos with no sound, handle them like gifv 8 years ago
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
8 years ago
Eugen Rochko caf5b8e975 Fix #431 - 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.
8 years ago
Eugen Rochko 6b81d10030 Add digest e-mails 8 years ago
Kit Redgrave 442fdbfc53 Mute button progress so far. WIP, doesn't entirely work correctly. 8 years ago
Kibigo 620f70e42c Adds site metadata access to the API 8 years ago
Eugen Rochko 175a9b9caa Fix #104 - Style OAuth authorized applications page
Add ability to search accounts by display name
8 years ago
Eugen Rochko 9d4cad6307 Improve glow 8 years ago
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
8 years ago
Eugen Rochko d0f087db2d Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report 8 years ago
Eugen Rochko 24ba7c9762 Adding index overview for reports in admin UI 8 years ago
Eugen Rochko ff49649130 Expose Link headers via CORS 8 years ago
Eugen Rochko 5426f06ac2 Fix admin UI for accounts somewhat 8 years ago
Eugen Rochko 3b81baaaaf Adding POST /api/v1/reports API, and a UI for submitting reports 8 years ago
Eugen Rochko 63886bdc59 Fix #587 - Display TOTP secret next to QR code 8 years ago
Eugen Rochko 138d21aea8 Update service timeout setting from 15s to 90s 8 years ago
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
8 years ago
Eugen Rochko d2619e0b53 Site title is now a setting 8 years ago
shel 2d6f603c2b Add link to other instances text
Text for link to other instances
8 years ago
Eugen 9d5fb49cd8 Merge pull request #603 from evanminto/activitypub-account
Expose ActivityStreams 2.0 representation of accounts
8 years ago
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
8 years ago
Evan Minto 94e213c6c1 Reuse existing controller and route 8 years ago
Eugen Rochko 77e13c2bc9 Removing failed push notification API, make context loads use cache 8 years ago
Eugen Rochko 19b9e1e2c3 Preheat status cache 8 years ago
Evan Minto 8bd8ea7c04 Remove unnecessary leftover code 8 years ago
Evan Minto e2fbf8bc74 Add an account endpoint for ActivityPub and link to it on HTML profile pages 8 years ago
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.
8 years ago
Eugen Rochko d9ca46b464 Cleaning up format of broadcast real-time messages, removing
redis-backed "mentions" timeline as redundant (given notifications)
8 years ago
Eugen Rochko 1da0ce5c7c Looks like log level :debug is required for activerecord times to be tracked 8 years ago
Eugen Rochko 65402d9c09 Fix activerecord logging in production 8 years ago
Eugen Rochko c2fbd144cf Add "open in web" link to detailed public status pages 8 years ago
Eugen Rochko a2a85e8549 Add capistrano to development environment 8 years ago
Eugen Rochko 3f075c7794 API for apps to register for push notifications 8 years ago
Eugen Rochko 23b997ae55 Split 2FA login into two prompts 8 years ago
Eugen Rochko f4bc9620a9 Update settings to re-use admin layout, one big navigation tree, improve settings forms 8 years ago
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
8 years ago
Eugen Rochko ba192f12e3 Added optional two-factor authentication 8 years ago
Eugen Rochko f6a5977f0b Fix key names in statsd 8 years ago
Eugen Rochko d567f21d4f Improve StatsD instrumentation 8 years ago
Eugen Rochko 7329fbd8a4 Fix up timeout, improve contrast on "show more", add responsive style
for extremely wide monitors
8 years ago
Eugen Rochko cc5c1e5feb Removed accidental n+1 query from notifications, updated some deps,
improved how "show more" link looks
8 years ago
Effy Elden 07b9a10d4d Add redirect for /admin => /admin/settings 8 years ago
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
8 years ago
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
8 years ago
Eugen 956da43e19 Fix error 8 years ago
Eugen Rochko 61aee0006e Override Rack::Request to use the same trusted proxy settings as Rails 8 years ago
Eugen Rochko 67befe5463 Allow to specify trusted proxies through env 8 years ago
Eugen Rochko e028406db4 Fix code style 8 years ago
Eugen Rochko d72dd38c13 Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master 8 years ago
Eugen Rochko 3a4b5961be Method to fetch a single notification 8 years ago
Effy Elden 5fef55c11a Set remote dev environments to use letter_opener_web, add default .env.vagrant variables 8 years ago
Eugen Rochko f0de621e76 Fix #463 - Fetch and display previews of URLs using OpenGraph tags 8 years ago
Eugen Rochko f051c2e813 Fix statsd null backend not being initialized properly 8 years ago
Eugen Rochko 306eb6e9c9 Add optional StatsD performance tracking 8 years ago
Eugen Rochko fcb5a85cdd Add sounds for notifications. Boop by @jk@mastodon.social 8 years ago
Effy Elden ab4f5f5da5 Add Heroku deployment support 8 years ago
Eugen 16f9490d33 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
Fix S3 default settings
8 years ago
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 #464 until it's consistent with non-animated version
8 years ago
Effy Elden a097dd489b Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read' 8 years ago
Effy Elden e45fed58cb Add a textual 'Back to Mastodon' link in footer of settings pages 8 years ago
Eugen Rochko c01dd089ff Adding about/more page with extended information that can be set up by an admin 8 years ago
Eugen Rochko e25170f960 Add extended about page stub 8 years ago
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
8 years ago
Eugen 4292cf60ae Fix env variable name 8 years ago
Eugen Rochko 75f80bef10 Persist UI settings, add missing localizations for German 8 years ago
Eugen Rochko 2e71bb031b Fix Paperclip timeout setting. Fix bug introduced in #437 8 years ago
Eugen Rochko 7ddec6e7c3 Add read timeout to paperclip when it's downloading remote images 8 years ago
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
8 years ago
Eugen Rochko 2b0b7ff1b8 Fix #385 - /web now loads a page 8 years ago
Eugen Rochko 8f47f6a7ec Adding remote follow button 8 years ago
Eugen Rochko a302e56f9a Add API for retrieving favourites 8 years ago
Eugen Rochko 49834a6e7f Add API for retrieving blocked accounts 8 years ago
Eugen Rochko d7dc84439c Add ability to use remote follow function on other sites 8 years ago
Eugen Rochko eca6110fc4 Add preferences for follow request notification e-mails 8 years ago
Eugen Rochko 2146ac91a0 Follow requests send e-mail notifications, but are excluded from notifications API
Better initial state for unlisted/nsfw toggles
8 years ago
Eugen Rochko 3689c119f0 Replacing follow requests in the settings area with in-UI column 8 years ago
Eugen Rochko 004382e4d0 Adding follow requests API 8 years ago
Eugen Rochko b302b9202b Add page for authorizing/rejecting follow requests 8 years ago
Eugen Rochko 3c841c7306 Adjust wording 8 years ago
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
8 years ago
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
8 years ago
Eugen Rochko 2d2154ba75 Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users 8 years ago
Eugen Rochko 6d71044c85 Don't use rack timeout in any but production environments 8 years ago
Eugen Rochko e09d3a2c66 Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen 8 years ago
Eugen 6b67b55cee Merge pull request #356 from victorhck/master
added two missings spanish  translations
8 years ago
Eugen Rochko 5ae1b39ec9 Adjusting public display of statuses to look similar to logged-in UI,
fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive
content behind a spoiler on public pages
8 years ago
Eugen Rochko aed25932b5 Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails 8 years ago
Eugen Rochko 6de079a5af Removing external hub completely, fix #333 fixing digit-only hashtags,
removing web app capability from non-webapp pages
8 years ago
victorhck f5c8d64b6d added to missings spanish translations 8 years ago
Eugen Rochko 76ec907993 Improved admin UI 8 years ago
Eugen Rochko 0c491ea928 Fix translations 8 years ago
Stanislav Makar d2ab41aea4 Declare Ukrainian
Closes: #345
8 years ago
Vladyslav 2c6c912076 Fix some translation errors. 8 years ago
Vladyslav d85c566960 Final steps for Ukrainian translation 8 years ago
Eugen Rochko 8b93f45f3d Fix paperclip config 8 years ago
Eugen Rochko f114bc7bb7 Update Paperclip config to allow plugging in Minio instead of AWS 8 years ago
Eugen Rochko f978b06dd1 Add suspend account functionality to admin UI 8 years ago
Eugen Rochko 1357c1cb3d Add single user mode 8 years ago
Eugen a910cdd54d Merge pull request #338 from stamak/uk.yml
Add Ukrainian localization file uk.yml
8 years ago
Stanislav Makar 0e18bbe3e2 Add Ukrainian localization file uk.yml
Closes: #337
8 years ago
Eugen Rochko b362de2232 Adding configurable e-mail blacklist 8 years ago
Eugen Rochko 9d9f796130 Adding more to admin accounts UI 8 years ago
Eugen Rochko f763e844e8 Do not use expiring links after all 8 years ago
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)
8 years ago
Eugen Rochko 290ffb63cd Fix cloudfront config 8 years ago
Eugen Rochko d3bd10dfe4 Add Cloudfront support 8 years ago
Stanislav Makar ea91286aaa Add Ukrainian localization file doorkeeper.uk.yml
Closes: #334
8 years ago
Andrea Faulds 1c1102008f Fix line endings for Portuguese locale 8 years ago
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
8 years ago
unsmell 66e55d60e1 Create pt localisation files in /config/locales/ 8 years ago
Eugen Rochko 6ff93845d5 Add basic OEmbed provider API, fix #247 8 years ago
Eugen Rochko 14bd46946d Per-status control for unlisted mode, also federation for unlisted mode
Fix #233, fix #268
8 years ago
Eugen Rochko 356d3874eb Normalize localizations, add stub for admin/accounts 8 years ago
Eugen Rochko 5973ca3d11 Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars 8 years ago