4128 Commits (dd0dafed0327c9eeb3f4c46282060992215dc16f)

Author SHA1 Message Date
Eugen Rochko 5f70533e8a Fix #5708: Reject->Follow will remove the follow if it exists (#6571)
7 years ago
Eugen Rochko 0ebd2a1718 Federated reports (#6570)
7 years ago
David Yip da24f2fdc1 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
Lynx Kotoura 527210fd7b Grid layout for tag pages (#6545)
7 years ago
Lynx Kotoura 8050d02e86 Better grid layout for the landing page (#6543)
7 years ago
Eugen Rochko 058b96ddf4 Improve public account cards (#6559)
7 years ago
Ian McCowan 88461c1abe Fix prev/next links on public profile page (#6497)
7 years ago
Eugen Rochko f35356609b Ensure the app does not even start if OTP_SECRET is not set (#6557)
7 years ago
yuzulabo af8aa1a5b9 Fix border-radius of owner avatar in /about/more
7 years ago
Akihiko Odaki a5a434a8f6 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
Akihiko Odaki 2187a87f3a Do not use function name to track components (#6542)
7 years ago
Jenkins b4f099ac0a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 7ac6e09dde Do not push status to feed if its reblog is already inserted (#6488)
7 years ago
imncls 9d28dc6c34 Update SCSS
7 years ago
imncls 90765d1e99 Update columns.scss
7 years ago
imncls a6138cc1e9 Update containers.scss
7 years ago
imncls 51ff35b344 Update index.scss
7 years ago
imncls 1e64435374 Fix data export page error
7 years ago
imncls 3419c8e2ac Update about.scss
7 years ago
imncls 5d8e29ba27 Use absolute URL for focus reticle
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec d1806f5dc4 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Ghislain Loaec deea524052 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko 692dfd9a93 Fix nil error in focal_point? (#6537)
7 years ago
Eugen Rochko 51e1e65c84 Fix container regression (#6531)
7 years ago
beatrix 9184d588c1 fix typo in image serializer (#6530)
7 years ago
Eugen Rochko ad1f541bd7 Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko eb5b1b45d9 Fix #6526: Only store redirect location if not in JSON format (#6528)
7 years ago
Eugen Rochko 865c7e7178 Focal points (#6520)
7 years ago
Eugen Rochko c9ed272a4a Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)
7 years ago
Eugen Rochko cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
りんすき 9ff2739fb5 fix #6523 (#6524)
7 years ago
Eugen Rochko c34ff9fb82 Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f759ec9d8d Don't resize avatars/headers if their dimensions are already right (#6508)
7 years ago
Eugen Rochko a30a207fd2 Fix media spoiler design (#6507)
7 years ago
Konrad Pozniak fa710fd496 add parameter locked to /api/v1/update_credentials (#6506)
7 years ago
HellPie edd1a3fb4e Remove outline from body window (Fixes #6501) (#6502)
7 years ago
Eugen Rochko 750f3e64c9 Cache relationships in API (#6482)
7 years ago
Eugen Rochko 3f2a113d32 Push discovered status through streaming API within a time window (#6484)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Eugen Rochko 5a5920f1bd Do not hide NSFW media/CW'd text in OpenGraph tags (#6479)
7 years ago
Eugen Rochko 1cf9467613 After click to embed video, autoplay it (#6480)
7 years ago
Eugen Rochko 0357e93a91 Fix #5173: Click card to embed external content (#6471)
7 years ago
abcang 6cb5d71e5f Fix media button type (#6478)
7 years ago
Marcin Mikołajczak 0ce908b3e0 i18n: Update Polish translation (#6470)
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
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 00cb763893 Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.
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
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
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
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
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 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
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
ncls7615 0318146f16 Fix detailed-status
7 years ago
takayamaki 5ad806ecab fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)
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 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
David Yip 87517e2dd8 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 602ec7b7d6 Fix padding bug in landing page column header (#6374)
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
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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
abcang 83a68aa224 Fix hide and show media button on admin page (#6347)
7 years ago
Quenty31 cd18b23226 l10n Occitan language update (#6346)
7 years ago
Eugen Rochko 6661ae14b0 Fix style of legacy column headers (#6342)
7 years ago
Eugen Rochko f378280e49 Fix #6331 (#6341)
7 years ago
ThibG 42457924eb Display deleted users' role as “Suspended” (#6339)
7 years ago
Eugen Rochko 876c20ad92 Fix e-mail icon for reblog being stretched (#6336)
7 years ago
Thibaut Girka 810312213a Remove some leftover code, I guess
7 years ago
cwm 5a3792dfd8 add 'this.props' to fetchLists
7 years ago
Eugen Rochko 4cf5144099 Fix regression from #6199: Make entire column header clickable (#6334)
7 years ago
cwm 0bf2f1d6d5 remove unused openOnboardingModal from getting_started
7 years ago
cwm 02b8b6efdf merge tootsuite pr #6313 into glitch
7 years ago
Akihiko Odaki b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
Akihiko Odaki fabc4af7ff Rename FetchRemoteResourceService to ResolveURLService (#6328)
7 years ago
Akihiko Odaki a87bb3f4f6 Resolve URL for local account in follow authorization success view (#6324)
7 years ago
Renato "Lond" Cerqueira 11f970da4d Weblate translations (#6323)
7 years ago
David Yip db052e79ad Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
7 years ago
Norayr Chilingarian 62e47f7041 armenian translations initial commit (#6320)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
codl 4d15390eb6 fix filter search index being too strict when looking for line breaks (#6318)
7 years ago
Aboobacker MK a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
Eugen Rochko 4ee27e1630 Display number of follow requests in getting started menu, and (#6313)
7 years ago
Eugen Rochko d9421e01df Fix invalid value passed to full_asset_url in mailers (#6312)
7 years ago
David Yip d000f5dd80 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip 8354cca2fa Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
7 years ago
David Yip 6b4f90e5fb Merge pull request #342 from glitch-soc/merge-upstream
7 years ago
Iijima Yasushi c8d971a5c1 Change mailer avatar url (#6309)
7 years ago
David Yip 75dac5d056 Merge new onboarding styles; delete refs to PNGs.
7 years ago
David Yip 0f703fe455 Eliminate stray conflict markers.
7 years ago
David Yip 03f157f6da Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
SerCom_KC d26ae4a147 Update Simplified Chinese translations (#6306)
7 years ago
Eugen Rochko 9c6dba3999 Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)
7 years ago
Eugen Rochko adb0b4a59a Restore onboarding modal (#6303)
7 years ago
Eugen Rochko 896cadceed Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
Eugen Rochko 5f9c017c01 Make text e-mails consistent with HTML ones in UserMailer (#6291)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Thibaut Girka 12edfead8e Do not discard statuses obtained via websocket when API request finishes
7 years ago
ThibG 1e6d392ff5 Do not throw away statuses obtained via websocket when API request finishes (#6302)
7 years ago
Yamagishi Kazutoshi 49b76b3025 Change belongs_to_required_by_default to true (#5888)
7 years ago
ThibG dc4054abe9 Process mentions and reblogs even from resolved threads (#6299)
7 years ago
ThibG 30df8fc679 Retry delivering toots over ActivityPub for about 2 days (#6298)
7 years ago
Eugen Rochko 5daf5f2c57 Replace drawer elephant graphic with a vector image (#6286)
7 years ago
Thibaut Girka 41c1e5533e Display a warning when composing unlisted toots with something looking like a hashtag
7 years ago
David Yip 477fbec714 Merge pull request #332 from glitch-soc/merge-upstream
7 years ago
Eugen Rochko 92df0bba59 Fix regeneration marker not expiring (#6290)
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip 011d6011f9 Strip trailing whitespace on win95.scss
7 years ago
David Yip fc20361bbe Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
7 years ago
David Yip 14fffe6e88 Use absolute paths for new working/not-found SVGs
7 years ago
David Yip 2a201c2ec6 Port 9cfbbbce1f to glitch frontend
7 years ago
David Yip f4428a7ba8 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip d0e525c463 Merge branch 'gs-master' into merge-upstream
7 years ago