5749 Commits (bf93764ca0454751e5cb8ca9ede94dd867ee0321)
 

Author SHA1 Message Date
Jenkins bf93764ca0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e8e6786d6f Interactive `rake mastodon:setup` task (#6451)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip d9cc3b60fb Merge remote-tracking branch 'origin/merge-upstream'
7 years ago
beatrix cca508ceb7 Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing
7 years ago
beatrix 2ab053e4c2 Merge pull request #236 from glitch-soc/plaintext-mutes
7 years ago
David Yip e16e51d341 Remove NOKOGIRI_USE_SYSTEM_LIBRARIES from Travis. #236.
7 years ago
Thibaut Girka da0a577768 Revert 4a48d03b31 (fixes #348)
7 years ago
David Yip 062f72c593 Use Html2Text to generate plaintext for keyword mutes. #236.
7 years ago
David Yip 79f594fcba Introduce html2text for extracting plaintext from statuses. #236.
7 years ago
David Yip 00cb763893 Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.
7 years ago
Kazushige Tominaga 74c0abdcf7 Added FetchRemoteAccountService spec (#6456)
7 years ago
ThibG d12bff875e Fix password recovery (#6459)
7 years ago
David Yip a5f1c1f469 Fill out some examples for Glitch::FilterHelper. #234.
7 years ago
David Yip e365675e0a Strip HTML from keyword mute input. #234.
7 years ago
Kazushige Tominaga ab35601c79 Added #call spec (#6455)
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip 7d67b36ba0 Normalize simple_form.en.yml.
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
masarakki 8f5d41e096 fix-indent (#6453)
7 years ago
Eugen Rochko 26fe2c27c3 Change web UI "posts" to "toots" on profile for consistency (#6447)
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
Jenkins 777559fa5f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Kazushige Tominaga c208dc4ce7 Perform request spec (#6446)
7 years ago
abcang c1263f5db5 Clear account cache of notification target_status (#6442)
7 years ago
abcang 1f2aa77758 Fix response of signature_verification_failure_reason (#6441)
7 years ago
Kazushige Tominaga 39eb9eec05 Added #link_header spec (#6439)
7 years ago
Akihiko Odaki 72e284028f Change user_id column non-nullable (#6435)
7 years ago
Jenkins 98c57e4d92 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King 752ccc52e8 match hashtag regex in js client with server (#6431)
7 years ago
David Yip 2b43b1ab6b db/schema.rb: resolve erroneously-unresolved conflict
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 555e7205da Make PAM gem optional, allow configuration over environment (#6415)
7 years ago
abcang 225fdc2409 Validation of count works even when text of status is nil (#6429)
7 years ago
abcang 6e12cb4524 Exclude nil from relationships array (#6427)
7 years ago
abcang 0092711e16 Make sure status is not nil (#6428)
7 years ago
Daniel King 4ce6ca9bd1 Upgrade Vagrant box to Xenial (#6421)
7 years ago
Renato "Lond" Cerqueira 6528c0c101 Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
Jenkins 06d2bfd63f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip 5b428b7027 Merge pull request #357 from KnzkDev/fix/detail-style
7 years ago
ncls7615 0318146f16 Fix detailed-status
7 years ago
beatrix d3e325e047 change referrer policy to same-origin
7 years ago
Akihiko Odaki ded217f84a Isolate internal services from external networks in Docker configuration (#6369)
7 years ago
takayamaki 5ad806ecab fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)
7 years ago
Akihiko Odaki 5892127534 Require environment for generate_static_pages (#6420)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
abcang 48af3df758 Fix column header button (#6411)
7 years ago
abcang b209de40f4 Fix saving of oEmbed image (#6409)
7 years ago
Akihiko Odaki 1cd049c57b Set minimum height for mastodon on drawer (#6142)
7 years ago