1110 Commits (43698e08cad195df6f85aea26c710c2e1614a4a3)

Author SHA1 Message Date
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
Jenkins 933eafdcd3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 74320971e2 Add invite filter (#5862)
7 years ago
Yamagishi Kazutoshi eee3b32b77 Fix invites form path (#5861)
7 years ago
kibigo! 541fe9b110 Skins support
7 years ago
David Yip 95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz eeaec39888 Allow hiding of reblogs from followed users (#5762)
7 years ago
nullkal 1b57d4dd3a Fix account migration feature (#5837)
7 years ago
David Yip 7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 706e534455
Add UI for setting up account migration (#5832)
7 years ago
David Yip e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Jenkins 167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
7 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
Yamagishi Kazutoshi bfdcf76a64 Add “staff” badge to admin user pages (#5735)
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
Jenkins 94c5a11cda Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Clworld e1ebf36352 Fix regression #5467: fixes emoji copy (#5739)
7 years ago
kibigo! 585758a373 Themed prefetching
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3e90987c8b Fix some rubocop style issues (#5730)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
Surinna Curtis 031a5a8f92 Optional notification muting (#5087)
7 years ago
ThibG 58bca7b1e4 Filter searched toots to be consistent with blocking behaviors (#5383)
7 years ago
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow (#5669)
7 years ago
aschmitz 5128c4261e Updates per code review
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
aschmitz 4944515020 "Show reblogs" per-follower UI/database changes
7 years ago
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
nullkal b6e2e999bd Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
David Yip 870d71b78b Merge branch 'master' into gs-master
7 years ago
nullkal 781105293c Feature: Unlisted custom emojis (#5485)
7 years ago
Jenkins 656f5b6f87 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
erin 22da775a85 Fix copying emojos: redirect to the page you were on (#5509)
7 years ago
beatrix a2612d0d38 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
David Yip d9485e6497 Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
7 years ago
David Yip d5c8ebe205 Use edit template for displaying errors in update.
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
David Yip 4c84513e04 Use current_account from ApplicationController.
7 years ago
David Yip 670e6a33f8 Move KeywordMute into Glitch namespace.
7 years ago
David Yip cd04e3df58 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 2e03a10059 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Nolan Lawson fa0be3f834 Add option to reduce motion (#5393)
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
KY 1bdd694a0a Fix #5351 - Redirection with page params after copy emoji (#5387)
7 years ago
Eugen Rochko b8db386e05 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Yamagishi Kazutoshi dc91fd482a Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
takayamaki 552d22bec9 sign_in and sign_up views present og meta infos (#5308)
7 years ago
Eugen Rochko 61d3ecc805 Fix custom emoji copy not copying file (#5298)
7 years ago
Akihiko Odaki cc796298c9 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
beatrix f0a2a6c875 try to tighten up local only toot stuff, like... properly (#163)
7 years ago
nullkal 633426b261 Add moderation note (#5240)
7 years ago
Eugen Rochko f486ef2666 Redesign public hashtag pages (#5237)
7 years ago
Eugen Rochko 3a3475450e Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Eugen Rochko 49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 178f718a9b Separate notifications preferences from general preferences (#4447)
7 years ago
aschmitz 468523f4ad Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Akihiko Odaki 63f0979799 Validate id of ActivityPub representations (#5114)
7 years ago
ThibG dfaa219f88 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
7 years ago
Eugen Rochko 47ecd652d3 Make Chrome splash screen same color as web UI's background color (#5169)
7 years ago
Akihiko Odaki cdacac8c6c Fix order of paginated accounts in FollowerDomainsController and spec (#3357)
7 years ago
Eugen Rochko eb605141ff Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
Eugen Rochko f4ca116ea8 After 7 days of repeated delivery failures, give up on inbox (#5131)
7 years ago
Eugen Rochko 76f360c625 If HTTP signature is wrong and webfinger cache is stale, retry with resolve (#5129)
7 years ago
Eugen Rochko 4ec1771165 Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
kibigo! 86e617a839 Better themeing support!!
7 years ago
Eugen Rochko 293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
nullkal 7d16bb379d Use OrderedCollectionPage to return followers/following list (#4949)
7 years ago
Andrew 0401a24558 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko 41e6c8b151 Fix incomplete account records being read (#4998)
7 years ago
Yamagishi Kazutoshi 1664e52cbb Fix custom emojis index (#5006)
7 years ago
Eugen Rochko 09a94b575e Admin interface for listing, adding and removing custom emojis (#5002)
7 years ago
Eugen Rochko ad8e856a5b Fix error when following locked accounts (#4896)
7 years ago
Eugen Rochko 54edb4b853 When accessing uncached media attachment, redownload it (#4955)
7 years ago
Eugen Rochko 472df24579 When web UI URL used while logged out, redirect to static page (#4954)
7 years ago
Surinna Curtis 79d8911116 Fixed a typo that was breaking the account mute API endpoint
7 years ago
Surinna Curtis f9d7b8a94f Refactor handling of default params for muting to make code cleaner
7 years ago
Surinna Curtis af2d793398 Define a serializer for /api/v1/mutes/details
7 years ago
Surinna Curtis 70592cdaba Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Surinna Curtis 0c547faf92 Less gross passing of notifications flag
7 years ago
Surinna Curtis eaaf2170fe API support for muting notifications (and specs)
7 years ago
Eugen Rochko 9239e4ce4d Uploads for admin site settings (#4913)
7 years ago
nullkal da77f65c46 Add instance search feature (#4925)
7 years ago
Eugen Rochko 0ef9d45d05 Fix error when following locked accounts (#4896)
7 years ago
David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko c450ddb613 Fix POST /api/v1/follows error when already following (#4878)
7 years ago
Eugen Rochko 7d7844a47f Default follows for new users (#4871)
7 years ago
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko e7adbf572a Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
Eugen Rochko 9b994c4aee Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
nullkal 2293466edd Show pinned statuses only in the top of the profile page (#4803)
7 years ago
Eugen Rochko a187dcefa1 Instantly upgrade account to ActivityPub if we receive ActivityPub payload (#4766)
7 years ago
Eugen Rochko 7dc5035031 Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko d1a78eba15 Embed modal (#4748)
7 years ago
Eugen Rochko 2db9ccaf3e Add sharedInbox to actors (#4737)
7 years ago
Eugen Rochko e95bdec7c5 Update status embeds (#4742)
7 years ago
masarakki 649a20ab46 authorize-follow-requests-after-unlocking (#4658)
7 years ago
nullkal c2af138113 Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
unarist b01a19fe39 Fetch reblogs as Announce activity instead of Note object (#4672)
7 years ago
HIKARU KOBORI 2c6a85832c Fix typo in admin/status_controller.rb (#4679)
7 years ago
nullkal 80393a23d0 Use checkboxes for application scope setting (#4671)
7 years ago
Eugen Rochko c1b086a538 Fix up the applications area (#4664)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
Eugen Rochko 72bb3e03fd Support more variations of ActivityPub keyId in signature (#4630)
7 years ago
Eugen Rochko 6e9eda5331 ActivityPub migration procedure (#4617)
7 years ago
Eugen Rochko 74e5078795 Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650)
7 years ago
Yamagishi Kazutoshi 2edfdab6e6 Don't send Link header when don't know prev and next links (#4633)
7 years ago
Eugen Rochko ca7ea1aba9 Redesign public profiles (#4608)
7 years ago
Clworld f814661fca Make share intent modal to make "signed in as" shown. (#4611)
7 years ago
abcang e120d09c98 Fix require_user! behavior when not logged in (#4604)
7 years ago
Eugen Rochko 3c6503038e Add protocol handler. Handle follow intents (#4511)
7 years ago
Eugen Rochko 6df8bd277b Set correct content-type for ActivityPub JSON (#4592)
7 years ago
Eugen Rochko a2aeacbfee Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)
7 years ago
Eugen Rochko b7370ac8ba ActivityPub delivery (#4566)
7 years ago
Eugen Rochko fdea173237 Add Digest header to requests with body, handle acct and URI keyId (#4565)
7 years ago
Eugen Rochko dd7ef0dc41 Add ActivityPub inbox (#4216)
7 years ago
Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'
7 years ago
Eugen Rochko df605f0f8b Add "signed in as" header to some pages (#4523)
7 years ago
nullkal dfcd2834f9 Redirect to PasswordController#new when reset_password_token is invalid (#4506)
7 years ago
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
Gô Shoemake b61e3daf98 Multiple frontend support (#110)
7 years ago
Eugen Rochko 92cb451da8 Fix #4026 - Accept backup codes for disabling 2FA (#4382)
7 years ago
Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Akihiko Odaki a6ea7e282f Merge queries in Api::V1::FavouritesController (#4359)
7 years ago
Sorin Davidoi 9075c90c46 feat: Enable push subscription for mobile devices by default (#4321)
7 years ago
beatrix-bitrot 984d2d4cb6 Merge that good fresh upstream shit
7 years ago
Ondřej Hruška 604654ccb4 New notification cleaning mode (#89)
7 years ago
Eugen Rochko 4b911fea03 Add button to re-subscribe to all accounts from a domain (#4285)
7 years ago
beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master
7 years ago
Eugen Rochko 1fcdaafa6f Fix webfinger retries (#4275)
7 years ago
Yamagishi Kazutoshi 716f4cb11c Add feature to revoke sessions (#4259)
7 years ago
Eugen Rochko a5a07da892 Correct OStatus inflection (Ostatus -> OStatus) (#4255)
7 years ago
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 3267e4a785 Add unfollow modal (optional) (#4246)
7 years ago
Akihiko Odaki 89b988cab5 Introduce Ostatus name space (#4164)
7 years ago
abcang 4d42a38954 Improve admin page (#4121)
7 years ago
Ondřej Hruška c727eae441 Updated from tootsuite
7 years ago
Eugen Rochko a6328fc1b1 Minor ActivityPub JSON fixes (#4214)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
Ondřej Hruška 99f24ab0c7 Raise search results count to 10 for test
7 years ago
Eugen Rochko 8c45cd0e36 Improve ActivityPub representations (#3844)
7 years ago
Eugen Rochko cd9b2ab2f7 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
unarist 1896a154f5 Fix response of unreblog/unfavourite APIs (#4204)
7 years ago
Eugen Rochko 1618b68bfa HTTP signatures (#4146)
7 years ago
Ondřej Hruška 75aafc932e Added buttons and menu items to dismiss individual notifications (#76)
7 years ago
Eugen Rochko c42092ba7a Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
Eugen Rochko 056b5ed72f Improve UI of admin site settings (#4163)
7 years ago
Eugen Rochko e6c81a635b Fix #2848 - Rake task to redownload avatars/headers (#4156)
7 years ago
Eugen Rochko f93de3a516 Fix #3462 - Require authentication for search API (#4155)
7 years ago
Eugen Rochko e19eefe219 Redesign the landing page, mount public timeline on it (#4122)
7 years ago
STJrInuyasha 7a889a8e12 Remote following success page (#4129)
7 years ago
のら ca45bd0361 Add Japanese translation of terms and flash (#4137)
7 years ago