projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix merge conflicts with upstream
[akkoma] / lib / pleroma / object /
2021-06-04 Sean KingFix merge conflicts with upstream tree | commitdiff
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop' tree | commitdiff
2021-06-02 feldMerge branch 'Snow-develop-patch-01683' into 'develop' tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-06-01 feldMerge branch 'cycles-frontend-static' into 'develop' tree | commitdiff
2021-06-01 feldMerge branch 'cycles-base-url' into 'develop' tree | commitdiff
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop' tree | commitdiff
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-14 Alex GleasonMerge remote-tracking branch 'upstream/attachment-meta... tree | commitdiff
2021-05-13 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-05-03 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-04-29 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-04-16 rinpatchMerge branch 'features/ingestion-ecto-tag' into 'develop' tree | commitdiff
2021-04-16 rinpatchMerge branch 'feature/521-pinned-post-federation' into... tree | commitdiff
2021-04-05 Haelwenn (lanodan... Object.Fetcher: Fix getting transmogrifier reject reason tree | commitdiff
2021-04-05 Haelwenn (lanodan... Fix addressing tree | commitdiff
2021-03-25 Alexander Strizhakovmastodon pins tree | commitdiff
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable' tree | commitdiff
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop' tree | commitdiff
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop' tree | commitdiff
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2 tree | commitdiff
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop' tree | commitdiff
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop' tree | commitdiff
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021 tree | commitdiff
2021-01-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2021-01-08 lainMerge branch 'fix/missing_emoji_steal_dir' into 'develop' tree | commitdiff
2021-01-07 lainMerge branch 'cleanup/unused-proxy-opts' into 'develop' tree | commitdiff
2021-01-07 lainMerge branch 'object-normalize-refactor' into 'develop' tree | commitdiff
2021-01-05 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2021-01-04 lainObject: Rework how Object.normalize works tree | commitdiff
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1 tree | commitdiff
2020-12-15 lainMerge branch 'support/2255_posix_errors' into 'develop' tree | commitdiff
2020-11-21 feldMerge branch 'libmagic' into 'develop' tree | commitdiff
2020-11-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-11-21 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-11-19 feldMerge branch 'oban-jobs-to-simple-tasks' into 'develop' tree | commitdiff
2020-11-18 minibikiniMerge branch 'develop' into 'hide-muted-reactions' tree | commitdiff
2020-11-18 lainMerge branch 'frontend-admin-api' into 'develop' tree | commitdiff
2020-11-17 feldMerge branch 'remove/fedsockets' into 'develop' tree | commitdiff
2020-11-17 Egor KislitsynMerge branch 'develop' into frontend-admin-api tree | commitdiff
2020-11-17 rinpatchRemove FedSockets tree | commitdiff
2020-11-17 lainMerge branch 'chores/note-handling-move' into 'develop' tree | commitdiff
2020-11-17 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-11-15 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-11-13 lainMerge branch 'fixes_2034_reports_should_send_a_notifica... tree | commitdiff
2020-11-13 lainMerge branch 'docs/otp-tuning' into 'develop' tree | commitdiff
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable' tree | commitdiff
2020-11-12 rinpatchFix object spoofing vulnerability in attachments tree | commitdiff
2020-11-05 rinpatchMerge branch 'fix/object-attachment-spoof' into 'develop' tree | commitdiff
2020-11-04 lainMerge branch 'default-mrf' into 'develop' tree | commitdiff
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop' tree | commitdiff
2020-10-09 Mark FelderMerge branch 'develop' into feature/gen-magic tree | commitdiff
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-09-23 Mark FelderMerge branch 'develop' into feature/bulk-confirmation tree | commitdiff
2020-09-22 Maksim PechnikovMerge branch 'develop' into issue/1975 tree | commitdiff
2020-09-22 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-09-22 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-09-21 lainMerge branch 'bugfix/federator-actor-error' into 'develop' tree | commitdiff
2020-09-20 Roman ChvanikovMerge branch 'develop' into feature/expire-mutes tree | commitdiff
2020-09-18 Maksim PechnikovMerge branch 'develop' into issue/2099 tree | commitdiff
2020-09-18 feldMerge branch 'media-preview-proxy-nostream' into 'develop' tree | commitdiff
2020-09-18 lainMerge branch 'feature/2118-web-push-encryption-http... tree | commitdiff
2020-09-18 lainMerge branch 'websocket-data-fed' into 'develop' tree | commitdiff
2020-09-18 Steven FuchsFederate data through persistent websocket connections tree | commitdiff
2020-09-17 rinpatchMerge branch 'stable' into stable-sync/2.1.2 tree | commitdiff
2020-09-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-09-17 lainMerge branch 'develop' into 'nondiscoverable-user-metadata' tree | commitdiff
2020-09-17 Roman ChvanikovMerge branch 'develop' into feature/expire-mutes tree | commitdiff
2020-09-17 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2020-09-17 Maksim PechnikovMerge branch 'develop' into issue/2099 tree | commitdiff
2020-09-16 rinpatchMerge branch 'feat/connection-worker-monitor-flush... tree | commitdiff
2020-09-16 rinpatchMerge branch 'chores/mrf-loglevel' into 'develop' tree | commitdiff
2020-09-13 Roman ChvanikovMerge develop tree | commitdiff
2020-09-11 Alex GleasonMerge branch 'chat-moderation-stable' into chat-moderation tree | commitdiff
2020-09-11 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-09-11 Haelwenn (lanodan... Fetcher: Correctly return MRF reject reason tree | commitdiff
2020-09-11 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-09-10 Mark FelderMerge branch 'develop' into feature/gen-magic tree | commitdiff
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git