about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-01-24Fix hide and show media button on admin page (#6347)abcang
2018-01-24Add packs volume to docker-compose.yml (#6348)Yamagishi Kazutoshi
2018-01-24l10n Occitan language update (#6346)Quenty31
2018-01-24Bump to 2.2.0rc2Eugen Rochko
2018-01-24Fix style of legacy column headers (#6342)Eugen Rochko
2018-01-24Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)Eugen Rochko
2018-01-23Fix #6331 (#6341)Eugen Rochko
2018-01-23Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-codeDavid Yip
2018-01-23Display deleted users' role as “Suspended” (#6339)ThibG
2018-01-23Update goldfinger, ostatus2 and http.rb versions (#6337)Eugen Rochko
2018-01-23Fix e-mail icon for reblog being stretched (#6336)Eugen Rochko
2018-01-23Remove some leftover code, I guessThibaut Girka
2018-01-23Fix travis.ymlncls7615
2018-01-23Fix regression from #6199: Make entire column header clickable (#6334)Eugen Rochko
2018-01-22Rename ResolveRemoteAccountService to ResolveAccountService (#6327)Akihiko Odaki
2018-01-22Rename FetchRemoteResourceService to ResolveURLService (#6328)Akihiko Odaki
2018-01-22Resolve URL for local account in follow authorization success view (#6324)Akihiko Odaki
2018-01-22Weblate translations (#6323)Renato "Lond" Cerqueira
2018-01-21Merge pull request #343 from glitch-soc/merge-upstream-20180121David Yip
2018-01-22Korean translation (#6322)Jeong Arm
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