projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix merge conflicts with upstream
[akkoma] / lib / pleroma / activity /
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 HaelwennMerge branch 'features/validators-note' into 'develop' tree | commitdiff
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-31 HaelwennMerge branch 'docs/goto-libera' into 'develop' tree | commitdiff
2021-05-30 Alex GleasonMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f... tree | commitdiff
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2021-05-29 feldMerge branch 'cycles-views' into 'develop' tree | commitdiff
2021-05-29 feldMerge branch 'cycles-html' into 'develop' 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 GleasonBreak out activity-specific HTML functions into Pleroma... 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-01 rinpatchMerge branch 'refactor/object_validator_validate' into... tree | commitdiff
2021-03-25 Alexander StrizhakovLet pins federate tree | commitdiff
2021-03-21 rinpatchMerge branch 'richmedia-workaround' into 'develop' tree | commitdiff
2021-03-19 rinpatchMerge branch 'mediaproxy-decode' into 'develop' tree | commitdiff
2021-03-19 rinpatchMerge branch 'bugfix/bridgy-user-icon' into 'develop' tree | commitdiff
2021-03-16 HaelwennMerge branch 'update_open_api_spex' into 'develop' tree | commitdiff
2021-03-15 rinpatchMerge branch 'feature/object-hashtags-rework' into... tree | commitdiff
2021-03-12 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-03-10 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-03-07 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable' tree | commitdiff
2021-03-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop' tree | commitdiff
2021-02-24 HaelwennMerge branch 'docfix/chat-token' into 'develop' tree | commitdiff
2021-02-23 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-02-16 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-02-12 rinpatchMerge branch 'bugfix/answer-outbox' into 'develop' tree | commitdiff
2021-02-11 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-02-09 rinpatchMerge branch 'features/ap_id-c2s-authentication' into... tree | commitdiff
2021-02-08 feldMerge branch 'develop' into 'new-user-emails' tree | commitdiff
2021-02-08 HaelwennMerge branch 'feat/mrf-noemptypolicy' into 'develop' tree | commitdiff
2021-02-08 rinpatchMerge branch 'chore/descriptions-improvements' into... tree | commitdiff
2021-02-08 feldMerge branch 'develop' into 'docs/improve-mailer-settin... tree | commitdiff
2021-02-08 rinpatchMerge branch 'fix/reports-from-admins' into 'develop' tree | commitdiff
2021-02-06 rinpatchMerge branch 'feat/allow_alt_text_search_config' into... tree | commitdiff
2021-02-06 hyperionUpdate priv/repo/migrations/20190501125843_add_fts_inde... tree | commitdiff
2021-02-03 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-31 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-22 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2021-01-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/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-31 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-12-28 HaelwennMerge branch 'revert-b122b6ff' into 'develop' tree | commitdiff
2020-12-28 HaelwennRevert "Merge branch 'features/hashtag-column' into... tree | commitdiff
2020-12-28 HaelwennMerge branch 'features/hashtag-column' into 'develop' tree | commitdiff
2020-12-28 Haelwenn (lanodan... Pleroma.Object/1: take %Object{} as argument instead tree | commitdiff
2020-12-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1 tree | commitdiff
2020-12-23 lainMerge branch 'release/2.2.1' into 'stable' tree | commitdiff
2020-12-22 lainSearch: Only skip ordering the rum index. tree | commitdiff
2020-12-22 lainActivity search: Fix order of results tree | commitdiff
2020-12-22 Haelwenn (lanodan... Insert text representation of hashtags into object... tree | commitdiff
2020-12-21 Ivan TashkinovEncapsulation of tags / hashtags fetching from objects. tree | commitdiff
2020-12-17 Alex GleasonMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2020-12-15 lainMerge branch 'support/2255_posix_errors' into 'develop' tree | commitdiff
2020-12-04 feldMerge branch 'issue/2256' into 'develop' tree | commitdiff
2020-11-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... tree | commitdiff
2020-11-25 rinpatchMerge branch 'features/ruby-elements' into 'develop' tree | commitdiff
2020-11-23 rinpatchMerge branch 'chore/bump-linkify' into 'develop' tree | commitdiff
2020-11-23 rinpatchMerge branch 'websearch' into 'develop' tree | commitdiff
2020-11-23 lainSearch: Save detected pg version in a persistent term. tree | commitdiff
2020-11-23 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git