975 Commits (115b1abb6e30517fa56efc78551f5953b6ccef27)

Author SHA1 Message Date
David Yip c55263027a
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 0deb9fa6b9
Remove trending hashtags (#7711)
7 years ago
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 8bb74e50be
Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)
7 years ago
tateisu b87a1229c7 optimize direct timeline (#7614)
7 years ago
Eugen Rochko 9bd23dc4e5
Track trending tags (#7638)
7 years ago
Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko ebf2fef029
Catch ActionController::UnknownFormat and return HTTP 406 (#7621)
7 years ago
Thibaut Girka e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 4d81809f36
Yeah, it was supposed to be #create?
7 years ago
Eugen Rochko 36e47a31e3
Enforce order on authorized applications page (#7587)
7 years ago
Thibaut Girka a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 05f8c375a2
Remove small pagination limit from context API (#7564)
7 years ago
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 8378b72eba
Ensure push subscription is immediately removed when application is revoked (#7548)
7 years ago
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1e02dc8715
Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins 2636a23092 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 7293b9fc61
Ensure unfilled fields are shown when errors are shown (#7523)
7 years ago
Eugen Rochko dfb6907e08
HTTP signatures spec no longer requires algorithms field (#7525)
7 years ago
Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Akihiko Odaki 77cd6b5096 Do not use permitted_for scope when querying pinned statuses (#7510)
7 years ago
Akihiko Odaki 55fd55714a Raise Mastodon::RaceConditionError if Redis lock failed (#7511)
7 years ago
Thibaut Girka ba7ee67498 Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko 416f644505
Fix 404 for GET /api/v1/push/subscription (#7472)
7 years ago
Eugen Rochko 97e43ec5f0
Add GET /api/v1/push/subscription REST API (#7471)
7 years ago
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG 352bae8c3e Update session activation time (fixes #5605) (#7408)
7 years ago
Shuhei Kitagawa 50491e0d92 Add tests for invites controller (#7441)
7 years ago
Eugen Rochko b4fb766b23
Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 42cd363542
Bot nameplates (#7391)
7 years ago
abcang db012b57c2 Fix distribute_add_activity and distribute_remove_activity (#7393)
7 years ago
Shuhei Kitagawa bd10a7e480 Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko c7d1a2e400
Improve admin UI for accounts (#7360)
7 years ago
David Yip 7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Jenkins cb62935c0b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG d1aef17f9a Do not render first page of following and followers collections unless explicitly asked to (#7357)
7 years ago
Eugen Rochko 2c1f7b2ece
Better pagination for ActivityPub outbox (#7356)
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko cb5b5cb5f7
Slightly reduce RAM usage (#7301)
7 years ago
Eugen Rochko cae933510c
Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)
7 years ago
Eugen Rochko f62ee1ddb0
Disable API access when login is disabled (#7289)
7 years ago
Eugen Rochko 54f34d3f2a
Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287)
7 years ago
Eugen Rochko da61352fab
Fix "Show more" URL on paginated threads for remote statuses (#7285)
7 years ago
Eugen Rochko 9d4710ed00
Add RSS feeds for end-users (#7259)
7 years ago
Akihiko Odaki 1258efa882 Paginate descendant statuses in public page (#7148)
7 years ago
Yamagishi Kazutoshi 87e3f0a41d Fix spec for sr-Latn (#7203)
7 years ago
Eugen Rochko a9c440637c
Improve report layout (#7188)
7 years ago
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Kaito Sinclaire 156b916caf Direct messages column (#4514)
7 years ago
abcang 897199910f Improve web api protect (#6343)
7 years ago
Eugen Rochko aab5581c43
Set Referrer-Policy to origin in web UI and public pages of private toots (#7162)
7 years ago
Akihiko Odaki a1049e9380 Redirect to account status page for page of status stream entry (#7104)
7 years ago
David Yip 813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
David Yip d66192f21c
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 50529cbceb Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip a817f084ea
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Thibaut Girka 50eb8f1f61 Add backend support for bookmarks
7 years ago
Akihiko Odaki 519119f657 Paginate ancestor statuses in public page (#7102)
7 years ago
Jenkins 33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith d9b62e34da Feature: Improve reports ui (#7032)
7 years ago
Emelia Smith 219a4423d8 Feature: Allow staff to change user emails (#7074)
7 years ago
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Levi Bard cd0eaa349c Enable updating additional account information from user preferences via rest api (#6789)
7 years ago
ThibG 1364e9e4ae Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
Alda Marteau-Hardi b65eb00c53 Prevent admins and moderators eavesdropping in private and direct toots (#7067)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 2e59751823 Improve require_admin! and require_staff! filters (#7018)
7 years ago
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith e7a1716701 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 33513753b9
Fix unpermitted parameters warning when generating pagination URLs (#6995)
7 years ago
beatrix 01bad04efd
Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js
7 years ago
Thibaut Girka b305e7452a Add “public” pack to admin controller, as it is included in upstream admin layout
7 years ago
Thibaut Girka 167a2ecde0 Fix migration page style
7 years ago
Jenkins f2a9a13b32 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 39f27b6cf3
If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817)
7 years ago
Jenkins a0724cd742 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 37b043d447 Improve performance of account_media_status_ids (#6729)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a29d409e20
If login redirects to omniauth, redirect logout to root_path (#6694)
7 years ago
Akihiko Odaki a38dbd9c8a Redirect from Web tag timeline to public tag timeline if not signed in (#6633)
7 years ago
Akihiko Odaki 51d760960c Set the default locale in config (#6580)
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 68218d97c8
Add only_media param to public and hashtag timelines API (#6576)
7 years ago
Eugen Rochko fce8464077
Ensure that boolean params in the API are parsed for truthiness (#6575)
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
Eugen Rochko 41a01bec23
Federated reports (#6570)
7 years ago
Eugen Rochko 18513a978a
Improve public account cards (#6559)
7 years ago
Ian McCowan c33931b613 Fix prev/next links on public profile page (#6497)
7 years ago
imncls 3afc6174f5
Fix data export page error
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec e668180044 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Eugen Rochko c71aa468b5
Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko d8bc64bb09
Fix #6526: Only store redirect location if not in JSON format (#6528)
7 years ago
Eugen Rochko 90f12f2e5a
Focal points (#6520)
7 years ago
Eugen Rochko 4bc625166e
Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
Jenkins 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Konrad Pozniak bb26cdda24 add parameter locked to /api/v1/update_credentials (#6506)
7 years ago
David Yip 3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9dbae6e8a1
Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
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
abcang cf32f7da5c Fix response of signature_verification_failure_reason (#6441)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
abcang 3f35d43222 Exclude nil from relationships array (#6427)
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
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
ThibG ac1093256c Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)
7 years ago
puckipedia 8e4cf6282b Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)
7 years ago
Alexander 04fef7b888 pam authentication (#5303)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 1cc44cba81
Fix #6331 (#6341)
7 years ago
Akihiko Odaki 613e7c7521 Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9b3b40df66
Fix regeneration marker not expiring (#6290)
7 years ago
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 7badad7797
Fix home regeneration (#6251)
7 years ago
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
りんすき fbe7756da6 implement web share target (#6278)
7 years ago
Jenkins 0c7dc6c781 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 537d2939b1 Suppress CSRF token warnings (#6240)
7 years ago
David Yip 395e64e858
Thank you, Officer Murphy
7 years ago
David Yip 514db316f7
The flavour parameter is unused, so omit it (#317)
7 years ago
David Yip 6fcb870d96
Allow for user object to be empty. Fixes #317.
7 years ago
Jenkins 7c719c567c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool c235711ffe Refactor /api/web APIs to use the centralized axios instance (#6223)
7 years ago
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko dbda87c31f
Revert #5772 (#6221)
7 years ago
David Yip f7c4d4464b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 70c99a9f34
Use error pack when rendering error pages. Fixes #305.
7 years ago
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1d92b90be9 Fix force_ssl conditional (#6201)
7 years ago
Yamagishi Kazutoshi da809f9eec Fix unintended cache (#6214)
7 years ago
David Yip 5083311d64
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
7 years ago
Yamagishi Kazutoshi 2af307bce4 Fix unintended cache
7 years ago
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
TheKinrar 95bd85d9e8 Represent numbers by strings in instance activity API (#6198)
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 3bee0996c5 Make sure private toots remain private and do not end up in HTTP caches (#6175)
7 years ago
Eugen Rochko c10f4bdb03
Cache JSON of immutable ActivityPub representations (#6171)
7 years ago
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 99f962ba73 Allow HTTP caching of json view of public statuses (#6115)
7 years ago
Patrick Figel 04ecf44c2f Add confirmation step for email changes (#6071)
7 years ago
David Yip 54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 2c1ed5f872 Show mastodon on modal (#6129)
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
beatrix a56c4742d3 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
7 years ago
ThibG 868568d1c1 Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)
7 years ago
David Yip bf1eb0912c
Set packs on 2FA-related pages. Fixes #271.
7 years ago
David Yip 82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
Jenkins 37254c4f5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a3b2ea599d
Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)
7 years ago
Jenkins 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ad75ec8b5b
Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko 20a6584d2d
Clean up admin UI for accounts (#6004)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
cwm 0a52e37648 change pack to 'auth'
7 years ago
cwm 44992df257 load pack
7 years ago
Erin c5a4eda694 move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
beatrix 771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux
7 years ago
Eugen Rochko feed07227b
Apply a 25x rate limit by IP even to authenticated requests (#5948)
7 years ago
David Yip 204688e803
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
7 years ago
kibigo! dabf66e676 Moved flavour UI into own prefs tab
7 years ago
Erin f080a9fac7 filter local-only toots from AP outboxes
7 years ago
Erin 6bd18e43ba filter local-only statuses from public pages
7 years ago
cwm 072ab191cc pulled master, moved locale entry to new location
7 years ago
kibigo! b28cd6769c Javascript intl8n flavour support
7 years ago
abcang fcc0795a40 Remove unused function (#5950)
7 years ago
cwm abe95b614b add initial components based off of tootsuite pr #1507
7 years ago
Eugen Rochko a865b62efc
Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
abcang 99242b92bc Keep WebPush settings (#5879)
7 years ago
Eugen Rochko 2f4c5f504f
Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
kibigo! 717b7d555c Skins shouldn't apply to fallback flavours
7 years ago
kibigo! 061211a1e3 Fix common packs when other pack also there
7 years ago
David Yip 161d286df2
Use settings pack for InvitesController (#229)
7 years ago
beatrix 81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
David Yip 017fc81caf
Prepend check_enabled_deletion to Settings::DeletesController (#229)
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi b21db9bbde Using double splat operator (#5859)
7 years ago
Eugen Rochko 42bcbd36b7 Remove rabl dependency (#5894)
7 years ago
Eugen Rochko e20895f251
Add list of lists component to web UI (#5811)
7 years ago
kibigo! 5bed0f10ed Various fixes
7 years ago
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! bc4fa6b198 Rename themes -> flavours ? ?
7 years ago
kibigo! d216547382 Fixed typos
7 years ago