6500 Commits (e7ed61917b045f15776adbf257501dc9dac85557)
 

Author SHA1 Message Date
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
David Yip b6159bcb0a
Merge remote-tracking branch 'origin/merge-upstream' 7 years ago
beatrix 136458eaf4
Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing 7 years ago
beatrix 20b519f0fc
Merge pull request #236 from glitch-soc/plaintext-mutes 7 years ago
David Yip 380989def8
Remove NOKOGIRI_USE_SYSTEM_LIBRARIES from Travis. #236. 7 years ago
Thibaut Girka fb6f131fa1 Revert 245816ab27 (fixes #348) 7 years ago
David Yip f1f67c46c5
Use Html2Text to generate plaintext for keyword mutes. #236. 7 years ago
David Yip 9105b0c954
Introduce html2text for extracting plaintext from statuses. #236. 7 years ago
David Yip 53c86b29f0
Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234. 7 years ago
Kazushige Tominaga 718802a05d Added FetchRemoteAccountService spec (#6456) 7 years ago
ThibG 411c9ecb4b Fix password recovery (#6459) 7 years ago
David Yip d263e3bc2d
Fill out some examples for Glitch::FilterHelper. #234. 7 years ago
David Yip 29b5b46c87
Strip HTML from keyword mute input. #234. 7 years ago
Kazushige Tominaga cbe8743e47 Added #call spec (#6455) 7 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423) 7 years ago
David Yip b8efc3fc0b
Normalize simple_form.en.yml. 7 years ago
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
masarakki 235c14c79d fix-indent (#6453) 7 years ago
Eugen Rochko 2ef9d0e101
Change web UI "posts" to "toots" on profile for consistency (#6447) 7 years ago
Eugen Rochko 76f3d5d16b
Add preference to always display sensitive media (#6448) 7 years ago
Jenkins 5ba2c300d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
Kazushige Tominaga 1167c6dbf8 Perform request spec (#6446) 7 years ago
abcang 298c81c00f Clear account cache of notification target_status (#6442) 7 years ago
abcang cf32f7da5c Fix response of signature_verification_failure_reason (#6441) 7 years ago
Kazushige Tominaga 2bb393684b Added #link_header spec (#6439) 7 years ago
Akihiko Odaki 67f7ffa792 Change user_id column non-nullable (#6435) 7 years ago
Jenkins 3405ea6dd9 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
Daniel King 95c8232109 match hashtag regex in js client with server (#6431) 7 years ago
David Yip e815d6803d
db/schema.rb: resolve erroneously-unresolved conflict 7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
Eugen Rochko 38e0133e1b
Make PAM gem optional, allow configuration over environment (#6415) 7 years ago
abcang 9b6223f5e2 Validation of count works even when text of status is nil (#6429) 7 years ago
abcang 3f35d43222 Exclude nil from relationships array (#6427) 7 years ago
abcang c156a83e7d Make sure status is not nil (#6428) 7 years ago
Daniel King 258dcb849f Upgrade Vagrant box to Xenial (#6421) 7 years ago
Renato "Lond" Cerqueira 4e4f1b0dcb Add option to show only local toots in timeline preview (#6292) 7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425) 7 years ago
Jenkins 530fcc1c14 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
David Yip c14f59c542
Merge pull request #357 from KnzkDev/fix/detail-style 7 years ago
ncls7615 15a5b3372a
Fix detailed-status 7 years ago
beatrix fa361ccc5e
change referrer policy to same-origin 7 years ago
Akihiko Odaki 9da81a1639 Isolate internal services from external networks in Docker configuration (#6369) 7 years ago
takayamaki d75d2a9f99 fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417) 7 years ago
Akihiko Odaki f7bf36d8fc Require environment for generate_static_pages (#6420) 7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream 7 years ago
abcang 33f56811e3 Fix column header button (#6411) 7 years ago
abcang 7e5c433dfc Fix saving of oEmbed image (#6409) 7 years ago
Akihiko Odaki c1efe0aa1d Set minimum height for mastodon on drawer (#6142) 7 years ago
ThibG ac1093256c Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207) 7 years ago
Charlotte Fields af40824998 moved save button (#3792) 7 years ago