12 Commits (8d69329b8e625b1342c0799bfbbebe0573f91e6b)

Author SHA1 Message Date
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
Eugen Rochko f8ec132261 Track frequently used emojis in web UI (#5275)
7 years ago
Eugen Rochko 519c4c446a Fix custom emoji in emoji picker, persist skin tone (#5258)
7 years ago
kibigo! bcc30c8697 Merge upstream!! #64 <3 <3
7 years ago
Sorin Davidoi 1a5ae3019d refactor: Rewrite immutablejs import statements using destructuring (#4147)
7 years ago
kibigo! b4b03c99f1 Use Redux store to keep track of layout
7 years ago
Eugen Rochko 86211d3ca6 Fix regression from #3748 - properly set defaultColumns (#3750)
8 years ago
unarist 167ba4c5f7 Fix merge default columns (#3748)
8 years ago
ふぁぼ原 f6fddd95d4 Add regex filters on the community timeline and the public timeline. (#3564)
8 years ago
Eugen Rochko cf8f820144 Allow mounting arbitrary columns (#3207)
8 years ago
Yamagishi Kazutoshi e4ed0b155c Improve eslint rules (#3147)
8 years ago
Eugen Rochko ef2af79a48 Replace sprockets/browserify with Webpack (#2617)
8 years ago