about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-10-16Merge pull request #181 from glitch-soc/upstream-merge-againDavid Yip
2017-10-16satisfy eslint and jestOndřej Hruška
2017-10-16Merge remote-tracking branch 'upstream/master' into upstream-merge-againOndřej Hruška
2017-10-16fix some lint errorsOndřej Hruška
2017-10-16Keep references to all reblogs of a status on home feed (#5419)Eugen Rochko
2017-10-16Fix typo in a db:rollback script (#5422)Daigo 3 Dango
2017-10-16Merge remote-tracking branch 'upstream/master' into upstream-merge-againDavid Yip
2017-10-16Bump version to 2.0.0rc3Eugen Rochko
2017-10-16Merge remote-tracking branch 'upstream/master' into gs-masterDavid Yip
2017-10-16Merge remote-tracking branch 'upstream/master' into gs-masterDavid Yip
2017-10-16Ensure that feed renegeration restores non-zero items (#5409)Eugen Rochko
2017-10-16Filter out duplicate IDs in timelines reducer (#5417)Eugen Rochko
2017-10-16Fix un-reblogged status being at wrong position in the home timeline (#5418)unarist
2017-10-16Add up-to-date korean translation on client (#5402)voidSatisfaction
2017-10-16Fix #5082 - disable retweet link for followers only toot (#5397)KY
2017-10-16i18n: Update Polish translation (#5416)Marcin Mikołajczak
2017-10-16i18n ultim hour «More» dropdown title + reduce motion (#5415)JeanGauthier
2017-10-16Enable ESLint rules import/* (#5414)Yamagishi Kazutoshi
2017-10-16Add option to reduce motion (#5393)Nolan Lawson
2017-10-16Fix offline-plugin warning in dev mode (#5411)Nolan Lawson
2017-10-16Replace JavaScript Testing Framework from Mocha to Jest (#5412)Yamagishi Kazutoshi
2017-10-16i18n "More" dropdown title (#5410)Nolan Lawson
2017-10-16Refactor and simplify icon_button.js (#5413)Nolan Lawson
2017-10-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-16Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unificationDavid Yip
2017-10-151.6 changed files for unified avatar styling -- updated to restore unityMatthew Walsh
2017-10-15Merge pull request #173 from glitch-soc/zerowidthmojiDavid Yip
2017-10-16Clear timer when unmounting RelativeTimestamp components (#5408)Eugen Rochko
2017-10-15Add up-to-date korean translation on serverside (#5400)voidSatisfaction
2017-10-15l10n Occitan: finishing touches (#5404)JeanGauthier
2017-10-15Update French translation (#5401)Yannick A
2017-10-14Adjust public hashtag pages (#5357)Lynx Kotoura
2017-10-14Use atomUri in Undo activity of Announce (#5376)unarist
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-14Fix #5351 - Redirection with page params after copy emoji (#5387)KY
2017-10-14Close connection when succeeded posting (#5390)abcang
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-14Correct some misspellings (#5381)Mathias B
2017-10-14Doodle palette, options, fill tool (#172)Ondřej Hruška
2017-10-14use zerowidth spaces for emojisOndřej Hruška
2017-10-13Merge pull request #168 from glitch-soc/doodlesDavid Yip
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-13Optimize Status#permitted_for 500x (account timeline) (#5373)unarist
2017-10-13Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5...Eugen Rochko