about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-10-11add duck beaks in hamlOndřej Hruška
2017-10-11Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-10-11Updating Dutch strings for 2.0 (#5334)Jeroen
2017-10-11Add myself as codeowner of the translation files. (#5333)Alda Marteau-Hardi
2017-10-11Use gender neutral language as in the rest of the french translation (#5331)Alda Marteau-Hardi
2017-10-11Fix #5329 (#5332)aschmitz
2017-10-11Fix styles of error pages (#5335)Lynx Kotoura
2017-10-11Removed length check which now happens in reducerkibigo!
2017-10-11Fixed header emojificationkibigo!
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-11fix presented og:url is incorrect (#5320)takayamaki
2017-10-11In thread view, only scroll first update, scroll to replied-to post (#5322)Eugen Rochko
2017-10-11Only preload JS in /web pages (#5325)Nolan Lawson
2017-10-11Add padding to Android icon, change Apple and MS icons (#5321)Eugen Rochko
2017-10-11Fully disable hotkeys when input element is focused (#5324)Eugen Rochko
2017-10-11Update french translation : mastodon/locales/fr.json (#5318)JohnD28
2017-10-11Update doorkeeper.fr.yml (#5317)JohnD28
2017-10-11Update ar.json (#5316)ButterflyOfFire
2017-10-11Fix an error when ancestors get loaded before the status itself (#5312)unarist
2017-10-11Fix #5281 - Fix tooltip/custom emoji/search interaction (#5310)Eugen Rochko
2017-10-11Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309)Eugen Rochko
2017-10-11sign_in and sign_up views present og meta infos (#5308)takayamaki
2017-10-10Bump version to 2.0.0rc2Eugen Rochko
2017-10-10Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)Eugen Rochko
2017-10-10Remove prop types from external libraries (#5304)Nolan Lawson
2017-10-10Update German translation (#5302)Jakob Kramer
2017-10-10Fix custom emoji copy not copying file (#5298)Eugen Rochko
2017-10-10Fix #5295 - Order custom emoji lexicographically (#5297)Eugen Rochko
2017-10-10Fix an error when video playback buffer is empty (#5300)unarist
2017-10-10foreign_key, non-nullable, dependent: destroy in account_moderation_notes (#5...nullkal
2017-10-10Fix wrong dimensions on Android icon (#5296)Eugen Rochko
2017-10-09Material app icon for Chrome (#5291)Eugen Rochko
2017-10-09Fix #5278 - Update emoji-mart so invalid emoji IDs don't crash it (#5290)Eugen Rochko
2017-10-09Center error layout (#5289)Eugen Rochko
2017-10-09Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5...Eugen Rochko
2017-10-09Remove timestamps on any option (#5282)Jeong Arm
2017-10-09Fix pagination in Api::V1::BlocksController (#5285)Akihiko Odaki
2017-10-09try to tighten up local only toot stuff, like... properly (#163)beatrix
2017-10-09Fix migration failure due to StrongMigrations on production env (#5283)unarist
2017-10-09Fix dependency of error page generation on database (#5280)Eugen Rochko
2017-10-08Bump version to 2.0.0rc1 (#5209)Eugen Rochko
2017-10-08Fix #5272 - Order of checks in ActivityPub handler (#5276)Eugen Rochko
2017-10-08Fix #5271 - Fix missing attribute in remove_from_feed (#5277)Eugen Rochko
2017-10-08Track frequently used emojis in web UI (#5275)Eugen Rochko
2017-10-08Set snowflake IDs for backdated statuses (#5260)Eugen Rochko
2017-10-08Fix #5178 - Use object URI only in Announce, instead of embedding (#5266)Eugen Rochko
2017-10-08improve static page metadata lookOndřej Hruška
2017-10-08i18n: Update Polish translation (#5270)m4sk1n
2017-10-08Translate some Esperanto (#5252)Jeong Arm
2017-10-08i18n update Occitan (#5263)JeanGauthier