projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
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 Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-04-01
rinpatch
Merge branch 'refactor/object_validator_validate' into...
blob
|
commitdiff
|
raw
2021-03-21
rinpatch
Merge branch 'richmedia-workaround' into 'develop'
blob
|
commitdiff
|
raw
2021-03-19
rinpatch
Merge branch 'mediaproxy-decode' into 'develop'
blob
|
commitdiff
|
raw
2021-03-19
rinpatch
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
blob
|
commitdiff
|
raw
2021-03-16
Haelwenn
Merge branch 'update_open_api_spex' into 'develop'
blob
|
commitdiff
|
raw
2021-03-15
rinpatch
Merge branch 'feature/object-hashtags-rework' into...
blob
|
commitdiff
|
raw
2021-03-12
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-03-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-03-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-24
Haelwenn
Merge branch 'docfix/chat-token' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-02-16
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-02-12
rinpatch
Merge branch 'bugfix/answer-outbox' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-02-09
rinpatch
Merge branch 'features/ap_id-c2s-authentication' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-08
feld
Merge branch 'develop' into 'new-user-emails'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-08
Haelwenn
Merge branch 'feat/mrf-noemptypolicy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-08
rinpatch
Merge branch 'fix/rss-link' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-08
rinpatch
RSS: Make sure post URL is the first `<link>` element
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-31
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-22
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-19
rinpatch
Merge branch 'stable' into mergeback/2.2.2
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-31
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-28
Haelwenn
Merge branch 'revert-b122b6ff' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-28
Haelwenn
Revert "Merge branch 'features/hashtag-column' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-28
Haelwenn
Merge branch 'features/hashtag-column' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-28
Haelwenn (lanodan...
Pleroma.Object/1: take %Object{} as argument instead
blob
|
commitdiff
|
raw
|
diff to current
2020-12-26
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-23
lain
Merge branch 'stable' into mergeback/2.2.1
blob
|
commitdiff
|
raw
|
diff to current
2020-12-22
Haelwenn (lanodan...
Create Object.hashtags/1 wrapper
blob
|
commitdiff
|
raw
|
diff to current
2020-12-22
Haelwenn (lanodan...
Insert text representation of hashtags into object...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-21
Ivan Tashkinov
Encapsulation of tags / hashtags fetching from objects.
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
feld
Merge branch 'libmagic' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
lain
Merge branch 'chores/note-handling-move' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
rinpatch
Import stable commits into develop after releasing...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-15
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-13
lain
Merge branch 'fixes_2034_reports_should_send_a_notifica...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-13
lain
Merge branch 'docs/otp-tuning' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-11
Egor Kislitsyn
Merge branch 'develop' into frontend-admin-api
blob
|
commitdiff
|
raw
|
diff to current
2020-11-11
feld
Merge branch 'feature/2222-config-descriptions-for...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-10
lain
Merge branch '2260-wrong-report-link' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-10
lain
Merge branch 'fix/html-title-load' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-10
lain
Merge branch 'fix/2291-atom-feed-escape' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-10
Alexander Strizhakov
escaping summary and other fields in xml templates
blob
|
commitdiff
|
raw
|
diff to current
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-16
lain
Merge branch 'develop' into 'remove-twitter-api'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-01
lain
Merge branch 'issue/1577' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-01
Maksim Pechnikov
Merge branch 'develop' into issue/1276-2
blob
|
commitdiff
|
raw
|
diff to current
2020-04-28
lain
Merge branch 'mongoose-secure' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-22
lain
Merge branch 'docs/debian-packages' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-21
lain
Merge branch 'openapi/custom-emojis' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
Egor Kislitsyn
Merge branch 'develop' into openapi/account
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
lain
Merge branch 'cleanup-subscription-controller' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-20
lain
Merge branch 'mrf-docs-update' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-17
Haelwenn
Merge branch 'feature/1584-client-captcha-options'...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-17
Haelwenn
Merge branch 'feature/1677-need_reboot-flag-endpoint...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-16
rinpatch
Merge branch 'authenticated-api-oauth-check-enforcement...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-16
rinpatch
Merge branch 'fix/1691-feed-render' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-16
Alexander Strizhakov
fix for use of published from different entities
blob
|
commitdiff
|
raw
|
diff to current
2020-04-10
Haelwenn
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-06
lain
Merge branch 'remake-remodel-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-29
Haelwenn
Merge branch 'feature/funkwhale-audio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-29
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-03-25
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-24
Haelwenn (lanodan...
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-24
lain
Merge branch 'admin-api-change-password' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-22
rinpatch
Merge branch 'fix/ecto_ssl_option' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-20
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-03-20
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-20
lain
Merge branch 'fix-feed-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-16
Alexander Strizhakov
adding rss for user feed
blob
|
commitdiff
|
raw
|
diff to current