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]
/
test
/
instance_static
/
emoji
/
2020-11-21
feld
Merge branch 'libmagic' into 'develop'
tree
|
commitdiff
2020-11-12
rinpatch
Merge branch 'release/2.2.0' into 'stable'
tree
|
commitdiff
2020-11-04
lain
Merge branch 'default-mrf' into 'develop'
tree
|
commitdiff
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-11-01
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2020-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
tree
|
commitdiff
2020-10-26
Haelwenn
Merge branch 'docs/ap_c2s' into 'develop'
tree
|
commitdiff
2020-10-09
Mark Felder
Merge branch 'develop' into feature/gen-magic
tree
|
commitdiff
2020-10-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2020-10-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2020-10-08
Haelwenn
Merge branch 'fix/2209-remoteip' into 'develop'
tree
|
commitdiff
2020-10-06
Mark Felder
Merge branch 'develop' into revert/rich-media-censorship
tree
|
commitdiff
2020-10-06
rinpatch
Merge branch 'filtering-following' into 'develop'
tree
|
commitdiff
2020-10-06
rinpatch
Merge branch 'feature/update-description-for-frontends...
tree
|
commitdiff
2020-10-05
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
tree
|
commitdiff
2020-10-05
feld
Merge branch 'feature/1893-remote-emoji-packs-paginatio...
tree
|
commitdiff
2020-10-05
Mark Felder
Merge branch 'develop' into feature/1893-remote-emoji...
tree
|
commitdiff
2020-09-24
Alexander Strizhakov
support for special chars in pack name
tree
|
commitdiff
2020-09-10
Mark Felder
Merge branch 'develop' into feature/gen-magic
tree
|
commitdiff
2020-08-28
lain
Merge branch 'release/2.1.0' into 'stable'
tree
|
commitdiff
2020-08-25
lain
Merge branch 'stable' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-07-09
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2020-07-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
tree
|
commitdiff
2020-06-30
Mark Felder
Merge branch 'develop' into activation-meta
tree
|
commitdiff
2020-06-29
Egor Kislitsyn
Merge branch 'develop' into remove-twitter-api
tree
|
commitdiff
2020-06-25
feld
Merge branch 'preload-data' into 'develop'
tree
|
commitdiff
2020-06-25
Mark Felder
Merge branch 'develop' into refactor/notification_settings
tree
|
commitdiff
2020-06-23
Roman Chvanikov
Merge develop
tree
|
commitdiff
2020-06-23
Haelwenn
Merge branch 'feature/1631-redesign-mrf-configuration...
tree
|
commitdiff
2020-06-23
lain
Merge branch 'issue/1798' into 'develop'
tree
|
commitdiff
2020-06-23
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-06-22
Haelwenn
Merge branch 'warning/mastofe-settings-blob' into ...
tree
|
commitdiff
2020-06-22
lain
Merge branch 'feature/1739-account-endpoints' into...
tree
|
commitdiff
2020-06-22
lain
Merge branch 'fix/1825-admin-api-error-codes' into...
tree
|
commitdiff
2020-06-22
rinpatch
Merge branch '1865-media-only' into 'develop'
tree
|
commitdiff
2020-06-22
rinpatch
Merge branch '1883-mrf-chat' into 'develop'
tree
|
commitdiff
2020-06-22
lain
Merge branch 'feature/1854-emoji-pagination' into ...
tree
|
commitdiff
2020-06-20
lain
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
tree
|
commitdiff
2020-06-18
Alexander Strizhakov
emoji pagination for pack show action
tree
|
commitdiff
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
tree
|
commitdiff
2020-05-16
lain
Merge branch 'develop' into 'remove-twitter-api'
tree
|
commitdiff
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
tree
|
commitdiff
2020-05-10
lain
Merge branch 'shortening-modules-name' into 'develop'
tree
|
commitdiff
2020-05-08
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2020-05-06
lain
Merge branch 'plug-if-unless-func-options-refactoring...
tree
|
commitdiff
2020-05-05
Egor Kislitsyn
Merge branch 'develop' into global-status-expiration
tree
|
commitdiff
2020-05-04
feld
Merge branch 'feature/update-labels-for-activating...
tree
|
commitdiff
2020-05-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2020-05-02
rinpatch
Merge branch 'feature/1710-consolidate-instance-info...
tree
|
commitdiff
2020-05-01
lain
Merge branch 'openapi/notifications' into 'develop'
tree
|
commitdiff
2020-05-01
lain
Merge branch 'openapi/reports' into 'develop'
tree
|
commitdiff
2020-05-01
lain
Merge branch 'issue/1577' into 'develop'
tree
|
commitdiff
2020-05-01
lain
Merge branch 'fix/captcha' into 'develop'
tree
|
commitdiff
2020-05-01
lain
Merge branch 'feature/delete-validator' of git.pleroma...
tree
|
commitdiff
2020-05-01
Maksim Pechnikov
Merge branch 'develop' into issue/1276-2
tree
|
commitdiff
2020-04-30
rinpatch
Merge branch 'update/admin-fe-20200429' into 'develop'
tree
|
commitdiff
2020-04-30
lain
Merge branch 'tests/more-apc2s' into 'develop'
tree
|
commitdiff
2020-04-30
Lain Soykaf
Merge branch 'develop' of ssh://git.pleroma.social...
tree
|
commitdiff
2020-04-30
lain
Merge branch 'dismiss-notification-on-follow-request...
tree
|
commitdiff
2020-04-30
Haelwenn
Merge branch 'emoji-upload' into 'develop'
tree
|
commitdiff
2020-04-30
Alexander Strizhakov
refactor emoji api with fixes
tree
|
commitdiff
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
tree
|
commitdiff
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
tree
|
commitdiff
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
tree
|
commitdiff
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
tree
|
commitdiff
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-09-30
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
tree
|
commitdiff
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
tree
|
commitdiff
2019-09-26
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
tree
|
commitdiff
2019-09-26
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-09-26
kaniini
Merge branch 'hex-flake-id' into 'develop'
tree
|
commitdiff
2019-09-25
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-09-25
Maksim Pechnikov
Merge branch 'develop' into issue/1218
tree
|
commitdiff
2019-09-24
Maxim Filippov
Merge branch 'develop' into feature/return-link-for...
tree
|
commitdiff
2019-09-23
kaniini
Merge branch 'feature/force-password-reset' into 'develop'
tree
|
commitdiff
2019-09-23
kaniini
Merge branch 'support-rel-ugc' into 'develop'
tree
|
commitdiff
2019-09-23
kaniini
Merge branch 'remove-direct-messages-from-public-timeli...
tree
|
commitdiff
2019-09-23
rinpatch
Merge branch 'update-adminfe/2019-09-23' into 'develop'
tree
|
commitdiff
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
tree
|
commitdiff
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
tree
|
commitdiff
2019-09-23
rinpatch
Merge branch 'better-emoji-packs' into 'develop'
tree
|
commitdiff
2019-09-18
Ekaterina Vaartis
Allow importing old (emoji.txt / plain) packs from...
tree
|
commitdiff
2019-09-18
Ekaterina Vaartis
Add tests for pack metadata updating
tree
|
commitdiff
2019-09-18
Ekaterina Vaartis
Add tests for downloading from fallback url
tree
|
commitdiff
2019-09-18
Ekaterina Vaartis
Change YAML to JSON
tree
|
commitdiff
2019-09-18
Ekaterina Vaartis
Add tests for emoji pack sharing
tree
|
commitdiff