about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-02-10Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearingbeatrix
2018-02-10Merge pull request #236 from glitch-soc/plaintext-mutesbeatrix
2018-02-10Remove NOKOGIRI_USE_SYSTEM_LIBRARIES from Travis. #236.David Yip
2018-02-10Revert 245816ab2721f386184878d71be01143d207abf5 (fixes #348)Thibaut Girka
2018-02-10Use Html2Text to generate plaintext for keyword mutes. #236.David Yip
2018-02-10Introduce html2text for extracting plaintext from statuses. #236.David Yip
2018-02-10Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.David Yip
2018-02-10Fill out some examples for Glitch::FilterHelper. #234.David Yip
2018-02-10Strip HTML from keyword mute input. #234.David Yip
2018-02-05Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-05match hashtag regex in js client with server (#6431)Daniel King
2018-02-04db/schema.rb: resolve erroneously-unresolved conflictDavid Yip
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