5686 Commits (87517e2dd875a4e90cf680c6e9c28f798704168f)
 

Author SHA1 Message Date
David Yip 87517e2dd8 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9d2cb4d12d Bump version to 2.2.0
7 years ago
Eugen Rochko 602ec7b7d6 Fix padding bug in landing page column header (#6374)
7 years ago
Eugen Rochko 9c212f0f28 ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)
7 years ago
Eugen Rochko 6278ffdba3 Add direction tags to HTML e-mails for RTL languages (#6373)
7 years ago
Renato "Lond" Cerqueira f9708e4cb4 Weblate translations (#6370)
7 years ago
Quenty31 1eaa2ead85 l10n Occitan update (#6367)
7 years ago
David Yip 310f29b996 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki 858313726c Do not manually update system RubyGems (#6355)
7 years ago
Akihiko Odaki 65098f5b1d Do not require sudo on Travis CI (#6356)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip ac8263b074 Merge pull request #346 from KnzkDev/fix/travis
7 years ago
beatrix 292f030a64 Merge pull request #349 from codl/patch-1
7 years ago
abcang 073f4309a5 Fix initial_state me in push_notification_register (#6349)
7 years ago
codl 2710843f69 remove escapes from server-side γaml handler
7 years ago
abcang 83a68aa224 Fix hide and show media button on admin page (#6347)
7 years ago
Yamagishi Kazutoshi b190de470a Add packs volume to docker-compose.yml (#6348)
7 years ago
Quenty31 cd18b23226 l10n Occitan language update (#6346)
7 years ago
Eugen Rochko de667c2a95 Bump to 2.2.0rc2
7 years ago
Eugen Rochko 6661ae14b0 Fix style of legacy column headers (#6342)
7 years ago
Eugen Rochko 8f60c22ba4 Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)
7 years ago
Eugen Rochko f378280e49 Fix #6331 (#6341)
7 years ago
David Yip ae041129ba Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-code
7 years ago
ThibG 42457924eb Display deleted users' role as “Suspended” (#6339)
7 years ago
Eugen Rochko 0efaa528c4 Update goldfinger, ostatus2 and http.rb versions (#6337)
7 years ago
Eugen Rochko 876c20ad92 Fix e-mail icon for reblog being stretched (#6336)
7 years ago
Thibaut Girka 810312213a Remove some leftover code, I guess
7 years ago
ncls7615 923f2ce3e3 Fix travis.yml
7 years ago
Eugen Rochko 4cf5144099 Fix regression from #6199: Make entire column header clickable (#6334)
7 years ago
Akihiko Odaki b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
Akihiko Odaki fabc4af7ff Rename FetchRemoteResourceService to ResolveURLService (#6328)
7 years ago
Akihiko Odaki a87bb3f4f6 Resolve URL for local account in follow authorization success view (#6324)
7 years ago
Renato "Lond" Cerqueira 11f970da4d Weblate translations (#6323)
7 years ago
David Yip 93972b95b3 Merge pull request #343 from glitch-soc/merge-upstream-20180121
7 years ago
Jeong Arm e96b90c274 Korean translation (#6322)
7 years ago
David Yip db052e79ad Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
7 years ago
David Yip 37d03b1639 Update Vagrantfile to ubuntu/xenial64.
7 years ago
Norayr Chilingarian 62e47f7041 armenian translations initial commit (#6320)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
codl 4d15390eb6 fix filter search index being too strict when looking for line breaks (#6318)
7 years ago
ThibG 55567d05b2 Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)
7 years ago
Aboobacker MK a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
Eugen Rochko 4ee27e1630 Display number of follow requests in getting started menu, and (#6313)
7 years ago
Eugen Rochko d9421e01df Fix invalid value passed to full_asset_url in mailers (#6312)
7 years ago
David Yip d000f5dd80 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip 8354cca2fa Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
7 years ago
David Yip 6b4f90e5fb Merge pull request #342 from glitch-soc/merge-upstream
7 years ago
Iijima Yasushi c8d971a5c1 Change mailer avatar url (#6309)
7 years ago
David Yip 75dac5d056 Merge new onboarding styles; delete refs to PNGs.
7 years ago
David Yip 0f703fe455 Eliminate stray conflict markers.
7 years ago