615 Commits (c670d2cadd8b3831989d179adf6a9947c06cd458)

Author SHA1 Message Date
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)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 561ca10d86 Some minor change and spec for Account (#3813)
7 years ago
Eugen Rochko e7810e4031 Fix regression from #3842 (#3892)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 77dcf442e7 Filter direct statuses in Status.as_home_timeline (#3842)
7 years ago
unarist 1d2eba7a84 Fix RemoteFollow behavior (#3868)
7 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