about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-02-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-02-04Make PAM gem optional, allow configuration over environment (#6415)Eugen Rochko
2018-02-04Validation of count works even when text of status is nil (#6429)abcang
2018-02-04Exclude nil from relationships array (#6427)abcang
2018-02-04Make sure status is not nil (#6428)abcang
2018-02-04Upgrade Vagrant box to Xenial (#6421)Daniel King
2018-02-04Add option to show only local toots in timeline preview (#6292)Renato "Lond" Cerqueira
2018-02-04CAS + SAML authentication feature (#6425)Eugen Rochko
2018-02-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-03Merge pull request #357 from KnzkDev/fix/detail-styleDavid Yip
2018-02-04Fix detailed-statusncls7615
2018-02-03change referrer policy to same-originbeatrix
2018-02-03Isolate internal services from external networks in Docker configuration (#6369)Akihiko Odaki
2018-02-03fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)takayamaki
2018-02-03Require environment for generate_static_pages (#6420)Akihiko Odaki
2018-02-02Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2018-02-02Fix column header button (#6411)abcang
2018-02-02Fix saving of oEmbed image (#6409)abcang
2018-02-02Set minimum height for mastodon on drawer (#6142)Akihiko Odaki
2018-02-02Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)ThibG
2018-02-02moved save button (#3792)Charlotte Fields
2018-02-02Remove wave from list drawer (#6381)Akihiko Odaki
2018-02-02Unify links container implementation in about pages (#6382)Akihiko Odaki
2018-02-02Accept ActivityPub announce from the author of the original note (#6236)Akihiko Odaki
2018-02-02Allow retrieval of private statuses (single or in outbox) using HTTP signatur...puckipedia
2018-02-02pam authentication (#5303)Alexander
2018-02-02Fix mistake in cache deletion (#6408)abcang
2018-02-01Upgrade Paperclip > 5.2.1 (#6404)Rob Watson
2018-02-01Fix button hiding when header title is too long (#6406)abcang
2018-01-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-01Russian language updated (#6397)Evgeny Petrov
2018-01-31fix ruby 2.5 rvm install in vagrant (#6396)Daniel King
2018-01-28Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-29Bump version to 2.2.0Eugen Rochko
2018-01-29Fix padding bug in landing page column header (#6374)Eugen Rochko
2018-01-29ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)Eugen Rochko
2018-01-29Add direction tags to HTML e-mails for RTL languages (#6373)Eugen Rochko
2018-01-28Weblate translations (#6370)Renato "Lond" Cerqueira
2018-01-27l10n Occitan update (#6367)Quenty31
2018-01-24Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-01-25Do not manually update system RubyGems (#6355)Akihiko Odaki
2018-01-25Do not require sudo on Travis CI (#6356)Akihiko Odaki
2018-01-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-24Merge pull request #346 from KnzkDev/fix/travisDavid Yip
2018-01-24Merge pull request #349 from codl/patch-1beatrix
2018-01-24Fix initial_state me in push_notification_register (#6349)abcang
2018-01-24remove escapes from server-side γaml handlercodl
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