about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-01-23Fix travis.ymlncls7615
2018-01-21Merge pull request #343 from glitch-soc/merge-upstream-20180121David Yip
2018-01-21Merge remote-tracking branch 'origin/master' into merge-upstream-20180121David Yip
2018-01-21Update Vagrantfile to ubuntu/xenial64.David Yip
2018-01-22armenian translations initial commit (#6320)Norayr Chilingarian
2018-01-21Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-21fix filter search index being too strict when looking for line breaks (#6318)codl
2018-01-21Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)ThibG
2018-01-21Redirect to 2FA creation page when otp_secret is not available (#6314)Aboobacker MK
2018-01-21Display number of follow requests in getting started menu, and (#6313)Eugen Rochko
2018-01-21Fix invalid value passed to full_asset_url in mailers (#6312)Eugen Rochko
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-20Bump version to 2.2.0rc1Eugen Rochko
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-19Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaksDavid 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-19Add support Ruby v2.5.0 (#6097)Yamagishi Kazutoshi
2018-01-19Process mentions and reblogs even from resolved threads (#6299)ThibG
2018-01-19Fix "tzinfo-data is not present" docker error (#6300)Pierre Ozoux
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-19i18n: Update Polish translation (#6297)Marcin Mikołajczak
2018-01-19Display a warning when composing unlisted toots with something looking like a...Thibaut Girka
2018-01-18Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-01-18Merge pull request #332 from glitch-soc/merge-upstreamDavid Yip
2018-01-18Merge pull request #333 from glitch-soc/win95-updateDavid 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