Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
[akkoma] / lib / pleroma / web / templates / feed / feed / _activity.rss.eex
2021-05-03 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-04-01 rinpatchMerge branch 'refactor/object_validator_validate' into...
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-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 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...
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-16 lainMerge branch 'develop' into 'remove-twitter-api'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-05-01 lainMerge branch 'issue/1577' into 'develop'
2020-05-01 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-04-28 lainMerge branch 'mongoose-secure' into 'develop'
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-21 lainMerge branch 'openapi/custom-emojis' into 'develop'
2020-04-21 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-20 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-04-20 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-04-20 Egor KislitsynMerge branch 'develop' into openapi/account
2020-04-20 lainMerge branch 'cleanup-subscription-controller' into...
2020-04-20 lainMerge branch 'mrf-docs-update' into 'develop'
2020-04-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-17 HaelwennMerge branch 'feature/1584-client-captcha-options'...
2020-04-17 HaelwennMerge branch 'feature/1677-need_reboot-flag-endpoint...
2020-04-16 rinpatchMerge branch 'authenticated-api-oauth-check-enforcement...
2020-04-16 rinpatchMerge branch 'fix/1691-feed-render' into 'develop'
2020-04-16 Alexander Strizhakovfix for use of published from different entities
2020-04-10 HaelwennMerge branch 'bugfix/apc2s_upload_activity' into 'develop'
2020-04-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-06 lainMerge branch 'remake-remodel-2' into 'develop'
2020-03-29 HaelwennMerge branch 'feature/funkwhale-audio' into 'develop'
2020-03-29 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-25 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-24 Haelwenn (lanodan... Merge remote-tracking branch 'pleroma/develop' into...
2020-03-24 lainMerge branch 'admin-api-change-password' into 'develop'
2020-03-22 rinpatchMerge branch 'fix/ecto_ssl_option' into 'develop'
2020-03-20 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-03-20 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-20 lainMerge branch 'fix-feed-pagination' into 'develop'
2020-03-16 Alexander Strizhakovadding rss for user feed