717 Commits (b39f3648a7944a23cf4c1d9d324e320129e9d3ab)

Author SHA1 Message Date
Jenkins a36a2c1796 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 53e95c4efc Fix N+1 at notification (#5752)
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
Eugen Rochko 58cede4808
Profile redirect notes (#5746)
7 years ago
beatrix dec960c828
Merge pull request #208 from yipdw/keyword-mute
7 years ago
David Yip 130aa90d55 Update annotations on Follow, FollowRequest, and Mute.
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
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
Eugen Rochko 2151fd3150
Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
ysksn 9e3d24a150 Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
David Yip 08652baab0 Replace =~ with #matches?. #208.
7 years ago
David Yip 8fc54890e5 Prefix cache keys with the matcher type. #208.
7 years ago
David Yip cb4ef24ac9 Match keyword mute filter on hashtags. #208.
7 years ago
beatrix 04508868b0
Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
ysksn 19e8b861a2 Delegate some methods of User to @settings (#5706)
7 years ago
Surinna Curtis 031a5a8f92 Optional notification muting (#5087)
7 years ago
Yamagishi Kazutoshi 20150659e6 Add uniqueness to block email domains (#5692)
7 years ago
David Yip 656d54e945 Maintain case-insensitivity when merging multiple matchers (#213)
7 years ago
Daniel Hunsaker cf7e840990 Update model annotations to use BIGINT for IDs (#5461)
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 b95c48748c Per-user reblog hiding implementation/fixes/tests
7 years ago
aschmitz 4944515020 "Show reblogs" per-follower UI/database changes
7 years ago
ysksn 54b42901df Add and Remove tests for FollowRequest (#5622)
7 years ago
ThibG 5d5c0f4f43 Twidere mention workaround (#5552)
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
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 e40fe4092d Remove nil check in Glitch::KeywordMute#=~.
7 years ago
David Yip f5a3283976 Switch to Regexp.union for building the mute expression.
7 years ago
David Yip 8410d33b49 Only cache the regex text, not the regex itself.
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
David Yip af8f06413e KeywordMute matcher: more closely mimic Regexp#=~ behavior.
7 years ago
David Yip 4b68e82a19 Don't add \b to whole-word keywords that don't start with word characters.
7 years ago
David Yip ad86c86fa8 Apply keyword mutes to reblogs.
7 years ago
David Yip 670e6a33f8 Move KeywordMute into Glitch namespace.
7 years ago
David Yip 4a64181461 Allow keywords to match either substrings or whole words.
7 years ago
David Yip b4b657eb1d Invalidate cached matcher objects on KeywordMute commit. #164.
7 years ago
David Yip 693c66dfde Use more idiomatic string concatentation. #164.
7 years ago
David Yip a4851100fd Make use of the regex attr_reader. #164.
7 years ago
David Yip 603cf02b70 Rework KeywordMute interface to use a matcher object; spec out matcher. #164.
7 years ago
David Yip 4745d6eeca Spec out KeywordMute interface. #164.
7 years ago
David Yip 9093e2de7a Add KeywordMute model.
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
unarist a1c54220e8 Optimize Status#permitted_for 500x (account timeline) (#5373)
7 years ago
Eugen Rochko b8db386e05 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Lex Alexander b8bae96647 Retoot count increases without reason (#5363)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
nullkal 6c54d2e583 foreign_key, non-nullable, dependent: destroy in account_moderation_notes (#5294)
7 years ago
beatrix f0a2a6c875 try to tighten up local only toot stuff, like... properly (#163)
7 years ago
Eugen Rochko 0717d9b3e6 Set snowflake IDs for backdated statuses (#5260)
7 years ago
DJ Sundog 979b0d66a7 update indentation
7 years ago
DJ Sundog 6ca03a7f58 add faststart to audio transcoding
7 years ago
DJ Sundog 96ba3482b9 adding support for audio uploads, transcoded to mp4 videos
7 years ago
nullkal 633426b261 Add moderation note (#5240)
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
Eugen Rochko b9c76e2edb When processing custom emoji, ensure a non-animated version exists (#5230)
7 years ago
utam0k b3af3f9f8c Implement EmailBlackList (#5109)
7 years ago
aschmitz 468523f4ad Non-Serial ("Snowflake") IDs (#4801)
7 years ago
aschmitz 97c02c3389 Make IdsToBigints (mostly!) non-blocking (#5088)
7 years ago
Eugen Rochko f4ca116ea8 After 7 days of repeated delivery failures, give up on inbox (#5131)
7 years ago
Eugen Rochko 887cd94e96 Increase attachment descriptions to 420 characters (#5139)
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
Eugen Rochko 3caf0ba923 Fix empty query sent to postgres for custom emojis (#5121)
7 years ago
kibigo! 86e617a839 Better themeing support!!
7 years ago
unarist 5c82c2b75f Increase max height of preview card image (#5092)
7 years ago
Eugen Rochko 1e02ba111a Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko 293972f716 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Eugen Rochko 9c8e602163 Fix custom emojis not detected when used in content warning (#5049)
7 years ago
Akihiko Odaki 0de82dd316 Do not filter statuses with unknown languages (#5045)
7 years ago
unarist c8580eb806 Use file extensions in addition to MIME types for file picker (#5029)
7 years ago
Akihiko Odaki bb4d005a83 Introduce OStatus::TagManager (#5008)
7 years ago
Andrew 0401a24558 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko 81cec35dbf Custom emoji (#4988)
7 years ago
unarist dd6f9a1b82 Validate uri presence for remote status (#4985)
7 years ago
Akihiko Odaki 198a9a4fa4 Remove local_only scope in Status (#4977)
7 years ago
Eugen Rochko 54edb4b853 When accessing uncached media attachment, redownload it (#4955)
7 years ago
Eugen Rochko 04046a4983 Fix #4908 - Do not keep remote file names, generate random (#4934)
7 years ago
Surinna Curtis fd9a171129 fix typos in the migration
7 years ago
Surinna Curtis f9d7b8a94f Refactor handling of default params for muting to make code cleaner
7 years ago
Surinna Curtis 211f0a9513 add an explanatory comment to AccountInteractions
7 years ago
Surinna Curtis 0284fd723b Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint
7 years ago
Surinna Curtis 7dbcc7ed3d Expose whether a mute hides notifications in the api/v1/relationships endpoint
7 years ago
Surinna Curtis 44207b6af6 Add muting_notifications? and a notifications argument to mute!
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 0a6b098668 Fix count numbers from ActivityPub not being saved (#4899)
7 years ago
Surinna Curtis 3cac5bc2c3 Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko 7d7844a47f Default follows for new users (#4871)
7 years ago
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
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 dd6ede554f Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)
7 years ago
voidSatisfaction 8185f98872 Feat add validation for report comment: characters under 1000 valid (#4833)
7 years ago
Eugen Rochko 11bddd31ce Fix locking migration on statuses table. Nullable column and NO default value (#4825)
7 years ago
Eugen Rochko e7adbf572a Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
abcang 6ec1aa372d Validate data of Imports (#4782)
7 years ago
unarist bfa7f9ebf2 Fix WebPush (regression from #4524) (#4778)
7 years ago
Eugen Rochko 7dc5035031 Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko 74437c6bff Refactor Web::PushSubscription, remove welcome message (#4524)
7 years ago
nullkal 39e7a763ff Use request.remote_ip instead of request.ip (#4744)
7 years ago
Eugen Rochko 4c76402ba1 Serialize ActivityPub alternate link into OStatus deletes, handle it (#4730)
7 years ago
abcang ce9a5f358e rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)
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
Eugen Rochko c66fe2aeba Minor performance improvement for test suite (#4678)
7 years ago
Colin Mitchell 871c0d251a Application prefs section (#2758)
7 years ago
Eugen Rochko f391a4673a Periodically remove expired PuSH subscribers (#4654)
7 years ago
Eugen Rochko 3534e115e5 Do not try to re-subscribe to unsubscribed accounts (#4653)
7 years ago
Eugen Rochko ca7ea1aba9 Redesign public profiles (#4608)
7 years ago
Eugen Rochko b7370ac8ba ActivityPub delivery (#4566)
7 years ago
Eugen Rochko dd7ef0dc41 Add ActivityPub inbox (#4216)
7 years ago
Yamagishi Kazutoshi 81c41d8681 Add coalesce option to avatar and header convert processor (#4552)
7 years ago
Yamagishi Kazutoshi 1b5d26735e Revert "Set false to animated options for thumbnail processor" (#4550)
7 years ago
Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'
7 years ago
Yamagishi Kazutoshi 87f10d476c Set false to animated options for thumbnail processor (#4547)
7 years ago
kibigo! 8150689b48 Merge upstream (#111)
7 years ago
Sorin Davidoi d4c4820c03 fix(web_push_notifications): Send message with welcome notifications (#4471)
7 years ago
Eugen Rochko 53b2b1b238 Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)
7 years ago
Eugen Rochko f0bb2c6d1e Fix web push notifications "boost" icon not being loaded (regression from #4426) (#4431)
7 years ago
Eugen Rochko 13bb1ddc7f Use consistent icons for web push notifications, same as web UI (#4426)
7 years ago
Sorin Davidoi e67fc997dc feat(web_push_notifications): Group notifications (#4388)
7 years ago
Sorin Davidoi e1798d0eb0 fix(push_subscription): Use star icon for favourite action (#4396)
7 years ago
Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
sdukhovni 06d905f415 Allow domain blocks that only reject media without silencing or suspending (#4325)
7 years ago
Eugen Rochko 7964bfccdb Add rake task mastodon:feeds:build to regenerate all active users' feeds (#4303)
7 years ago
beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master
7 years ago
Sorin Davidoi dcb9497148 fix(push_subscription): Guard against malformed favourite notification (#4271)
7 years ago
Eugen Rochko bbdcfd6baf Add ActivityPub attributes to accounts (#4273)
7 years ago
Eugen Rochko c2c93f8cd6 Fix deprecation warning for non-pipeline assets (#4267)
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
abcang 4d42a38954 Improve admin page (#4121)
7 years ago
Sorin Davidoi 8387b3928e fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
Eugen Rochko cd9b2ab2f7 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
Eugen Rochko 1618b68bfa HTTP signatures (#4146)
7 years ago
Eugen Rochko e2685ccc81 Fix #4149, fix #1199 - Store emojis as unicode (#4189)
7 years ago
Eugen Rochko c42092ba7a Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
masarakki a49be27145 add validation to tag name (#4194)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
unarist c2753fdfb4 Make tag search case insensitive again (#4184)
7 years ago
Eugen Rochko 880a5eb25c Fix boolean columns sometimes having a null value (#4162)
7 years ago
Eugen Rochko e48d3bfd01 Fix #1010 - When spoiler text is set, enforce sensitivity too (#4176)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
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
Yamagishi Kazutoshi 2b9721d1b3 Add setting a always mark media as sensitive (#4136)
7 years ago
Eugen Rochko 8b2cad5637 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
Damien Erambert 18d3fa953b Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) a37cf9548c Explicitly require MIME::Types (#4083)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) f85dbe83c8 Remove sort in Feed (#4050)
7 years ago
abcang a6d02cff36 Rescue exceptions caused by FetchLinkCardService (#4045)
7 years ago
abcang 1273fbf86e Rescue Addressable::URI::InvalidURIError at Remotable (#4017)
7 years ago
Eugen Rochko 71bc75e6ac Do not fail to create access token if superapp was never created (#3986)
7 years ago
beatrix-bitrot ddafde942c Merge remote-tracking branch 'upstream/master'
7 years ago
Surinna Curtis 4f36aad6e8 don't count bio metadata against bio length on server
7 years ago
beatrix-bitrot c0a665865e update bio length to 500
7 years ago
Eugen Rochko ed7dc1704d Bind web UI access tokens to sessions (#3940)
7 years ago
Eugen Rochko f7301bd5b9 Add overview of active sessions (#3929)
7 years ago
Sorin Davidoi 2211e8d1cd Revocable sessions (#3616)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) e27f792c24 Some minor change and spec for Account (#3813)
7 years ago
Eugen Rochko 0190aac240 Fix regression from #3842 (#3892)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) bab5a18232 Filter direct statuses in Status.as_home_timeline (#3842)
7 years ago
unarist a20cf3b64e Fix RemoteFollow behavior (#3868)
7 years ago
Eugen Rochko 4a618908e8 Account deletion (#3728)
7 years ago
Eugen Rochko dc8a6244fc Fix #2619 - When redis feed is empty, fall back to database (#3721)
7 years ago
Eugen Rochko 85d5518b6b Fix #3675 - Adjust quality settings of converted GIFs to reduce filesize (#3723)
7 years ago
René Klačan 85d405c810 Fix Account model deprecation warnings (#3689)
7 years ago
Yamagishi Kazutoshi f3e8bc9f8f Refactor UpdateRemoteProfileService (#3690)
7 years ago
Eugen Rochko cdff1da901 Correct validators so that existing error messages would look correct (#3668)
7 years ago
Matt Jankowski 022008a2a6 Language detection defaults to nil (#3666)
7 years ago
Yamagishi Kazutoshi 6384041d17 Add includes to Report#statuses (#3655)
7 years ago
Eugen Rochko 177dd8bb53 Fix regression from #3592 - validation condition nesting (#3644)
7 years ago
Eugen Rochko c207b4bb33 Fix db:seed - only run some validations when the field was changed (#3592)
7 years ago
Yamagishi Kazutoshi 0a0b9a271a Improve RuboCop rules (compatibility to Code Climate) (#3636)
7 years ago
unarist 004672aa6c Fix tag search order and not to use tsvector (#3611)
7 years ago
Matt Jankowski 6201f96b8a Introduce StatusThreadingConcern (#3490)
7 years ago
Eugen Rochko f7a30e2fae Added support for configurable reserved usernames (fix of #1382) (#3566)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 19084d3c6c Remove Targetable (#3548)
7 years ago
Matt Jankowski 2212dc4aaa Update Rails to version 5.1.1 (#3121)
7 years ago
Matt Jankowski d1e08bd38c Handle nil and blank cases in Account finders (#3500)
7 years ago
Matt Jankowski a132332b86 Add Instance class to list admin records (#3443)
7 years ago
Matt Jankowski b25e42a77f Misc tidying and clean ups (#3445)
7 years ago
Matt Jankowski 2cc3111a77 Expand spec coverage and refactor the `Account.find_` methods (#3485)
7 years ago