595 Commits (8fc54890e50de024683d9b763b8ed8f82d46433a)

Author SHA1 Message Date
aschmitz 5128c4261e Updates per code review
7 years ago
aschmitz 4944515020 "Show reblogs" per-follower UI/database changes
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