merge
[akkoma] / lib / pleroma / web / templates / feed /
2021-06-27 sadpostermerge
2021-06-07 feldMerge branch 'pleromapi' into 'develop'
2021-06-07 feldMerge branch 'develop' into 'fix/prune-hashtags'
2021-06-05 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop'
2021-06-02 feldMerge branch 'Snow-develop-patch-01683' into 'develop'
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 feldMerge branch 'cycles-frontend-static' into 'develop'
2021-06-01 feldMerge branch 'cycles-base-url' into 'develop'
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop'
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-31 Alex GleasonDeprecate Pleroma.Web.base_url/0
2021-05-31 HaelwennMerge branch 'docs/goto-libera' into 'develop'
2021-05-30 Alex GleasonMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f...
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 feldMerge branch 'cycles-router-api-routes' into 'develop'
2021-05-28 feldMerge branch 'simplepolicy-announce-leak' into 'develop'
2021-05-28 feldMerge branch 'gitignore-runtime-exs' into 'develop'
2021-05-28 feldMerge branch 'alias-router-helpers' into 'develop'
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-18 Alex GleasonSwitch to aliasing `Router.Helpers` instead of importing
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-16 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-14 Alex GleasonMerge remote-tracking branch 'upstream/attachment-meta...
2021-05-13 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-05-03 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2021-04-01 rinpatchMerge branch 'refactor/object_validator_validate' into...
2021-03-23 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-03-21 rinpatchMerge branch 'richmedia-workaround' into 'develop'
2021-03-19 rinpatchMerge branch 'mediaproxy-decode' into 'develop'
2021-03-19 rinpatchMerge branch 'bugfix/bridgy-user-icon' into 'develop'
2021-03-16 HaelwennMerge branch 'update_open_api_spex' into 'develop'
2021-03-15 rinpatchMerge branch 'feature/object-hashtags-rework' into...
2021-03-12 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-10 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-07 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-03-02 lainMerge branch 'release/2.3.0' into 'stable'
2021-03-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-26 feldMerge branch 'ecto-rollback-in-test-env' into 'develop'
2021-02-24 HaelwennMerge branch 'docfix/chat-token' into 'develop'
2021-02-23 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-20 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-02-16 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-12 rinpatchMerge branch 'bugfix/answer-outbox' into 'develop'
2021-02-11 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-02-09 rinpatchMerge branch 'features/ap_id-c2s-authentication' into...
2021-02-08 feldMerge branch 'develop' into 'new-user-emails'
2021-02-08 HaelwennMerge branch 'feat/mrf-noemptypolicy' into 'develop'
2021-02-08 rinpatchMerge branch 'fix/rss-link' into 'develop'
2021-02-08 rinpatchRSS: Make sure post URL is the first `<link>` element
2021-02-03 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-31 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-22 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2021-01-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-12-31 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-12-30 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-12-28 HaelwennMerge branch 'revert-b122b6ff' into 'develop'
2020-12-28 HaelwennRevert "Merge branch 'features/hashtag-column' into...
2020-12-28 HaelwennMerge branch 'features/hashtag-column' into 'develop'
2020-12-28 Haelwenn (lanodan... Pleroma.Object/1: take %Object{} as argument instead
2020-12-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-12-23 lainMerge branch 'stable' into mergeback/2.2.1
2020-12-22 Haelwenn (lanodan... Create Object.hashtags/1 wrapper
2020-12-22 Haelwenn (lanodan... Insert text representation of hashtags into object...
2020-12-21 Ivan TashkinovEncapsulation of tags / hashtags fetching from objects.
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-11-17 lainMerge branch 'chores/note-handling-move' into 'develop'
2020-11-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-17 rinpatchImport stable commits into develop after releasing...
2020-11-15 sadposterMerge branch 'develop' of https://git.pleroma.social...
2020-11-15 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-11-13 lainMerge branch 'fixes_2034_reports_should_send_a_notifica...
2020-11-13 lainMerge branch 'docs/otp-tuning' into 'develop'
2020-11-11 Egor KislitsynMerge branch 'develop' into frontend-admin-api
2020-11-11 feldMerge branch 'feature/2222-config-descriptions-for...
2020-11-10 lainMerge branch '2260-wrong-report-link' into 'develop'
2020-11-10 lainMerge branch 'fix/html-title-load' into 'develop'
2020-11-10 lainMerge branch 'fix/2291-atom-feed-escape' into 'develop'
2020-11-10 Alexander Strizhakovescaping summary and other fields in xml templates
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-06-01 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
next