projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Resolve merge conflicts
[akkoma] / lib / pleroma / object / fetcher.ex
2019-07-20 rinpatchResolve merge conflicts blob | commitdiff | raw
2019-07-20 rinpatchApply suggestion to lib/pleroma/object/fetcher.ex blob | commitdiff | raw | diff to current
2019-07-19 Mark FelderMerge branch 'develop' into feature/matstodon-statuses... blob | commitdiff | raw | diff to current
2019-07-19 kaniiniMerge branch 'feature/richmedia-ttl' into 'develop' blob | commitdiff | raw | diff to current
2019-07-18 kaniiniMerge branch 'feature/signed-object-fetches' into ... blob | commitdiff | raw | diff to current
2019-07-17 Ariadne Conillfetcher: sign object fetches if configured blob | commitdiff | raw | diff to current
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses... blob | commitdiff | raw | diff to current
2019-07-15 Sachin JoshiMerge branch 'develop' into match-file-name blob | commitdiff | raw | diff to current
2019-07-15 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw | diff to current
2019-07-14 kaniiniMerge branch 'bugfix/llal-object-containment' into... blob | commitdiff | raw | diff to current
2019-07-14 Haelwenn (lanodan... Object.Fetcher: Keep the with-do block as per kaniini... blob | commitdiff | raw | diff to current
2019-07-14 Haelwenn (lanodan... Object.Fetcher: Fallback to OStatus only if AP actually... blob | commitdiff | raw | diff to current
2019-07-14 Haelwenn (lanodan... Object.Fetcher: Handle error on Containment.contain_ori... blob | commitdiff | raw | diff to current
2019-07-13 rinpatchRefactor Follows/Followers counter syncronization blob | commitdiff | raw | diff to current
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists blob | commitdiff | raw | diff to current
2019-07-10 kaniiniMerge branch 'release/listener' into 'develop' blob | commitdiff | raw | diff to current
2019-07-10 kaniiniMerge branch 'fix/license-attribution' into 'develop' blob | commitdiff | raw | diff to current
2019-07-10 feldAdd license/copyright to all project files blob | commitdiff | raw | diff to current
2019-07-09 Ivan Tashkinov[#878] Merge remote-tracking branch 'remotes/upstream... blob | commitdiff | raw | diff to current
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop' blob | commitdiff | raw | diff to current
2019-07-09 Mark FelderMerge branch 'develop' into feature/allow-user-query... blob | commitdiff | raw | diff to current
2019-07-09 kaniiniMerge branch 'remove-swift' into 'develop' blob | commitdiff | raw | diff to current
2019-07-09 kaniiniMerge branch 'features/sec-websocket-protocol-header... blob | commitdiff | raw | diff to current
2019-07-09 HaelwennMerge branch 'enable-ogp-by-default' into 'develop' blob | commitdiff | raw | diff to current
2019-07-09 HaelwennMerge branch 'test-speedup' into 'develop' blob | commitdiff | raw | diff to current
2019-07-09 Mark FelderMerge branch 'develop' into proxy-error blob | commitdiff | raw | diff to current
2019-07-09 rinpatchMerge branch '161-incoming-replies-depth-limit' into... blob | commitdiff | raw | diff to current
2019-07-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop... blob | commitdiff | raw | diff to current
2019-06-30 Ivan Tashkinov[#161] Merge remote-tracking branch 'remotes/upstream... blob | commitdiff | raw | diff to current
2019-06-29 Ivan Tashkinov[#161] Limited replies depth on incoming federation... blob | commitdiff | raw | diff to current
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header' blob | commitdiff | raw | diff to current
2019-06-15 lainMerge branch 'bugfix/980-polls-double-vote' into 'develop' blob | commitdiff | raw | diff to current
2019-06-15 kaniiniMerge branch '963_oob_oauth_redirect_fix' into 'develop' blob | commitdiff | raw | diff to current
2019-06-13 lainMerge branch 'fix/ogp-title' into 'develop' blob | commitdiff | raw | diff to current
2019-06-13 rinpatchMerge branch 'develop' into feature/ci-release-build blob | commitdiff | raw | diff to current
2019-06-13 lainMerge branch 'improve-410-handling' into 'develop' blob | commitdiff | raw | diff to current
2019-06-13 Egor KislitsynHandle HTTP 404 response blob | commitdiff | raw | diff to current
2019-06-13 Egor KislitsynHandle HTTP "410 Gone" response blob | commitdiff | raw | diff to current
2019-06-04 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw | diff to current
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template blob | commitdiff | raw | diff to current
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'... blob | commitdiff | raw | diff to current
2019-06-01 rinpatchResolve merge conflicts blob | commitdiff | raw | diff to current
2019-05-31 HaelwennMerge branch 'dokku' into 'develop' blob | commitdiff | raw | diff to current
2019-05-26 lambdaMerge branch 'refactor/die-httpoison-die' into 'develop' blob | commitdiff | raw | diff to current
2019-05-25 William Pitcockkill @httpoison blob | commitdiff | raw | diff to current
2019-05-24 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw | diff to current
2019-05-23 Sachin Joshifix merge conflict blob | commitdiff | raw | diff to current
2019-05-22 kaniiniMerge branch 'ssh-fixes' into 'develop' blob | commitdiff | raw | diff to current
2019-05-22 lambdaMerge branch 'feature/object-pruning' into 'develop' blob | commitdiff | raw | diff to current
2019-05-21 William Pitcockobject: fetcher: add support for reinjecting pruned... blob | commitdiff | raw | diff to current
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template blob | commitdiff | raw | diff to current
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into... blob | commitdiff | raw | diff to current
2019-05-01 Alex SMerging with develop blob | commitdiff | raw | diff to current
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification... blob | commitdiff | raw | diff to current
2019-04-25 Egor KislitsynMerge branch 'develop' into feature/disable-account blob | commitdiff | raw | diff to current
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into... blob | commitdiff | raw | diff to current
2019-04-23 kaniiniMerge branch 'mastoapi/add-in-reply-to-screen-name... blob | commitdiff | raw | diff to current
2019-04-23 kaniiniMerge branch 'fix/normalize-activities' into 'develop' blob | commitdiff | raw | diff to current
2019-04-22 rinpatchReplace Object.normalize(activity.data[object] with... blob | commitdiff | raw | diff to current
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw | diff to current
2019-04-19 kaniiniMerge branch 'feature/database-compaction' into 'develop' blob | commitdiff | raw | diff to current
2019-04-18 rinpatchMerge branch 'develop' into feature/database-compaction blob | commitdiff | raw | diff to current
2019-04-17 rinpatchUpdate functions in object fetcher for tesla and set... blob | commitdiff | raw | diff to current
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction blob | commitdiff | raw | diff to current
2018-12-04 William Pitcockobject: rework Object.normalize() a bit to support... blob | commitdiff | raw | diff to current
2018-12-04 William Pitcockobject: factor out fetching functions into Pleroma... blob | commitdiff | raw | diff to current
Fork of https://akkoma.dev/AkkomaGang/akkoma.git