about summary refs log tree commit diff
path: root/app
AgeCommit message (Expand)Author
2018-01-22merge tootsuite pr #6313 into glitchcwm
2018-01-20Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-01-20Merge pull request #336 from ThibG/glitch-soc/features/tag-warningDavid Yip
2018-01-20Merge pull request #342 from glitch-soc/merge-upstreamDavid Yip
2018-01-20Change mailer avatar url (#6309)Iijima Yasushi
2018-01-20Merge new onboarding styles; delete refs to PNGs.David Yip
2018-01-20Eliminate stray conflict markers.David Yip
2018-01-20Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-21Update Simplified Chinese translations (#6306)SerCom_KC
2018-01-20Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)Eugen Rochko
2018-01-20Restore onboarding modal (#6303)Eugen Rochko
2018-01-20Improve HTML e-mails based on Litmus tests (#6301)Eugen Rochko
2018-01-20Make text e-mails consistent with HTML ones in UserMailer (#6291)Eugen Rochko
2018-01-19Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-19Do not discard statuses obtained via websocket when API request finishesThibaut Girka
2018-01-19Do not throw away statuses obtained via websocket when API request finishes (...ThibG
2018-01-19Change belongs_to_required_by_default to true (#5888)Yamagishi Kazutoshi
2018-01-19Process mentions and reblogs even from resolved threads (#6299)ThibG
2018-01-19Retry delivering toots over ActivityPub for about 2 days (#6298)ThibG
2018-01-19Replace drawer elephant graphic with a vector image (#6286)Eugen Rochko
2018-01-19Display a warning when composing unlisted toots with something looking like a...Thibaut Girka
2018-01-18Merge pull request #332 from glitch-soc/merge-upstreamDavid Yip
2018-01-18Fix regeneration marker not expiring (#6290)Eugen Rochko
2018-01-18Replace tutorial modal with welcome e-mail (#6273)Eugen Rochko
2018-01-18Strip trailing whitespace on win95.scssDavid Yip
2018-01-18Merge remote-tracking branch 'cybrespace/theme_win95' into win95-updateDavid Yip
2018-01-18Use absolute paths for new working/not-found SVGsDavid Yip
2018-01-18Port 7badad7797b487b411a2ab34e0f7413741974bb4 to glitch frontendDavid Yip
2018-01-18Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-18Merge branch 'gs-master' into merge-upstreamDavid Yip
2018-01-18Style fixes to make eslint happier, hopefullyDavid Yip
2018-01-18When must_be_following_dm is on, only notify if recipient dm'ed user (#6283)Renato "Lond" Cerqueira
2018-01-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-17Fix home regeneration (#6251)Eugen Rochko
2018-01-18Weblate translations (#6284)Renato "Lond" Cerqueira
2018-01-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-17implement web share target (#6278)りんすき
2018-01-17Upgrade ESLint to version 4.x (#6276)Yamagishi Kazutoshi
2018-01-17Update Simplified Chinese translations (#6280)SerCom_KC
2018-01-17Use better reblog icon and improve contrast in HTML e-mails (#6272)Eugen Rochko
2018-01-17Change mailer image url (#6279)mayaeh
2018-01-16HTML e-mails for NotificationMailer (#6263)Eugen Rochko
2018-01-16Change image URL in mailer to full path (#6264)Yamagishi Kazutoshi
2018-01-15Fixed improper mailer importkibi!
2018-01-15Fix mailer to use webpack corekibi!
2018-01-15Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-01-16HTML e-mails for UserMailer (#6256)Eugen Rochko
2018-01-15Surround mid-text display names with bdi tags (#6257)Eugen Rochko
2018-01-15Fix #6128 - Display unfollow button even if account moved (#6258)Eugen Rochko
2018-01-15Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins