about summary refs log tree commit diff
path: root/app
AgeCommit message (Expand)Author
2018-01-09Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-09Skip ActivityPub Announces of non-public objects (#6230)Eugen Rochko
2018-01-09Fix #6204: Use content warning for page title when present (#6231)Eugen Rochko
2018-01-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-09Weblate translations (#6228)Renato "Lond" Cerqueira
2018-01-08Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-01-08Merge pull request #312 from glitch-soc/tag-sensitive-imgsDavid Yip
2018-01-08Merge pull request #311 from glitch-soc/dont-show-solo-skinsDavid Yip
2018-01-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-08Add missing commakibigo!
2018-01-08Show SENSITIVE tag on sensitive images (#267)kibigo!
2018-01-08Don't show skins selector when there's only one (#256)kibigo!
2018-01-08Threads now inherit privacy directly (#309)kibigo!
2018-01-09Add the author of a status to cc if reblogged (#6226)puckipedia
2018-01-08Refactor /api/web APIs to use the centralized axios instance (#6223)nightpool
2018-01-09fix list editor scssncls7615
2018-01-08Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-01-08When pulling out max_toot_chars, handle nullsDavid Yip
2018-01-08Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-08Revert #5772 (#6221)Eugen Rochko
2018-01-08Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-08Fix bad URL schemes being accepted (#6219)Eugen Rochko
2018-01-08Do not display elephant friend in single-column layout (#6222)Eugen Rochko
2018-01-08Move Article from supported to converted types (#6218)puckipedia
2018-01-07Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-01-07Use error pack when rendering error pages. Fixes #305.David Yip
2018-01-07Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-07Fix force_ssl conditional (#6201)Yamagishi Kazutoshi
2018-01-07Fix unintended cache (#6214)Yamagishi Kazutoshi
2018-01-07Update Simplified Chinese translations (#6215)SerCom_KC
2018-01-07Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-masterDavid Yip
2018-01-07Fix unintended cacheYamagishi Kazutoshi
2018-01-07Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-07Translate Korean (#6212)Jeong Arm
2018-01-06Fixes to search dropdownkibigo!
2018-01-06fix typo in vanilla names.ymlbeatrix
2018-01-06fixed ctrl enterOndřej Hruška
2018-01-06Fix the always-threaded bugOndřej Hruška
2018-01-07Update ja.jsncls7615
2018-01-06Merge pull request #296 from glitch-soc/thread-modebeatrix
2018-01-06Merge pull request #302 from KnzkDev/fix/search-popoutbeatrix
2018-01-06appease eslintbeatrix
2018-01-06Fix search popoutncls7615
2018-01-06Read max_toot_chars from root object. Fixes #297.David Yip
2018-01-05my global .gitignore excluded this file ;_;kibigo!
2018-01-05Threaded mode~kibigo!
2018-01-05Fixed improper dropdown func binding for #293 + toot button spacingkibigo!
2018-01-05Styling and autosuggest fixes for #293kibigo!
2018-01-05Fixes composer mounting issue with #293kibigo!
2018-01-05Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip