about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-10-07adding support for audio uploads, transcoded to mp4 videosDJ Sundog
2017-09-28Merge remote-tracking branch 'origin/better-themeing' into merging-upstreamOndřej Hruška
2017-09-28Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstreamOndřej Hruška
2017-09-28Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstreamOndřej Hruška
2017-09-27When OAuth password verification fails, return 401 instead of redirect (#5111)Eugen Rochko
Call to warden.authenticate! in resource_owner_from_credentials would make the request redirect to sign-in path, which is a bad response for apps. Now bad credentials just return nil, which leads to HTTP 401 from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into this way.
2017-09-27Upgrade Webpacker to version 3.0.1 (#5122)Yamagishi Kazutoshi
2017-09-26i18n: Update Polish translation (#5106)m4sk1n
* i18n: Update Polish translation * i18n: Update Polish translation
2017-09-25Fixed webpack config codekibigo!
2017-09-25Better themeing support!!kibigo!
2017-09-26Follow-up to #4582 and #5027, removing dead code (#5101)Eugen Rochko
2017-09-25New error page graphic. Other error page improvements (#5099)Eugen Rochko
- 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault
2017-09-25Generate 500.html with assets:precompile, remove loading from Google Fonts ↵Eugen Rochko
(#5067)
2017-09-25Add strong_migrations gem to warn when creating unsafe migrations (#5078)Eugen Rochko
2017-09-23New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)Eugen Rochko
2017-09-20Fix theme translations alphabetically (#5031)Lynx Kotoura
2017-09-20Disable private status federation over OStatus (#5027)Eugen Rochko
2017-09-21Better Japanese translations (#5030)Lynx Kotoura
2017-09-20Add Japanese translations for multiple themes, custom emoji (#5026)mayaeh
* Add Japanese translations for multiple themes * Change Japanese translation for custom emoji's created_msg.
2017-09-20l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... ↵JeanGauthier
(#5023) * Oauto code string * Theme, custom emoji and more * Site theme * added two spaces wierdly gone away * Update oc.yml Changes adviced
2017-09-20Add japanese translations for custom emoji. (#5007)mayaeh
* Add japanese translations for custom emoji. * Remove spaces. * Change destroyed_msg. * Revert "Change destroyed_msg."
2017-09-19i18n: Update Polish translation (#5015)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-19Add support for multiple themes (#4959)Andrew
* Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return
2017-09-19Admin interface for listing, adding and removing custom emojis (#5002)Eugen Rochko
* Admin interface for listing, adding and removing custom emojis * Only display local ones in the list
2017-09-19Run i18n-tasks normalize (#5003)Eugen Rochko
2017-09-19A few updates to the Spanish translation and some typos fixing (#4997)BruWalfas
* So Spanish. Much changes. Wow. * Some little fixes * Updated es.yml, and fixed some ortographical errors * Some little changes to simple_form.es.yml * Yeah, so much translations * Spanish e-mail messages * Remove unused message
2017-09-18Re-allow underscore on valid_url_path_ending_chars (#4999)unarist
Limiting allowed characters in the last character of the URL is came from twitter-text, but underscore is allowed on there, and Mastodon before #4941.
2017-09-17Oauth code in input form and add description message (#4986)Lynx Kotoura
* Oauth code in a input form and add description * New authcode description
2017-09-17Randomize sidekiq-scheduler cron schedule (#4980)Patrick Figel
SubscriptionsScheduler in particular causes high load across the entire fediverse at 5 AM UTC every day. Randomizing cron schedules and/or adding a random delay is considered best practice to avoid this issue.
2017-09-16Minor Chinese check & jsx addition (#4973)Mingye Wang
* zh-*: transition from "like" back to "fav" This commit reverts the translation for the yellow-star "fav" button back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is deliberately used in zh-TW/HK by using the existing phrase "最爱" (favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.), "collect") in some instances. Fixes #3511. * zh-*: apply suggestions for PR #4557 * zh-cn: de-monetize ya account In Chinese two separate characters, 账 and 帐, can be used to spell the word for account (账/帐户). However, the one with a 贝 on the left is evolved from the latter specifically for monetary purposes. Since people usually can't figure out which one to use, it might be a good idea to use the original not-so-money one. * zh-*: complete jsx translation
2017-09-16When accessing uncached media attachment, redownload it (#4955)Eugen Rochko
* When accessing uncached media attachment, redownload it * Prevent re-download of rejected media
2017-09-15l10n: PT-BR translation updated (#4953)Anna e só
* devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins * Fixed spelling on pt-BR.yml * Update pt-BR.json
2017-09-14Add scheduled worker to purge old user IPs (#4951)sdukhovni
* Add scheduled worker to purge old user IPs * Use ruby 1.9 hash syntax
2017-09-14Add missing Japanese translations (#4947)Yamagishi Kazutoshi
2017-09-14Enable to recognize most kinds of characters as URL paths (#4941)ふぁぼ原
2017-09-15l10n: update Persian translation (#4946)Masoud Abkenar
2017-09-14Revert unique retry job (#4937)abcang
* Revert "Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)" This reverts commit 6859d4c0289e767955aac3f345074220fe200604. * Revert "Do not execute the job with the same arguments as the retry job (#4814)" This reverts commit be7ffa2d7539d5a1946a3933cb9d242b9fac0ddc.
2017-09-14i18n: Update Polish translation (#4942)m4sk1n
* i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update pl.yml
2017-09-14Another Dutch language update (#4944)Jeroen
* Update nl.json * Update nl.yml * Update nl.json
2017-09-14l10n update OC/FR video redesign (#4938)Quent-in
* l10n update for Redesign video player (#4911) * Update videp * Update I hope this time format works well. * One missing string * Update time format I'd like the complete name of the month in the Long format and the short one in the short format. I hope it works now
2017-09-14Add Japanese translate for #4913 (#4936)N氏
2017-09-13Add a /api/v1/mutes/details route that just returns the array of mutes.Surinna Curtis
2017-09-14Uploads for admin site settings (#4913)Eugen Rochko
* Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up
2017-09-13i18n: Update Polish translation (#4929)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-13Updating Dutch translation (#4927)Jeroen
* Update doorkeeper.nl.yml * Update nl.yml * Update simple_form.nl.yml * Update nl.json * Update en.json * Update en.json * Update nl.json
2017-09-13Fix #4918 - Limit pinned toots to 5 (#4923)Eugen Rochko
2017-09-12Add section for protocol specific information on the admin page (#4910)unarist
This PR adds section for protocol specific information, then always show both of OStatus and ActivityPub. Specifically, this will help admins to check PuSH subscription status and unsubscribe manually, even `protocol` has been changed. This also includes below changes: * Add `overflow: hidden` to prevent float leaking * Add missing fields for ActivityPub
2017-09-11Add OpenStack Keystone V3 support (#4889)Patrick Figel
Keystone V2 is deprecated in favour of V3. This adds the necessary connection parameters for establishing a V3 connection. Connections to V2 endpoints are still possible and the configuration should remain compatible. This also introduces a SWIFT_REGION variable for multi-region OpenStack environments and a SWIFT_CACHE_TTL that controls how long tokens and other meta-data is cached for. Caching tokens avoids rate-limiting errors that would result in media uploads becoming unavailable during high load or when using tasks like media:remove_remote. fog-openstack only supports token caching for V3 endpoints, so a recommendation for using V3 was added.
2017-09-11l10n: Full PT-BR translation (#4882)Anna e só
* devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins
2017-09-11l10n: update Persian translation (#4880)Masoud Abkenar
* l10n: update Persian translation * l10n: fix missing Persian translation
2017-09-10Merge tag 'v1.6.0' into sync/upstreamDavid Yip
generated by cgit-pink (git 2.37.1) at 2024-12-21 07:03:24 +0000