14 Commits (ee560abdbe7a2caf0f7ac6137faf248bbaff9a93)

Author SHA1 Message Date
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Eugen Rochko 488584bfc1 Track frequently used emojis in web UI (#5275)
7 years ago
Eugen Rochko d2dee6ea43 Fix custom emoji in emoji picker, persist skin tone (#5258)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
Sorin Davidoi cc68d1945b refactor: Rewrite immutablejs import statements using destructuring (#4147)
7 years ago
kibigo! ddba5d3b8c Use Redux store to keep track of layout
8 years ago
Eugen Rochko bb911043de Fix regression from #3748 - properly set defaultColumns (#3750)
8 years ago
unarist d8a0ee1956 Fix merge default columns (#3748)
8 years ago
ふぁぼ原 7623766241 Add regex filters on the community timeline and the public timeline. (#3564)
8 years ago
Eugen Rochko 8ee2eb5d2e Allow mounting arbitrary columns (#3207)
8 years ago
Yamagishi Kazutoshi 2e112e2406 Improve eslint rules (#3147)
8 years ago
Eugen Rochko f5bf5ebb82 Replace sprockets/browserify with Webpack (#2617)
8 years ago