about summary refs log tree commit diff
path: root/app/javascript/mastodon
AgeCommit message (Expand)Author
2017-10-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-15Merge pull request #173 from glitch-soc/zerowidthmojiDavid Yip
2017-10-16Clear timer when unmounting RelativeTimestamp components (#5408)Eugen Rochko
2017-10-15l10n Occitan: finishing touches (#5404)JeanGauthier
2017-10-15Update French translation (#5401)Yannick A
2017-10-14replace newlines in desktop notif with spaces instead of removing them (#5361)Ondřej Hruška
2017-10-14Updated Catalan strings (#5323)spla
2017-10-14Update French translation (#5384)Yannick A
2017-10-14l10n: update Persian translation for 2.0 (#5391)Masoud Abkenar
2017-10-14Doodle improvements 2 (#176)Ondřej Hruška
2017-10-14Update German translation (#5389)Jakob Kramer
2017-10-14Doodle palette, options, fill tool (#172)Ondřej Hruška
2017-10-14use zerowidth spaces for emojisOndřej Hruška
2017-10-13Fixed a bug where the canvas would get transparent bg upon eraseOndřej Hruška
2017-10-13Initial doodle supportOndřej Hruška
2017-10-13Dutch strings: small change (#5375)Jeroen
2017-10-13Do not try to guess why home timeline is empty in web UI (#5370)Eugen Rochko
2017-10-13When unfollowing, remove from home in web UI immediately (#5369)Eugen Rochko
2017-10-12Reduce discrepancies between server and client-side character count (#5360)ThibG
2017-10-13l10n: PT-BR translation updated (#5362)Anna e só
2017-10-12Fix the notification bug with newlinesOndřej Hruška
2017-10-12Another tabs-vs-spaces fix, but with ~feeling~David Yip
2017-10-12Fix some consistance errors in gender neutral formulations. Add some missing ...Alda Marteau-Hardi
2017-10-12Fix tabs-vs-spaces issue pointed out by eslint.David Yip
2017-10-12Update oc.json (#5343)JeanGauthier
2017-10-12Merge tag 'v2.0.0rc2' into gs-masterDavid Yip
2017-10-12Fixes and updates for the French translation (#5340)Sylvhem
2017-10-11workaround for scrollIntoView bug ???Ondř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-11Use gender neutral language as in the rest of the french translation (#5331)Alda Marteau-Hardi
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-11In thread view, only scroll first update, scroll to replied-to post (#5322)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 ar.json (#5316)ButterflyOfFire
2017-10-11Fix an error when ancestors get loaded before the status itself (#5312)unarist
2017-10-11Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309)Eugen Rochko
2017-10-10Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)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-08Track frequently used emojis in web UI (#5275)Eugen Rochko
2017-10-08i18n update Occitan (#5263)JeanGauthier
2017-10-08Video preload should be a string (#5267)Nolan Lawson
2017-10-08Use ES module build of react-router-dom (#5264)Nolan Lawson
2017-10-08Dynamically calculate card height for embeds instead of padding (#5265)Eugen Rochko
2017-10-08Show buffering in video player (#5261)Eugen Rochko
2017-10-07Redesign public hashtag pages (#5237)Eugen Rochko
2017-10-07Fix custom emoji in emoji picker, persist skin tone (#5258)Eugen Rochko
2017-10-08Japanese translation (relative time) (#5251)MitarashiDango