projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'fix-object-deletion-timeout' into 'develop'
[akkoma]
/
lib
/
pleroma
/
html.ex
2021-08-08
Haelwenn
Merge branch 'release/2.4.0' into 'stable'
blob
|
commitdiff
|
raw
2021-08-04
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-07-27
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-07-27
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-07-18
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-07-14
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-07-14
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-07-12
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-30
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-07
feld
Merge branch 'develop' into 'fix/prune-hashtags'
blob
|
commitdiff
|
raw
2021-06-05
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-04
Sean King
Fix merge conflicts with upstream
blob
|
commitdiff
|
raw
2021-06-04
Haelwenn
Merge branch 'tests/openapi-everywhere' into 'develop'
blob
|
commitdiff
|
raw
2021-06-02
feld
Merge branch 'Snow-develop-patch-01683' into 'develop'
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Haelwenn
Merge branch 'features/validators-note' into 'develop'
blob
|
commitdiff
|
raw
2021-05-31
Haelwenn
Merge branch 'docs/goto-libera' into 'develop'
blob
|
commitdiff
|
raw
2021-05-30
Alex Gleason
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f...
blob
|
commitdiff
|
raw
2021-05-30
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
feld
Merge branch 'cycles-views' into 'develop'
blob
|
commitdiff
|
raw
2021-05-29
feld
Merge branch 'cycles-html' into 'develop'
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-05-29
Alex Gleason
Break out activity-specific HTML functions into Pleroma...
blob
|
commitdiff
|
raw
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'deprecate-public_endpoint' into '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-15
Haelwenn
Merge branch 'optimize-command_available' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Haelwenn (lanodan...
Bump Copyright to 2021
blob
|
commitdiff
|
raw
|
diff to current
2021-01-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-08
lain
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
lain
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
lain
Merge branch 'object-normalize-refactor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-05
feld
Merge branch 'fix/mediaproxy-config-descriptions' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-04
lain
Object: Rework how Object.normalize works
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 'features/hashtag-column' into 'develop'
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-26
lain
Merge branch 'cachex-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-18
lain
Cachex: Make caching provider switchable at runtime.
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
feld
Merge branch 'libmagic' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'default-mrf' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-22
Maksim Pechnikov
Merge branch 'develop' into issue/1975
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
Maksim Pechnikov
Merge branch 'develop' into issue/2099
blob
|
commitdiff
|
raw
|
diff to current
2020-09-10
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-09-09
Mark Felder
Merge branch 'develop' into media-preview-proxy
blob
|
commitdiff
|
raw
|
diff to current
2020-09-08
rinpatch
Merge branch 'release/2.1.1' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-08
lain
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-08
rinpatch
Merge branch 'feat/rich-media-improvements' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-07
rinpatch
Merge branch 'temp-hackney-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-07
rinpatch
Merge branch 'bugfix/favicon-too-long' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-07
lain
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-05
rinpatch
Rich Media: Do not cache URLs for preview statuses
blob
|
commitdiff
|
raw
|
diff to current
2020-09-03
Mark Felder
Merge branch 'develop' into media-preview-proxy
blob
|
commitdiff
|
raw
|
diff to current
2020-09-03
lain
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-03
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-02
lain
Merge branch 'fix/1991-tzdata-update' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-02
lain
Merge branch 'bugfix/mastoapi-lists' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-02
rinpatch
Merge branch 'feat/rich-media-improvements' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-02
rinpatch
html.ex: optimize external url extraction
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-07-27
lain
Merge branch 'develop' into 'cleanup/masto_fe-default_s...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-16
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
lain
Merge branch '1723-token-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
Mark Felder
Merge branch 'develop' into issue/1790-updated-oban
blob
|
commitdiff
|
raw
|
diff to current
2020-07-03
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
Mark Felder
Merge branch 'develop' into feature/1885-MRF-metadata
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-02
lain
Merge branch 'feature/update-description' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-30
Mark Felder
Merge branch 'develop' into activation-meta
blob
|
commitdiff
|
raw
|
diff to current
2020-06-30
lain
Merge branch 'preload-fixups-2' into preloadfixups
blob
|
commitdiff
|
raw
|
diff to current
2020-06-29
rinpatch
Merge branch 'fix-notification-filtering' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-06-29
lain
Merge branch 'rich-media-parser-exclude-attachment...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-29
Alexander Strizhakov
excluding attachment links from RichMedia
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-14
lain
Merge branch 'features/openrc-console' into 'develop'
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
next
projects / akkoma / history