about summary refs log tree commit diff
path: root/config
AgeCommit message (Expand)Author
2017-10-12Update fr.yml (#5330)JohnD28
2017-10-12Merge tag 'v2.0.0rc2' into gs-masterDavid Yip
2017-10-12i18n: Update Polish translation (#5346)Marcin Mikołajczak
2017-10-12Moderation notes (#5344)JeanGauthier
2017-10-12Update ja.yml (#5342)nullkal
2017-10-12Fixes and updates for the French translation (#5340)Sylvhem
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-11Update doorkeeper.fr.yml (#5317)JohnD28
2017-10-10Remove prop types from external libraries (#5304)Nolan Lawson
2017-10-10Update German translation (#5302)Jakob Kramer
2017-10-09Remove timestamps on any option (#5282)Jeong Arm
2017-10-09Fix migration failure due to StrongMigrations on production env (#5283)unarist
2017-10-08Set snowflake IDs for backdated statuses (#5260)Eugen Rochko
2017-10-08i18n: Update Polish translation (#5270)m4sk1n
2017-10-08Translate some Esperanto (#5252)Jeong Arm
2017-10-08i18n update Occitan (#5263)JeanGauthier
2017-10-08Use ES module build of react-router-dom (#5264)Nolan Lawson
2017-10-07adding support for audio uploads, transcoded to mp4 videosDJ Sundog
2017-10-07Add moderation note (#5240)nullkal
2017-10-07Redesign public hashtag pages (#5237)Eugen Rochko
2017-10-07Encode custom emojis as resolveable objects in ActivityPub (#5243)Eugen Rochko
2017-10-07Korean translation (#5244)Jeong Arm
2017-10-06i18n: Update Polish translation (#5255)m4sk1n
2017-10-06Clean up code style of Mastodon::TimestampId module (#5232)Eugen Rochko
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
2017-10-04Separate notifications preferences from general preferences (#4447)Yamagishi Kazutoshi
2017-10-04Configure webpack to poll for changes in development (#5040)aschmitz
2017-10-03Add missing Japanese translations (#5193)Yamagishi Kazutoshi
2017-10-03Update German translation (#5189)Jakob Kramer
2017-10-02i18n: Update translation files and Polish translation (#5180)m4sk1n
2017-10-02Korean translation (#5185)Jeong Arm
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
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
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
2017-09-28OC 500 error (#5110)JeanGauthier
2017-09-28Add ability to specify alternative text for media attachments (#5123)Eugen Rochko
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
2017-09-27Upgrade Webpacker to version 3.0.1 (#5122)Yamagishi Kazutoshi