252 Commits (62b47edf174f247d11e65f07b2164b3a029cf1c0)

Author SHA1 Message Date
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Jenkins 777559fa5f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 72e284028f Change user_id column non-nullable (#6435)
7 years ago
David Yip 2b43b1ab6b db/schema.rb: resolve erroneously-unresolved conflict
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
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
David Yip 1a7f8eb723 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
takayamaki 9fb57f8583 add index on statuses for /api/v1/accounts/:account_id/statuses (#6202)
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist d2fcd64c31 Use disable_ddl_transaction! to prevent warnings on migration (#6183)
7 years ago
Jenkins 0a2cc2361c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
takayamaki 2a2ac6c744 more faster index on notifications table (#6108)
7 years ago
David Yip d53f727653 Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang a40aff8dbc Remove duplicate indexes in lists (#5990)
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
Erin 5eadff9883 add a local_only column to the statuses table
7 years ago
Jenkins 099159741b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki ce3989fc6a Add embed_url to preview cards (#5775)
7 years ago
Jenkins a7a59f927d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
takayamaki dfceb51d93 add index on stream_entries table (#5793)
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
Jenkins 36452d6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist 0d0ad983b7 Merge indexes for reblog on statuses table (#5831)
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
abcang 17bde15f53 Add index of account and reblog to statuses (#5785)
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
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
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
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
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
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
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
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
unarist 75776cf237 Optimize FixReblogsInFeeds migration (#5538)
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 c123b710ad Add KeywordMute model.
7 years ago
Ondřej Hruška e2b44d03ee Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Daigo 3 Dango 6645e8ed40 Fix typo in a db:rollback script (#5422)
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
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
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 795e624d5d Add ability to specify alternative text for media attachments (#5123)
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 2e342947ce Forgotten in #5039, change statuses_tags tag_id to bigint (#5070)
7 years ago
nullkal d60728e91d Fix the migration error when deprecated_preview_cards has been deleted (#5043)
7 years ago
aschmitz f79569ba99 Hardcode IdToBigints migration columns (#5039)
7 years ago
Eugen Rochko eb345f8e8b Custom emoji (#4988)
7 years ago
Surinna Curtis 5c5416aa7a fix typos in the migration
7 years ago
Surinna Curtis 06ed918632 Add migration to default Mute#hide_notifications? to true
7 years ago
Surinna Curtis 0d5ce9d8e6 Add muting_notifications? and a notifications argument to mute!
7 years ago
Surinna Curtis df04a52a4d Add a hide_notifications column to mutes
7 years ago
Eugen Rochko 9ff429aa6d Uploads for admin site settings (#4913)
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
takayamaki 1ecae86d4f add index_notifications_on_id_and_account_id_and_activity_type on notifications table (#4750)
7 years ago
Eugen Rochko e9e271878e Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Eugen Rochko 86ffdf6083 Remove unneccesary indices (#4738)
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 b13501268f Fix up the applications area (#4664)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
Akihiko Odaki fd4c92f105 Add index favourites on account_id and id (#4360)
7 years ago
Eugen Rochko 81ebd4025a Add ActivityPub attributes to accounts (#4273)
7 years ago
Eugen Rochko c6e46f7421 Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)
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 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) 794afdca8d Add index statuses on account_id and id (#3895)
7 years ago
Matt Jankowski b439018342 Language detection defaults to nil (#3666)
7 years ago
Eugen Rochko 006594e181 Fix db:seed - only run some validations when the field was changed (#3592)
7 years ago
unarist 117d333a84 Fix tag search order and not to use tsvector (#3611)
7 years ago
Eugen Rochko d88c50a7ea Fix #3550 - Add all missing foreign keys (#3562)
7 years ago
René Klačan 02570b9c32 Add migration versions (#3574)
7 years ago
Matt Jankowski a7ec1e71c5 Add index to media_attachments.account_id (#3510)
7 years ago