1078 Commits (f625501c05c587dda87f1713cae620f092db0d1a)

Author SHA1 Message Date
Shuhei Kitagawa d230066746 Add tests for intents_controller (#7763)
7 years ago
Eugen Rochko b051d74029 Fix domain hiding logic (#7765)
7 years ago
David Yip a38c4c45da Add apply-to-mentions option to keyword mute UI. #454.
7 years ago
David Yip 9e830f7f37 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 650e3e346b Remove trending hashtags (#7711)
7 years ago
Thibaut Girka c822ecfa01 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 744d47dee2 Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)
7 years ago
tateisu 9a4bed4837 optimize direct timeline (#7614)
7 years ago
Eugen Rochko 8a3b9d26fb Track trending tags (#7638)
7 years ago
Thibaut Girka 3dc4f8e2ca Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 83b124d54b Catch ActionController::UnknownFormat and return HTTP 406 (#7621)
7 years ago
Thibaut Girka 28ccf0a464 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 32c3fc08fe Yeah, it was supposed to be #create?
7 years ago
Eugen Rochko fd007264dc Enforce order on authorized applications page (#7587)
7 years ago
Thibaut Girka 72c454e2b3 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko b634cb45dc Remove small pagination limit from context API (#7564)
7 years ago
Thibaut Girka c384e0f3de Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 7eaa12c83a Ensure push subscription is immediately removed when application is revoked (#7548)
7 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins c91bd06fa5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko db96a5ca80 Ensure unfilled fields are shown when errors are shown (#7523)
7 years ago
Eugen Rochko 71399bf1d5 HTTP signatures spec no longer requires algorithms field (#7525)
7 years ago
Thibaut Girka 7d5dbed502 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Akihiko Odaki a81b1e6f10 Do not use permitted_for scope when querying pinned statuses (#7510)
7 years ago
Akihiko Odaki 5dadb6896b Raise Mastodon::RaceConditionError if Redis lock failed (#7511)
7 years ago
Thibaut Girka efd2441d1f Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko b0e1211eec Fix 404 for GET /api/v1/push/subscription (#7472)
7 years ago
Eugen Rochko 7463d87ec3 Add GET /api/v1/push/subscription REST API (#7471)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG 6222c7def7 Update session activation time (fixes #5605) (#7408)
7 years ago
Shuhei Kitagawa fd0f2b675e Add tests for invites controller (#7441)
7 years ago
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391)
7 years ago
abcang b9c17c6580 Fix distribute_add_activity and distribute_remove_activity (#7393)
7 years ago
Shuhei Kitagawa 8c8a850f8a Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko 0dcca6b6e8 Improve admin UI for accounts (#7360)
7 years ago
David Yip 087c79669a Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Jenkins 3fc6e7dabb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 8a6cba44aa Do not render first page of following and followers collections unless explicitly asked to (#7357)
7 years ago
Eugen Rochko 93b8db8f08 Better pagination for ActivityPub outbox (#7356)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko ca1c696dbd Slightly reduce RAM usage (#7301)
7 years ago
Eugen Rochko 4258e304c5 Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)
7 years ago
Eugen Rochko af240ff13c Disable API access when login is disabled (#7289)
7 years ago
Eugen Rochko e7b07f47ca Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287)
7 years ago
Eugen Rochko ba1f40c806 Fix "Show more" URL on paginated threads for remote statuses (#7285)
7 years ago
Eugen Rochko 24330e4fa7 Add RSS feeds for end-users (#7259)
7 years ago
Akihiko Odaki e22f682df0 Paginate descendant statuses in public page (#7148)
7 years ago
Yamagishi Kazutoshi 0939d9ede6 Fix spec for sr-Latn (#7203)
7 years ago
Eugen Rochko 354a6e4026 Improve report layout (#7188)
7 years ago
David Yip bae5435010 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Kaito Sinclaire 447741e456 Direct messages column (#4514)
7 years ago
abcang 5384e1e913 Improve web api protect (#6343)
7 years ago
Eugen Rochko 6e051e9c55 Set Referrer-Policy to origin in web UI and public pages of private toots (#7162)
7 years ago
Akihiko Odaki 540d2ddfe4 Redirect to account status page for page of status stream entry (#7104)
7 years ago
David Yip 9697c6d9f0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 466442b764 Add bio fields (#6645)
7 years ago
David Yip 26f770cf72 Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip 605016368d Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip fd98bfd108 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 9761b940ac Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Thibaut Girka 12f8473561 Add backend support for bookmarks
7 years ago
Akihiko Odaki 6c2344d4dd Paginate ancestor statuses in public page (#7102)
7 years ago
Jenkins e4e0aa5d21 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 5a166a19a7 Feature: Improve reports ui (#7032)
7 years ago
Emelia Smith 765bfd0cf5 Feature: Allow staff to change user emails (#7074)
7 years ago
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Levi Bard 6828abc1d7 Enable updating additional account information from user preferences via rest api (#6789)
7 years ago
ThibG a91acd2010 Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
Alda Marteau-Hardi 17f77e51f2 Prevent admins and moderators eavesdropping in private and direct toots (#7067)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 078aa8b5ae Improve require_admin! and require_staff! filters (#7018)
7 years ago
Emelia Smith 5373b138e8 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith 0408944627 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
David Yip 21394c5462 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 10fc551576 Fix unpermitted parameters warning when generating pagination URLs (#6995)
7 years ago
beatrix a7cd93032e Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js
7 years ago
Thibaut Girka e282d19700 Add “public” pack to admin controller, as it is included in upstream admin layout
7 years ago
Thibaut Girka f7d23998c8 Fix migration page style
7 years ago
Jenkins 047346ce10 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 77badbc85a If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817)
7 years ago
Jenkins 828d10c327 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang f25dfde752 Improve performance of account_media_status_ids (#6729)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko fdf409f3b6 If login redirects to omniauth, redirect logout to root_path (#6694)
7 years ago
Akihiko Odaki e68459fc5b Redirect from Web tag timeline to public tag timeline if not signed in (#6633)
7 years ago
Akihiko Odaki 008bc9f47d Set the default locale in config (#6580)
7 years ago
Eugen Rochko b1f8dfd3cf Federate pinned statuses over ActivityPub (#6610)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1a6e6a23a9 Add only_media param to public and hashtag timelines API (#6576)
7 years ago
Eugen Rochko f410afe59e Ensure that boolean params in the API are parsed for truthiness (#6575)
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
Eugen Rochko 0ebd2a1718 Federated reports (#6570)
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
imncls 1e64435374 Fix data export page error
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
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 cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Konrad Pozniak fa710fd496 add parameter locked to /api/v1/update_credentials (#6506)
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
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
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 1f2aa77758 Fix response of signature_verification_failure_reason (#6441)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
abcang 6e12cb4524 Exclude nil from relationships array (#6427)
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
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
ThibG f7651c3449 Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)
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
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f378280e49 Fix #6331 (#6341)
7 years ago
Akihiko Odaki b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 92df0bba59 Fix regeneration marker not expiring (#6290)
7 years ago
David Yip b1155460ba Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9cfbbbce1f Fix home regeneration (#6251)
7 years ago
Jenkins 8c41fb4acc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
りんすき 1827d142ee implement web share target (#6278)
7 years ago
Jenkins 6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 2a27afc656 Suppress CSRF token warnings (#6240)
7 years ago
David Yip 53854707ce Thank you, Officer Murphy
7 years ago
David Yip ec1199404c The flavour parameter is unused, so omit it (#317)
7 years ago
David Yip 28e652d35d Allow for user object to be empty. Fixes #317.
7 years ago
Jenkins f9a0b246e5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool eac9039a63 Refactor /api/web APIs to use the centralized axios instance (#6223)
7 years ago
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
7 years ago
David Yip 22286ee6cd Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 9e5b431655 Use error pack when rendering error pages. Fixes #305.
7 years ago
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi c89bb8ae40 Fix force_ssl conditional (#6201)
7 years ago
Yamagishi Kazutoshi 63c17a66b8 Fix unintended cache (#6214)
7 years ago
David Yip a37e295901 Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
7 years ago
Yamagishi Kazutoshi 4f24f54739 Fix unintended cache
7 years ago
Jenkins 86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
TheKinrar 3491c5e145 Represent numbers by strings in instance activity API (#6198)
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 662fa866ee Make sure private toots remain private and do not end up in HTTP caches (#6175)
7 years ago
Eugen Rochko f2d71eae4b Cache JSON of immutable ActivityPub representations (#6171)
7 years ago
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 308ff05149 Allow HTTP caching of json view of public statuses (#6115)
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
David Yip ed572490c1 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 616b6867a0 Show mastodon on modal (#6129)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
beatrix d9c2806048 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
ThibG 3df85a843c Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)
7 years ago
David Yip ea1c58f6d8 Set packs on 2FA-related pages. Fixes #271.
7 years ago
David Yip d53f727653 Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
Jenkins 601f0fe4a3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ef8fc3542b Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko aea3d0814b Clean up admin UI for accounts (#6004)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 7f286d1af0 Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
cwm 690cd248b1 change pack to 'auth'
7 years ago
cwm 7e8c87e443 load pack
7 years ago
Erin eb0660f6ef move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
beatrix af0031fe1b Merge pull request #254 from glitch-soc/new-theme-ux
7 years ago
Eugen Rochko 31fe0d067b Apply a 25x rate limit by IP even to authenticated requests (#5948)
7 years ago
David Yip b1f803d360 Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
7 years ago
kibigo! 901c08a999 Moved flavour UI into own prefs tab
7 years ago
Erin 3d1bef760d filter local-only toots from AP outboxes
7 years ago
Erin b463321c6f filter local-only statuses from public pages
7 years ago
cwm 34630e00cb pulled master, moved locale entry to new location
7 years ago
kibigo! 99e8710095 Javascript intl8n flavour support
7 years ago
abcang cef07895a9 Remove unused function (#5950)
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
Eugen Rochko 87af0bf6cf Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
abcang 7fc5cf7a12 Keep WebPush settings (#5879)
7 years ago
Eugen Rochko f16141ebac Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
kibigo! 5758a12491 Skins shouldn't apply to fallback flavours
7 years ago
kibigo! 41f9a4d4e4 Fix common packs when other pack also there
7 years ago
David Yip 6a5ba9d129 Use settings pack for InvitesController (#229)
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
David Yip 63c41247ff Prepend check_enabled_deletion to Settings::DeletesController (#229)
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi fba46b6072 Using double splat operator (#5859)
7 years ago
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894)
7 years ago
Eugen Rochko 1e7f022fa2 Add list of lists component to web UI (#5811)
7 years ago
kibigo! fd7be49523 Various fixes
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
kibigo! cc70ca9b76 Fixed typos
7 years ago
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1447ef1d44 Add invite filter (#5862)
7 years ago
Yamagishi Kazutoshi 7f0a01a20c Fix invites form path (#5861)
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz ce341c7cf6 Allow hiding of reblogs from followed users (#5762)
7 years ago
nullkal 35e3791ba4 Fix account migration feature (#5837)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
7 years ago
David Yip c9dd67a733 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko bc8c951083 Add consumable invites (#5814)
7 years ago
Jenkins 359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko efc97d404c Add logging of admin actions (#5757)
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Yamagishi Kazutoshi bffc1b880b Add “staff” badge to admin user pages (#5735)
7 years ago
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
Jenkins 065e2388ba Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Clworld 6547ebee48 Fix regression #5467: fixes emoji copy (#5739)
7 years ago
kibigo! 5845057adb Themed prefetching
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3df46ce5a8 Fix some rubocop style issues (#5730)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
ThibG 74de5566d4 Filter searched toots to be consistent with blocking behaviors (#5383)
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
7 years ago
aschmitz 76008c3e8c Updates per code review
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
aschmitz 2aedd8eaad "Show reblogs" per-follower UI/database changes
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
nullkal 19f82492ab Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
nullkal 0a9cc96cdc Feature: Unlisted custom emojis (#5485)
7 years ago
Jenkins c388f66ecc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
erin fe11a72c0b Fix copying emojos: redirect to the page you were on (#5509)
7 years ago
beatrix ce738197b9 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
David Yip 53c2ea1a86 Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
7 years ago
David Yip 2da4eca986 Use edit template for displaying errors in update.
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip 156ebf53f6 Use current_account from ApplicationController.
7 years ago
David Yip 74141adca1 Move KeywordMute into Glitch namespace.
7 years ago
David Yip e3f5ec2652 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 018657a0e0 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
KY d4b9f821ca Fix #5351 - Redirection with page params after copy emoji (#5387)
7 years ago
Eugen Rochko 7ccc1c5748 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Yamagishi Kazutoshi c12c5270fa Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
takayamaki cfab4a7ce4 sign_in and sign_up views present og meta infos (#5308)
7 years ago
Eugen Rochko 9d5075740a Fix custom emoji copy not copying file (#5298)
7 years ago
Akihiko Odaki 783422f8f5 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
beatrix 6f578c25c6 try to tighten up local only toot stuff, like... properly (#163)
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237)
7 years ago
Eugen Rochko 60925ce0ae Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
aschmitz 5b2d855d86 Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Akihiko Odaki 2e6db37776 Validate id of ActivityPub representations (#5114)
7 years ago
ThibG 707cd936e8 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
7 years ago
Eugen Rochko 0783f18274 Make Chrome splash screen same color as web UI's background color (#5169)
7 years ago
Akihiko Odaki 51f48c8960 Fix order of paginated accounts in FollowerDomainsController and spec (#3357)
7 years ago
Eugen Rochko 5983fa43f5 Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
Eugen Rochko cb8ecac1ce After 7 days of repeated delivery failures, give up on inbox (#5131)
7 years ago
Eugen Rochko c35e6234ab If HTTP signature is wrong and webfinger cache is stale, retry with resolve (#5129)
7 years ago
Eugen Rochko 795e624d5d Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 282a126b3f Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
7 years ago
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
kibigo! aac16a82d6 Better themeing support!!
7 years ago
Eugen Rochko f621e05356 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
nullkal e5a634f940 Use OrderedCollectionPage to return followers/following list (#4949)
7 years ago
Andrew b4842ef0b9 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko 48377dfe46 Fix incomplete account records being read (#4998)
7 years ago
Yamagishi Kazutoshi 3dde6679c2 Fix custom emojis index (#5006)
7 years ago
Eugen Rochko e9bb7e62b1 Admin interface for listing, adding and removing custom emojis (#5002)
7 years ago
Eugen Rochko f10a687118 Fix error when following locked accounts (#4896)
7 years ago
Eugen Rochko 26c797bf0d When accessing uncached media attachment, redownload it (#4955)
7 years ago
Eugen Rochko 2d1048d041 When web UI URL used while logged out, redirect to static page (#4954)
7 years ago
Surinna Curtis c872ae6e76 Fixed a typo that was breaking the account mute API endpoint
7 years ago
Surinna Curtis 3688a48100 Refactor handling of default params for muting to make code cleaner
7 years ago
Surinna Curtis 8a90d61de0 Define a serializer for /api/v1/mutes/details
7 years ago
Surinna Curtis 2bd218dfdb Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Surinna Curtis 277f0e69a8 Less gross passing of notifications flag
7 years ago
Surinna Curtis 1e69cc4228 API support for muting notifications (and specs)
7 years ago
Eugen Rochko 9ff429aa6d Uploads for admin site settings (#4913)
7 years ago
nullkal 7f432a97a0 Add instance search feature (#4925)
7 years ago
Eugen Rochko e054961051 Fix error when following locked accounts (#4896)
7 years ago
David Yip f90abccf33 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko 078c84fbb5 Fix POST /api/v1/follows error when already following (#4878)
7 years ago
Eugen Rochko 6628ea4a82 Default follows for new users (#4871)
7 years ago