615 Commits (c670d2cadd8b3831989d179adf6a9947c06cd458)

Author SHA1 Message Date
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
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
Matt Jankowski 22f1d9099a Admin reports controller improvements (#1714)
8 years ago
Matt Jankowski 26ea2f70bd Admin accounts controller cleanup (#1664)
8 years ago
Matt Jankowski 0a6cfca260 Settings export refactor (#1646)
8 years ago
Matt Jankowski bf7306636e Allow import/export of mutes list (#1541)
8 years ago
Matt Jankowski 63e46e27f0 Refactor exports controller (#1567)
8 years ago
Eugen Rochko b440b2a9ee Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
blackle e7d77f4e13 Allow user to disable the boost confirm dialog in preferences
8 years ago
Eugen e0977567e7 When avatar/header are GIF, generate static versions (#1428)
8 years ago
Eugen 68f3ce7d0c API param to exclude notification types from response (#1341)
8 years ago
Matt Jankowski 874a240a58 Clean up generation of account webfinger string (#1477)
8 years ago
Eugen d30a82a22f Fix #1339 - better Atom titles (#1343)
8 years ago
Matt Jankowski 641e809eaf Search cleanup (#1333)
8 years ago
Eugen b532134503 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
8 years ago
Joël Quenneville 8a67fb5eca DRY up reblog vs original status check
8 years ago