5721 Commits (98c57e4d925deb97c484ef06c610db72fe36e717)
 

Author SHA1 Message Date
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
ThibG f7651c3449 Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)
7 years ago
Charlotte Fields 9c94c1e66f moved save button (#3792)
7 years ago
Akihiko Odaki 180872ddd5 Remove wave from list drawer (#6381)
7 years ago
Akihiko Odaki f35fadcb9a Unify links container implementation in about pages (#6382)
7 years ago
Akihiko Odaki 3cd3cae7f7 Accept ActivityPub announce from the author of the original note (#6236)
7 years ago
puckipedia 081ba8fc90 Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
abcang d3760fd25c Fix mistake in cache deletion (#6408)
7 years ago
Rob Watson 564e2c448b Upgrade Paperclip > 5.2.1 (#6404)
7 years ago
abcang 95da1b3351 Fix button hiding when header title is too long (#6406)
7 years ago
Jenkins 52d4b56065 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Evgeny Petrov 950689c381 Russian language updated (#6397)
7 years ago
Daniel King e3e4cff211 fix ruby 2.5 rvm install in vagrant (#6396)
7 years ago
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