762 Commits (ccd923bef804e9c1e662f5d8e7b2d6c02bd84291)

Author SHA1 Message Date
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
David Yip 67d9178007 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko 73c613dcfc Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
Eugen Rochko 181cbbcaf8 Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
nullkal 36872cd22c Show pinned statuses only in the top of the profile page (#4803)
7 years ago
Eugen Rochko 8b4bddf1c9 Instantly upgrade account to ActivityPub if we receive ActivityPub payload (#4766)
7 years ago
Eugen Rochko e9e271878e Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko ad769409f7 Embed modal (#4748)
7 years ago
Eugen Rochko 1b20fe79b4 Add sharedInbox to actors (#4737)
7 years ago
Eugen Rochko 651c659fd6 Update status embeds (#4742)
7 years ago
masarakki d8f136cb8b authorize-follow-requests-after-unlocking (#4658)
7 years ago
nullkal f9ebff4b13 Allow multiple pinned statuses to be shown and make them be ordered b… (#4690)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
unarist bab7127ac9 Fetch reblogs as Announce activity instead of Note object (#4672)
7 years ago
HIKARU KOBORI 771060a993 Fix typo in admin/status_controller.rb (#4679)
7 years ago
nullkal da85aff49c Use checkboxes for application scope setting (#4671)
7 years ago