Merge branch 'bugfix/1395-email-activation' into 'develop'
[akkoma] / lib / pleroma / object / containment.ex
2019-11-15 rinpatchMerge branch 'bugfix/1395-email-activation' into 'develop'
2019-11-14 rinpatchMerge branch 'fix/conversations-rendering' into 'develop'
2019-11-14 feldMerge branch 'feature/reports-groups-and-multiple-state...
2019-11-14 rinpatchMerge branch 'reactions' into 'develop'
2019-11-13 lainMerge branch 'fix-rate-limiter-test' into 'develop'
2019-11-13 rinpatchMerge branch 'fix-docs-formatting' into 'develop'
2019-11-13 lainMerge branch 'static-remote-redirect' into 'develop'
2019-11-13 rinpatchMerge branch 'bugfix/1360-actorless-posts' into 'develop'
2019-11-12 lainContainment: Add a catch-all clause to contain_origin.
2019-11-11 lainMerge branch 'iss-1376' into 'develop'
2019-11-11 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-11-10 lainMerge branch 'develop' into 'reactions'
2019-11-10 lainMerge branch 'issue/1339' into 'develop'
2019-11-08 rinpatchMerge branch 'bugfix/containment-no-id' into 'develop'
2019-11-08 Ariadne Conillobject containment: handle all cases where ID is invali...
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-27 Maxim FilippovMerge branch 'develop' into feature/store-statuses...
2019-10-21 Maksim PechnikovMerge branch 'develop' into feature/masto_api_markers
2019-10-21 Egor KislitsynMerge branch 'develop' into refactor/following-relation...
2019-10-20 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-18 Mark FelderMerge branch 'develop' into feature/push-subject-for-dm
2019-10-18 rinpatchMerge branch 'patch-1' into 'develop'
2019-10-18 rinpatchMerge branch 'fix/pleroma-ctl-rpc' into 'develop'
2019-10-18 Maxim FilippovMerge branch 'develop' into feature/relay-list
2019-10-18 kaniiniMerge branch 'feature/ostatus-removal' into 'develop'
2019-10-18 Ariadne Conillobject: containment: simplify the pattern match for...
2019-10-18 Ariadne Conillobject: containment: only allow OStatus references...
2019-10-18 Ariadne Conillobject: containment: also allow OStatus object IDs...
2019-10-18 Ariadne Conillobject: containment: don't try to contain ostatus objects
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-20 rinpatchResolve merge conflicts
2019-07-18 Maxim FilippovMerge branch 'develop' into feature/admin-api-user...
2019-07-16 Roman ChvanikovMerge develop
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-15 kaniiniMerge branch 'sha512-crypt' into 'develop'
2019-07-15 Sachin JoshiMerge branch 'develop' into match-file-name
2019-07-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-07-14 kaniiniMerge branch 'security/ir-generic-containment' into...
2019-07-14 Ariadne Conillsecurity: detect object containment violations at the...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-15 lainMerge branch 'bugfix/980-polls-double-vote' into 'develop'
2019-06-15 kaniiniMerge branch '963_oob_oauth_redirect_fix' into 'develop'
2019-06-14 rinpatchMerge branch 'feature/add-background-image-to-mastoapi...
2019-06-14 lainMerge branch 'patch-2' into 'develop'
2019-06-14 EgorAdd copyright info to containment.ex
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-13 lambdaMerge branch 'mascot/pleroma-tan-shy' into 'develop'
2019-05-08 Roman ChvanikovMerge develop
2019-05-07 kaniiniMerge branch 'refactor/preload-bookmarks-with-activitie...
2019-05-07 kaniiniMerge branch 'docs/MRF-modules' into 'develop'
2019-05-07 William Pitcockcontainment: remove pointless moduledoc line
2019-05-06 Haelwenn (lanodan... Remove H1 in @moduledoc
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into...
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-20 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-19 kaniiniMerge branch 'feature/database-compaction' into 'develop'
2019-04-18 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-17 rinpatchRemove containment tests from transmogrifier and fix...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2018-12-04 William Pitcockobject: move object containment out of transmogrifier...