about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-10-07Encode custom emojis as resolveable objects in ActivityPub (#5243)Eugen Rochko
* Encode custom emojis as resolveable objects in ActivityPub * Improve code style
2017-10-07Korean translation (#5244)Jeong Arm
* [i18n] Korean translation Add missing Korean translations. [skip ci] * start ci
2017-10-06i18n: Update Polish translation (#5255)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-06Clean up code style of Mastodon::TimestampId module (#5232)Eugen Rochko
* Clean up code style of Mastodon::TimestampId module * Update brakeman config
2017-10-05Improve admin UI for custom emojis, add copy/disable/enable (#5231)Eugen Rochko
2017-10-04adjust public profile pages 2 (#5223)Lynx Kotoura
2017-10-04Update German translation (#5221)Jakob Kramer
2017-10-04Implement EmailBlackList (#5109)utam0k
* Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock
2017-10-04Separate notifications preferences from general preferences (#4447)Yamagishi Kazutoshi
* Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications
2017-10-04Configure webpack to poll for changes in development (#5040)aschmitz
* Configure webpack to poll for changes in development Vagrant on Linux/macOS hosts shared files via NFS, which doens't support inotify-based watching of files. This tweak makes webpack check for changes every second, and rebuild if necessary. This removes the need to restart Foreman every time a frontend file changes. Note that rebuilding is still a relatively lengthy process. The polling frequency can be changed to taste. * Only poll in Vagrant This tests for the presence of the VAGRANT environment variable to determine whether or not we're in Vagrant. It is set in .env.vagrant, which is set up to be included in the Vagrantfile.
2017-10-03Add missing Japanese translations (#5193)Yamagishi Kazutoshi
* yarn manage:translations * Add Japanese translations for #5170 * Add Japanese translations for #5123 * Add Japanese translations for #5046 * Add Japanese translations for #5099 * Add Japanese translations for #5161 * "項目" -> "絵文字"
2017-10-03Update German translation (#5189)Jakob Kramer
2017-10-02i18n: Update translation files and Polish translation (#5180)m4sk1n
* Update translation files Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-02Korean translation (#5185)Jeong Arm
* Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo
2017-10-01l10n Update OC: reorganization pref. page (#5168)JeanGauthier
2017-10-01Reorganize preferences page (#5161)Eugen Rochko
2017-09-30Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)Eugen Rochko
2017-09-30Change wording on landing page. (#4805)roikale
"Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa". https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto
2017-09-30Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155)Nishi, Keisuke
2017-09-29Updated German translation (#5151)Jakob Kramer
Translate "about" page, several settings pages, data export/import, sessions overview, authorized followers page, account deletion page. More consistent use of words: - A toot is a Beitrag. - An account is a Konto. Some small improvements.
2017-09-29Better Japanese translations (#5142)Yanaken
2017-09-29Replace self-rolled statsd instrumention with localshred/nsa (#5118)Eugen Rochko
2017-09-28Update German translation (#5133)Jakob Kramer
Create activerecord.de.yml (50%) Update devise.de.yml Update doorkeeper.de.yml (100%) Update simple_form.de.yml (100%)
2017-09-28OC 500 error (#5110)JeanGauthier
2017-09-28Add ability to specify alternative text for media attachments (#5123)Eugen Rochko
* Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference
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.
generated by cgit-pink (git 2.37.1) at 2024-10-31 09:38:14 +0000