projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
formatter.ex
2020-08-01
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2020-07-29
lain
Merge branch 'issue/1023' into 'develop'
blob
|
commitdiff
|
raw
2020-07-27
lain
Merge branch 'develop' into 'cleanup/masto_fe-default_s...
blob
|
commitdiff
|
raw
2020-07-26
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-07-23
feld
Merge branch 'unblock-domain-via-query' into 'develop'
blob
|
commitdiff
|
raw
2020-07-23
Haelwenn
Merge branch '1976-status-view-fixes' into 'develop'
blob
|
commitdiff
|
raw
2020-07-23
Maksim Pechnikov
Merge branch 'develop' into issue/1934-welcome-email
blob
|
commitdiff
|
raw
2020-07-23
lain
Merge branch '1973-chats-fix-with-restrict-unauthentica...
blob
|
commitdiff
|
raw
2020-07-23
lain
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
blob
|
commitdiff
|
raw
2020-07-23
lain
Merge branch 'issue/1878' into 'develop'
blob
|
commitdiff
|
raw
2020-07-23
lain
Merge branch 'linkify' into 'develop'
blob
|
commitdiff
|
raw
2020-07-22
lain
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-21
lain
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
blob
|
commitdiff
|
raw
2020-07-21
lain
Merge branch 'revert-2b5d9eb1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-21
lain
Revert "Merge branch 'linkify' into 'develop'"
blob
|
commitdiff
|
raw
|
diff to current
2020-07-21
Mark Felder
Merge branch 'develop' into fix/pleroma-api-emoji-packs
blob
|
commitdiff
|
raw
2020-07-21
lain
Merge branch 'linkify' into 'develop'
blob
|
commitdiff
|
raw
2020-07-16
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-06-30
Alex Gleason
AutoLinker --> Linkify, update to latest version
blob
|
commitdiff
|
raw
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-18
sadposter
Merge branch 'develop' of https://git.pleroma.social...
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
rinpatch
Merge branch 'features/remove-user-source_data' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-16
rinpatch
Merge branch 'develop' into features/remove-user-source...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-13
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-04-13
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-12
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-11
rinpatch
Merge branch 'following-relationships-optimizations...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-10
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
blob
|
commitdiff
|
raw
|
diff to current
2020-04-10
Egor Kislitsyn
Merge branch 'develop' into fix/support-conversations...
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-10
Haelwenn (lanodan...
formatter: Use user.uri instead of user.source_data.uri
blob
|
commitdiff
|
raw
|
diff to current
2020-04-10
Maksim Pechnikov
Merge branch 'develop' into support/update_oban
blob
|
commitdiff
|
raw
|
diff to current
2020-04-09
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-04-09
lain
Merge branch 'fix/1658-invite-send' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-09
lain
Merge branch 'open-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-09
lain
Merge branch 'formatter-html-safe' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-04-08
rinpatch
formatter.ex: Use Phoenix.HTML for mention/hashtag...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'feature/mastofe-admin-scope' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'docs/direct_conversation_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'static-accept-missing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-07
rinpatch
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-04
lain
Merge branch 'fix/no-email-no-fail' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
lain
Merge branch 'prepared-statements-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Egor Kislitsyn
Merge branch 'develop' into fix/signup-without-email
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn
Merge branch 'feature/1482-activity_pub_transactions...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn (lanodan...
Bump copyright years of files changed after 2020-01-07
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
lain
Merge branch 'require-signature' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
lain
Merge branch 'features/remote-follow-userpage-redirect...
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
lain
Merge branch 'docs_updating' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-11
Egor Kislitsyn
Merge branch 'develop' into feature/new-registrations...
blob
|
commitdiff
|
raw
|
diff to current
2020-02-11
lain
Merge branch 'docs/kyclos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-10
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2020-02-10
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-02-09
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-02-08
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-02-07
Haelwenn
Merge branch 'cancel-follow-request' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-06
rinpatch
Merge branch 'update/fe-bundle-20200206' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-06
feld
Merge branch 'mastoapi-non-html-strings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-06
rinpatch
Merge branch 'develop' into fix/dymamic-docs
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
rinpatch
Merge branch 'fix/unpinnable-polls' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
rinpatch
Merge branch 'removing-admin-api-endpoint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
feld
Merge branch 'remove-linker-scheme-option' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-05
Egor Kislitsyn
Remove AutoLinker `scheme` option from the config
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-11-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history