1129 Commits (c2ecfa969b3b782e0954fc6ad48bfffd49bbc629)

Author SHA1 Message Date
abcang fcfc44de66 Keep notification when muting_notifications is true (#7311)
7 years ago
Eugen Rochko 4258e304c5 Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)
7 years ago
Eugen Rochko d6a2530d73 Speed up test suite by not generating RSA keys in test environment (#7296)
7 years ago
David Yip e484bd61e0 Also treat non-whole-word mutes as case-insensitive. #450.
7 years ago
Eugen Rochko 1a653fff95 Add entity cache (#7271)
7 years ago
Emelia Smith 49d9ea6998 Implement the ability for instances to define a list of disallowed hashtags (#7176)
7 years ago
Emelia Smith 1071ecfebc Prevent suspended accounts from appearing in AccountSearchService (#7246)
7 years ago
Akihiko Odaki e22f682df0 Paginate descendant statuses in public page (#7148)
7 years ago
Yamagishi Kazutoshi e83e74f36d Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
Eugen Rochko 39f36c0901 Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)
7 years ago
Eugen Rochko 0ad5e05e4a Rescue Mastodon::LengthValidationError in Remoteable (#7228)
7 years ago
Eugen Rochko 85c3f7eb1b Force convert to JPG for preview card thumbnails to avoid animations (#7109)
7 years ago
David Yip 48f5f736a0 db: make schema.rb version subsume bookmarks migration.
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
Eugen Rochko 4f460eba18 Fix warning about using SQL in order for Account#partitioned (#7159)
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
Paul Woolcock ed21e48ad6 Change custom emoji search to `ILIKE` instead of `=` (#7099)
7 years ago
Emelia Smith 765bfd0cf5 Feature: Allow staff to change user emails (#7074)
7 years ago
MIYAGI Hikaru 62c6b71866 Fix GIFV encoding params (#7098)
7 years ago
Akihiko Odaki 31e1667933 Exclude status itself from context query (#7083)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 5373b138e8 Feature: Report improvements (#6967) (#7000)
7 years ago
David Yip 21394c5462 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Underwood 44274257de [WIP] Enable custom emoji on account pages and in the sidebar (#6124)
7 years ago
David Yip 2567d0a704 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip 7cdf2b05b6 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko ebba6fb7f5 Fix UniqueUsernameValidator comparison (#6926)
7 years ago
Akihiko Odaki acece7a2e6 Validate HTTP response length while receiving (#6891)
7 years ago
Jenkins ae55717f50 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 472fba6771 Change columns in notifications nonnullable (#6764)
7 years ago
Akihiko Odaki 11c19f6cc9 Close http connection in perform method of Request class (#6889)
7 years ago
Jenkins 60eafb173f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f4e8e39c99 Restore username validation to disallow dots, for now (#6863)
7 years ago
ThibG 7d7a725e82 Fix MENTION_RE to not match nil usernames (#6862)
7 years ago
Jenkins a9bcd383b8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 53b1100144 Permit dots in usernames with conditions (#6844)
7 years ago
Jenkins eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 4fc9827b69 bugfixes and gem update (#6831)
7 years ago
Jenkins 3d16993fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel Hunsaker 8f374100ed Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)
7 years ago
David Yip 9ca0336c15 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 51b32f06fa Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 34b3d46480 Rescue when there's no extension in the remotable (#6358)
7 years ago
Eugen Rochko 0c2a08adeb Remove text requirement when media attached from statuses (#6672)
7 years ago
Effy Elden 4a8046df66 Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)
7 years ago
Eugen Rochko ba865c44d8 Fix #3807: Increase avatars to 400x400 max (#6651)
7 years ago
Akihiko Odaki 649565e005 Provide default OTP_SECRET value for development environment (#6617)
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 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
Eugen Rochko 0ebd2a1718 Federated reports (#6570)
7 years ago
Ian McCowan 88461c1abe Fix prev/next links on public profile page (#6497)
7 years ago
Eugen Rochko f35356609b Ensure the app does not even start if OTP_SECRET is not set (#6557)
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
Ghislain Loaec deea524052 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko 865c7e7178 Focal points (#6520)
7 years ago
Eugen Rochko c9ed272a4a Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Eugen Rochko c34ff9fb82 Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f759ec9d8d Don't resize avatars/headers if their dimensions are already right (#6508)
7 years ago
Eugen Rochko 750f3e64c9 Cache relationships in API (#6482)
7 years ago
Eugen Rochko 3f2a113d32 Push discovered status through streaming API within a time window (#6484)
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
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip d9cc3b60fb Merge remote-tracking branch 'origin/merge-upstream'
7 years ago
David Yip 062f72c593 Use Html2Text to generate plaintext for keyword mutes. #236.
7 years ago
David Yip 00cb763893 Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.
7 years ago
David Yip a5f1c1f469 Fill out some examples for Glitch::FilterHelper. #234.
7 years ago
David Yip e365675e0a Strip HTML from keyword mute input. #234.
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
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 c1263f5db5 Clear account cache of notification target_status (#6442)
7 years ago
Akihiko Odaki 72e284028f Change user_id column non-nullable (#6435)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 555e7205da Make PAM gem optional, allow configuration over environment (#6415)
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
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 d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 49b76b3025 Change belongs_to_required_by_default to true (#5888)
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
Jenkins 6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 67ee638c28 Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)
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
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel bc5487a1c2 Fix email confirmation link not updating email (#6187)
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
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
David Yip d53f727653 Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
David Yip b8e6074c53 Examples for Status#set_locality and .as_tag_timeline.
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
Akihiko Odaki a90fa13235 Change account_id non-nullable in lists (#5979)
7 years ago
Eugen Rochko 3b69e9b99c Exclude moved accounts from search results (#5984)
7 years ago
Erin eb0660f6ef move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
Erin 6f3321fe4f set local_only in a before_create callback instead of status service
7 years ago
Erin 7fc6f40a88 remove vestigial Status#local_only? definition
7 years ago
Erin 278d34a0ec Status#not_local_only scope should match nils too
7 years ago
Erin b463321c6f filter local-only statuses from public pages
7 years ago
Erin 993449ee59 status: stub local_only?, add scope, add marked_local_only?
7 years ago
Erin 5eadff9883 add a local_only column to the statuses table
7 years ago
Andrea Scarpino e8198cd298 Fix account and tag searches with leading/trailing spaces (#5965)
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
Eugen Rochko f16141ebac Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
Eugen Rochko 46cce9ee4b Ensure link thumbnails are not stretched to super low quality (#5932)
7 years ago
Jenkins 099159741b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi a7f20ed185 Remove duplicate annotate (#5910)
7 years ago
Akihiko Odaki ce3989fc6a Add embed_url to preview cards (#5775)
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
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 ff4c28a305 Lists redis clean-up (#5886)
7 years ago
Eugen Rochko 1e7f022fa2 Add list of lists component to web UI (#5811)
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
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
kibigo! 36b9f4df56 Skins support
7 years ago
Jenkins a7a59f927d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 2421fd745a Fix too many forwards (#5854)
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d6846dce20 Show "expired" in invite index (#5838)
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 7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
William Pitcock a4bb95d8b3 status: preserve visibility attribute when reblogging (infoleak fix) (#5789)
7 years ago
abcang 3db3ca1258 Fix unnecessary order (#5807)
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
Jenkins 9c9b105d43 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang defb2fd0b0 Fix N+1 at notification (#5752)
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
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
beatrix 27ca589183 Merge pull request #208 from yipdw/keyword-mute
7 years ago
David Yip 08751360a0 Update annotations on Follow, FollowRequest, and Mute.
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
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
Eugen Rochko 21d01d5809 Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
ysksn bf1d4a2cb9 Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
David Yip b4725cad17 Replace =~ with #matches?. #208.
7 years ago
David Yip 21e138379d Prefix cache keys with the matcher type. #208.
7 years ago
David Yip 2c6a2d588c Match keyword mute filter on hashtags. #208.
7 years ago
beatrix ed1cf698a2 Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
ysksn 475b7cecb5 Delegate some methods of User to @settings (#5706)
7 years ago
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
Yamagishi Kazutoshi 3a51544e9a Add uniqueness to block email domains (#5692)
7 years ago
David Yip 13ec4a9a20 Maintain case-insensitivity when merging multiple matchers (#213)
7 years ago
Daniel Hunsaker 96504fd1ec Update model annotations to use BIGINT for IDs (#5461)
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 2f1fdd37d3 Per-user reblog hiding implementation/fixes/tests
7 years ago
aschmitz 2aedd8eaad "Show reblogs" per-follower UI/database changes
7 years ago
ysksn 26f52a2551 Add and Remove tests for FollowRequest (#5622)
7 years ago
ThibG 4912f539c3 Twidere mention workaround (#5552)
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
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 b8c462c42b Remove nil check in Glitch::KeywordMute#=~.
7 years ago
David Yip 05fecda52d Switch to Regexp.union for building the mute expression.
7 years ago
David Yip 763fd4b275 Only cache the regex text, not the regex itself.
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip e8314ee2a6 KeywordMute matcher: more closely mimic Regexp#=~ behavior.
7 years ago
David Yip 3b2bf30644 Don't add \b to whole-word keywords that don't start with word characters.
7 years ago
David Yip b2ad79547c Apply keyword mutes to reblogs.
7 years ago
David Yip 74141adca1 Move KeywordMute into Glitch namespace.
7 years ago
David Yip 05ee0aeb8b Allow keywords to match either substrings or whole words.
7 years ago
David Yip be472f276d Invalidate cached matcher objects on KeywordMute commit. #164.
7 years ago
David Yip aa57929688 Use more idiomatic string concatentation. #164.
7 years ago
David Yip f3a57932c0 Make use of the regex attr_reader. #164.
7 years ago
David Yip a3ee8592a8 Rework KeywordMute interface to use a matcher object; spec out matcher. #164.
7 years ago
David Yip ddcb129101 Spec out KeywordMute interface. #164.
7 years ago
David Yip c123b710ad Add KeywordMute model.
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
unarist 490f3146f2 Optimize Status#permitted_for 500x (account timeline) (#5373)
7 years ago
Eugen Rochko 7ccc1c5748 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Lex Alexander 526b66e871 Retoot count increases without reason (#5363)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
nullkal 4a45cc7566 foreign_key, non-nullable, dependent: destroy in account_moderation_notes (#5294)
7 years ago
beatrix 6f578c25c6 try to tighten up local only toot stuff, like... properly (#163)
7 years ago
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260)
7 years ago
DJ Sundog e50cd23407 update indentation
7 years ago
DJ Sundog c7cae1bf0f add faststart to audio transcoding
7 years ago
DJ Sundog c3e5510289 adding support for audio uploads, transcoded to mp4 videos
7 years ago
nullkal 81489970fb Add moderation note (#5240)
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
Eugen Rochko f37350c08f When processing custom emoji, ensure a non-animated version exists (#5230)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
aschmitz 5b2d855d86 Non-Serial ("Snowflake") IDs (#4801)
7 years ago
aschmitz 04fde500e6 Make IdsToBigints (mostly!) non-blocking (#5088)
7 years ago
Eugen Rochko cb8ecac1ce After 7 days of repeated delivery failures, give up on inbox (#5131)
7 years ago
Eugen Rochko 5f137e7ec3 Increase attachment descriptions to 420 characters (#5139)
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
Eugen Rochko e8871341bf Fix empty query sent to postgres for custom emojis (#5121)
7 years ago
kibigo! aac16a82d6 Better themeing support!!
7 years ago
unarist df27f599d2 Increase max height of preview card image (#5092)
7 years ago
Eugen Rochko da257754b5 Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko f621e05356 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Eugen Rochko d2aeb45461 Fix custom emojis not detected when used in content warning (#5049)
7 years ago
Akihiko Odaki f9dd41621f Do not filter statuses with unknown languages (#5045)
7 years ago
unarist ca502e7b15 Use file extensions in addition to MIME types for file picker (#5029)
7 years ago
Akihiko Odaki b1ba673029 Introduce OStatus::TagManager (#5008)
7 years ago
Andrew b4842ef0b9 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko eb345f8e8b Custom emoji (#4988)
7 years ago
unarist 3978894d05 Validate uri presence for remote status (#4985)
7 years ago
Akihiko Odaki 8c96e0d496 Remove local_only scope in Status (#4977)
7 years ago
Eugen Rochko 26c797bf0d When accessing uncached media attachment, redownload it (#4955)
7 years ago
Eugen Rochko 74626108b6 Fix #4908 - Do not keep remote file names, generate random (#4934)
7 years ago
Surinna Curtis 5c5416aa7a fix typos in the migration
7 years ago
Surinna Curtis 3688a48100 Refactor handling of default params for muting to make code cleaner
7 years ago
Surinna Curtis d6b0f5fb2c add an explanatory comment to AccountInteractions
7 years ago
Surinna Curtis b2ba83bbda Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint
7 years ago
Surinna Curtis d629e90628 Expose whether a mute hides notifications in the api/v1/relationships endpoint
7 years ago
Surinna Curtis 0d5ce9d8e6 Add muting_notifications? and a notifications argument to mute!
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 703fd425ff Fix count numbers from ActivityPub not being saved (#4899)
7 years ago
Surinna Curtis 2f872fc0aa Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
David Yip f90abccf33 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko 6628ea4a82 Default follows for new users (#4871)
7 years ago
David Yip 017738c604 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
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 8bb036350a Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)
7 years ago
voidSatisfaction ac63da7732 Feat add validation for report comment: characters under 1000 valid (#4833)
7 years ago
Eugen Rochko 5ad3153b0b Fix locking migration on statuses table. Nullable column and NO default value (#4825)
7 years ago
Eugen Rochko 73c613dcfc Switch to static URIs, new URI format in both protocols for new statuses (#4815)
7 years ago
abcang d73174b629 Validate data of Imports (#4782)
7 years ago
unarist 11a09cdc59 Fix WebPush (regression from #4524) (#4778)
7 years ago
Eugen Rochko e9e271878e Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko 2bbb10a186 Refactor Web::PushSubscription, remove welcome message (#4524)
7 years ago
nullkal fe417663d9 Use request.remote_ip instead of request.ip (#4744)
7 years ago
Eugen Rochko 3135d20283 Serialize ActivityPub alternate link into OStatus deletes, handle it (#4730)
7 years ago
abcang 4fb007764b rescue HTTP::ConnectionError in RemoteFollowController#create (#4726)
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
Eugen Rochko d44b84bebd Minor performance improvement for test suite (#4678)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
Eugen Rochko 0268b334ae Periodically remove expired PuSH subscribers (#4654)
7 years ago
Eugen Rochko d76bd63226 Do not try to re-subscribe to unsubscribed accounts (#4653)
7 years ago
Eugen Rochko 2dba0368f8 Redesign public profiles (#4608)
7 years ago
Eugen Rochko 5516767c75 ActivityPub delivery (#4566)
7 years ago
Eugen Rochko f18739fd60 Add ActivityPub inbox (#4216)
7 years ago
Yamagishi Kazutoshi 2c729c9376 Add coalesce option to avatar and header convert processor (#4552)
7 years ago
Yamagishi Kazutoshi bd6676b176 Revert "Set false to animated options for thumbnail processor" (#4550)
7 years ago
Ondřej Hruška 913dd13575 Merge remote-tracking branch 'upstream/master'
7 years ago
Yamagishi Kazutoshi 730fa0a06b Set false to animated options for thumbnail processor (#4547)
7 years ago
kibigo! 2cdee6ae8a Merge upstream (#111)
7 years ago
Sorin Davidoi d8f78827a4 fix(web_push_notifications): Send message with welcome notifications (#4471)
7 years ago
Eugen Rochko 39b0588256 Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)
7 years ago
Eugen Rochko ed3d301791 Fix web push notifications "boost" icon not being loaded (regression from #4426) (#4431)
7 years ago
Eugen Rochko 2e32794a12 Use consistent icons for web push notifications, same as web UI (#4426)
7 years ago
Sorin Davidoi 56c021c349 feat(web_push_notifications): Group notifications (#4388)
7 years ago
Sorin Davidoi 097fb21522 fix(push_subscription): Use star icon for favourite action (#4396)
7 years ago
Ondřej Hruška 7072288bcf Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
sdukhovni 961f103c35 Allow domain blocks that only reject media without silencing or suspending (#4325)
7 years ago
Eugen Rochko a09a4a5899 Add rake task mastodon:feeds:build to regenerate all active users' feeds (#4303)
7 years ago
beatrix 64a107bc64 Merge pull request #87 from tootsuite/master
7 years ago
Sorin Davidoi 04ec8a8f38 fix(push_subscription): Guard against malformed favourite notification (#4271)
7 years ago
Eugen Rochko 81ebd4025a Add ActivityPub attributes to accounts (#4273)
7 years ago
Eugen Rochko 7b610bea1b Fix deprecation warning for non-pipeline assets (#4267)
7 years ago
Ondřej Hruška ed6c60a0c2 Merge changes from upstream with the CSS reload fix
7 years ago
Yamagishi Kazutoshi 87bb16a236 Add unfollow modal (optional) (#4246)
7 years ago
abcang e3251e74c1 Improve admin page (#4121)
7 years ago
Sorin Davidoi 3d4ae604b8 fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago
Eugen Rochko c6e46f7421 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
7 years ago
Eugen Rochko c5fa4aba91 HTTP signatures (#4146)
7 years ago
Eugen Rochko 5138dde794 Fix #4149, fix #1199 - Store emojis as unicode (#4189)
7 years ago
Eugen Rochko 7d8fd050eb Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
masarakki d0a037ae79 add validation to tag name (#4194)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
unarist ae26d7b557 Make tag search case insensitive again (#4184)
7 years ago
Eugen Rochko 4e7288d18a Fix boolean columns sometimes having a null value (#4162)
7 years ago
Eugen Rochko 348de9dbc3 Fix #1010 - When spoiler text is set, enforce sensitivity too (#4176)
7 years ago
kibigo! bcc30c8697 Merge upstream!! #64 <3 <3
7 years ago
Eugen Rochko 8abeec1f4f Improve UI of admin site settings (#4163)
7 years ago
Eugen Rochko 903b34fa94 Fix #2848 - Rake task to redownload avatars/headers (#4156)
7 years ago
Yamagishi Kazutoshi 865f5170a8 Add setting a always mark media as sensitive (#4136)
7 years ago
Eugen Rochko 20e15ecfb3 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
Damien Erambert 387de88e2f Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 4a041cde77 Explicitly require MIME::Types (#4083)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) d5586563c7 Remove sort in Feed (#4050)
7 years ago
abcang 43d97dea48 Rescue exceptions caused by FetchLinkCardService (#4045)
7 years ago
abcang 41856d021b Rescue Addressable::URI::InvalidURIError at Remotable (#4017)
7 years ago
Eugen Rochko e49dd75db7 Do not fail to create access token if superapp was never created (#3986)
7 years ago
beatrix-bitrot cdcb74ffb6 Merge remote-tracking branch 'upstream/master'
7 years ago
Surinna Curtis 8db313f13a don't count bio metadata against bio length on server
7 years ago
beatrix-bitrot ecfb516588 update bio length to 500
7 years ago
Eugen Rochko ad531f90b1 Bind web UI access tokens to sessions (#3940)
7 years ago
Eugen Rochko c465c5b3a8 Add overview of active sessions (#3929)
7 years ago
Sorin Davidoi 1280559503 Revocable sessions (#3616)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 561ca10d86 Some minor change and spec for Account (#3813)
8 years ago
Eugen Rochko e7810e4031 Fix regression from #3842 (#3892)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 77dcf442e7 Filter direct statuses in Status.as_home_timeline (#3842)
8 years ago
unarist 1d2eba7a84 Fix RemoteFollow behavior (#3868)
8 years ago
Eugen Rochko 1c7e2ddd65 Account deletion (#3728)
8 years ago
Eugen Rochko 973d6ef93a Fix #2619 - When redis feed is empty, fall back to database (#3721)
8 years ago
Eugen Rochko 46af0c66b6 Fix #3675 - Adjust quality settings of converted GIFs to reduce filesize (#3723)
8 years ago
René Klačan 042d4c1663 Fix Account model deprecation warnings (#3689)
8 years ago
Yamagishi Kazutoshi d3279a6702 Refactor UpdateRemoteProfileService (#3690)
8 years ago
Eugen Rochko 9ea895f05f Correct validators so that existing error messages would look correct (#3668)
8 years ago
Matt Jankowski b439018342 Language detection defaults to nil (#3666)
8 years ago
Yamagishi Kazutoshi 69dc56b5d0 Add includes to Report#statuses (#3655)
8 years ago
Eugen Rochko 67330ceec7 Fix regression from #3592 - validation condition nesting (#3644)
8 years ago
Eugen Rochko 006594e181 Fix db:seed - only run some validations when the field was changed (#3592)
8 years ago
Yamagishi Kazutoshi 5da41e0cae Improve RuboCop rules (compatibility to Code Climate) (#3636)
8 years ago
unarist 117d333a84 Fix tag search order and not to use tsvector (#3611)
8 years ago
Matt Jankowski d339ac2c76 Introduce StatusThreadingConcern (#3490)
8 years ago
Eugen Rochko 4a6ceb24c9 Added support for configurable reserved usernames (fix of #1382) (#3566)
8 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 664686b1dc Remove Targetable (#3548)
8 years ago
Matt Jankowski eea027c5c2 Update Rails to version 5.1.1 (#3121)
8 years ago
Matt Jankowski 25990c77c0 Handle nil and blank cases in Account finders (#3500)
8 years ago
Matt Jankowski deb4ae7392 Add Instance class to list admin records (#3443)
8 years ago
Matt Jankowski 533a8cc68b Misc tidying and clean ups (#3445)
8 years ago
Matt Jankowski ff4d3f11b5 Expand spec coverage and refactor the `Account.find_` methods (#3485)
8 years ago
alpaca-tc d04c02ac37 Account.find_remote should be raise ActiveRecord::RecordNotFound (#3476)
8 years ago
Akihiko Odaki 20d016f430 Refactor User and spec (#3431)
8 years ago
Jack Jennings faf53a5a3e Extract authorization policy for viewing statuses (#3150)
8 years ago
Atsushi Yamamoto 4547e3585a Add preference setting for delete toot modal (#3368)
8 years ago
Yamagishi Kazutoshi 153e96eb02 Remove arguments in association reader (#3305)
8 years ago
alpaca-tc 0931218b3f Refactor Setting (#3302)
8 years ago
masarakki 0949d86d83 fix-cache-returns-nil (#3213)
8 years ago
Akihiko Odaki 4f023cb001 Introduce recent to Follow (#3247)
8 years ago
Akihiko Odaki 9cc7a3c209 Cover AccountsController more in spec (#3229)
8 years ago
Matt Jankowski 8c11626321 Add coverage for ReportFilter and AccountFilter (#3236)
8 years ago
Matt Jankowski 0eb8b00cc9 Specs for cleanup workers (#3235)
8 years ago
Akihiko Odaki 90c8175cb0 Fix mutes_controller error and incorrect statuses_controller report (#3202)
8 years ago
Matt Jankowski 1122249e51 Filter languages with opt out (#3175)
8 years ago
beatrix 4f3b6cc3be guard against empty domain block list in status scope (#3161)
8 years ago
Eugen Rochko de5e67238b Fix federated timeline excluding local toots when any domain blocks are set (#3151)
8 years ago
Eugen Rochko 5695449335 Add buttons to block and unblock domain (#3127)
8 years ago
alpaca-tc b0979ed58e Define instance method outside #included (#3128)
8 years ago
Matt Jankowski 6619cfe934 Conditional validations no longer accept strings for if/unless (#3124)
8 years ago
Eugen Rochko 0cafe62561 Account domain blocks (#2381)
8 years ago
Yamagishi Kazutoshi bd1f7d0b9c Fetch remote image using http.rb (#3114)
8 years ago
alpaca-tc 5523fd6efb Refactor Status#ancestors/descendants (#3092)
8 years ago
alpaca-tc c0791aa647 Add filter to AccountFilter (#2968)
8 years ago
alpaca-tc b8b7be1e4a Improve Account#triadic_closures (#3079)
8 years ago
alpaca-tc 41295c0bbd Order by symbol value (#3077)
8 years ago
alpaca-tc 0d7dc192c3 Optimize Status#permitted_for 24x (#3069)
8 years ago
Eugen Rochko bd7dc50186 Fix change of status callbacks not setting in_reply_to_account_id and (#3072)
8 years ago
Eugen Rochko 5039bc93d5 Feature conversations muting (#3017)
8 years ago
alpaca-tc 4b5edb0d16 Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)
8 years ago
Eugen Rochko 12ef99556e Add conversation model, <ostatus:conversation /> (#3016)
8 years ago
Eugen Rochko db707c7af3 Fix #1426 - Trim long usernames in public follower/following lists (#2993)
8 years ago
Eugen Rochko 7c20c80ed7 Fix #2027 - Accept own ID for remote follow with and without preceding @ (#2991)
8 years ago
Go Shoemake f87af43ee7 Fixed mention regex to support unicode (#2420)
8 years ago
Matt Jankowski 23f6ec856f Delegate Account#user_locale method and allow nil (#2927)
8 years ago
Matt Jankowski bddb03a089 Improve allowed language handling (#2897)
8 years ago
alpaca-tc 2745fc5268 Refactor account.rb (#2881)
8 years ago
alpaca-tc de0f63e0ac Fixes slow query in notifications api (#2851)
8 years ago
Matt Jankowski 05b8a950c6 Stream entry specs and refactor to use delegate (#2827)
8 years ago
Matt Jankowski b6b297a297 Move account header and avatar methods to a concern (#2825)
8 years ago
alpaca-tc 3ceb700ea2 Fixes unknown mime type (#2822)
8 years ago
Matt Jankowski 5393dbf4a2 Misc spec coverage improvements (#2821)
8 years ago
Eugen Rochko c32e312061 More robust PuSH subscription refreshes (#2799)
8 years ago
Tomohiro Suwa 89550de8cf Correct Account model for rubocop (#2587)
8 years ago
Kaylee fae1ed48e3 Add option to disable two factor auth in admin accounts panel. (#2584)
8 years ago
Yamagishi Kazutoshi 70f9858e6f Fix subscription expiration condition (#2715)
8 years ago
yhirano e5eb070430 annotate models (#2697)
8 years ago
Matt Jankowski fdd7ee1cc7 Coverage for remote follows (#2694)
8 years ago
Matt Jankowski c44ef23e50 Filter on allowed user language preferences (#2361)
8 years ago
yhirano 18e4933432 Fix Rubocop offences (#2630)
8 years ago
Yamagishi Kazutoshi 9f6363a319 Detect extension for preview card (#2679)
8 years ago
Matt Jankowski 4f155a3c86 Reports spec for media attachments, clean up method (#2660)
8 years ago
Akihiko Odaki a28863bf95 Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634)
8 years ago
Akihiko Odaki 7cd8e61b5a Use PostgreSQL inheritance for blocks and mutes (#2520)
8 years ago
Patrick Figel ef6f02c173 Set correct attachment type for rejected media (#2599)
8 years ago
Matt Jankowski 442d4cfb4a More controller specs (#2561)
8 years ago
Matt Jankowski 3e819257ab More status specs (#2564)
8 years ago
Eugen Rochko 886aa14cfc Cache Status#ancestors recursive query results (#2527)
8 years ago
Eugen Rochko 4a7dc4fadc OEmbed support for PreviewCard (#2337)
8 years ago
Tomohiro Suwa 7bb45d9ed5 Don't need to include ActiveModel::Validations (#2521)
8 years ago
Francis Chong 395608442d Add media dimensions (#2448)
8 years ago
Eugen 87f7a3922c Punycode URI normalization (#2370)
8 years ago
Effy Elden 6b031c8fc6 Report processing improvements (#2349)
8 years ago
Eugen f89e26bdd5 Followers-only post federation (#2111)
8 years ago
Evan Minto 227f45402d ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)
8 years ago
Ash Furrow eb7db6f8da Admin UI for confirming users (#2245)
8 years ago
codl 064101f8c6 strip leading & trailing spaces from remote follow acct (#997) (#2321)
8 years ago
Eugen 5849eac93e Fix #2108 - Fix gif uploads (#2171)
8 years ago
alpaca-tc e40ea6cd9d Extract error messages to locale file (#2162)
8 years ago
Eugen 48d8e5a82f Attachment list for uncached attachments (#2110)
8 years ago
Eugen 21816d08ec Fix #1642, fix #1912 - Dictate content-type file extension (#2078)
8 years ago
Matt Jankowski ce5cb2b81c Instances list in admin (#2095)
8 years ago
Matt Jankowski 4b6be67e85 Admin reports with accounts (#2092)
8 years ago
839 95e8ab21a1 Avoid dynamic methods due to processing speed (#2080)
8 years ago
Eugen Rochko 336fd904db Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
8 years ago
Matt Jankowski 7a7a2d591f Remove unused methods (#1730)
8 years ago
Eugen Rochko 8867792e53 Rename cache key to exclude_account_ids_for:id, adjust formatting
8 years ago
Eugen Rochko 8af5ceb661 Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking
8 years ago
Matt Jankowski 47cc8462e3 Media controller specs (#2022)
8 years ago
alpaca-tc 4f0d96aa5e Required foreign keys (#2003)
8 years ago
Patrick Figel 2fb1f07888 Add gif auto-play/pause preference
8 years ago
Matt Jankowski fff8d92577 I18n health warnings (#1949)
8 years ago
Effy Elden d52abe1cc7 Merge branch 'master' into fix/cache_blocking
8 years ago
Matt Jankowski a3a4fe2163 Simplify the og:image and og:description code in stream_entries/show (#1934)
8 years ago
tackeyy 813ee3cde6 Remove .keep in models (#1892)
8 years ago
alpaca-tc 30ef109bc5 Add presence validation to Import (#1928)
8 years ago
Eugen ba6b4c6e62 Make file attachment on MediaAttachment optional (#1865)
8 years ago
Keiji Yoshimi 6ca3a6c9f4 cache blockings for reducing queries.
8 years ago
Patrick Figel 15b393201e Add recovery code support for two-factor auth (#1773)
8 years ago
西小倉宏信 d91b462aa1 Remove .keep in models (#1748)
8 years ago