projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
account_view.ex
2020-11-17
rinpatch
Import stable commits into develop after releasing...
blob
|
commitdiff
|
raw
2020-11-12
rinpatch
Merge branch 'release/2.2.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'default-mrf' into 'develop'
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'ejabberd-pleroma-auth' into 'develop'
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-11-03
lain
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
blob
|
commitdiff
|
raw
2020-11-02
lain
Merge branch 'bugfix/poll_replies_count' into 'develop'
blob
|
commitdiff
|
raw
2020-11-02
minibikini
Merge branch 'develop' into 'frontend-admin-api'
blob
|
commitdiff
|
raw
2020-10-30
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2020-10-30
minibikini
Merge branch 'develop' into 'feature/local-only-scope'
blob
|
commitdiff
|
raw
2020-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
blob
|
commitdiff
|
raw
2020-10-26
Haelwenn
Merge branch 'docs/ap_c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-20
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-19
Egor Kislitsyn
Merge branch 'develop' into mutes-blocks-pagination
blob
|
commitdiff
|
raw
|
diff to current
2020-10-19
Egor Kislitsyn
Merge branch 'develop' into feature/local-only-scope
blob
|
commitdiff
|
raw
|
diff to current
2020-10-19
Haelwenn
Merge branch '2239-mute-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-15
feld
Merge branch 'refactor/discoverable_user_field' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-15
Mark Felder
Merge branch 'develop' into refactor/discoverable_user_...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Mark Felder
Merge branch 'develop' into feature/account-export
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
feld
Merge branch 'feature/gen-magic' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Haelwenn
Merge branch 'refactor/locked_user_field' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Mark Felder
Undo API breaking changes
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Mark Felder
Finish undoing API breakage
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/locked_user_field
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/discoverable_user_...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Change user.discoverable field to user.is_discoverable
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Change user.locked field to user.is_locked
blob
|
commitdiff
|
raw
|
diff to current
2020-10-09
Mark Felder
Merge branch 'develop' into feature/gen-magic
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-23
Mark Felder
Merge branch 'develop' into feature/bulk-confirmation
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-22
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-22
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-21
lain
Merge branch 'bugfix/federator-actor-error' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-20
Roman Chvanikov
Merge branch 'develop' into feature/expire-mutes
blob
|
commitdiff
|
raw
|
diff to current
2020-09-18
Maksim Pechnikov
Merge branch 'develop' into issue/2099
blob
|
commitdiff
|
raw
|
diff to current
2020-09-18
feld
Merge branch 'media-preview-proxy-nostream' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
rinpatch
Merge branch 'stable' into stable-sync/2.1.2
blob
|
commitdiff
|
raw
|
diff to current
2020-09-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-16
Ivan Tashkinov
[#2497] Media preview proxy: misc. improvements (`stati...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-11
Alex Gleason
Merge branch 'chat-moderation-stable' into chat-moderation
blob
|
commitdiff
|
raw
|
diff to current
2020-09-11
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
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 'stable' into stable-sync/2.1.1
blob
|
commitdiff
|
raw
|
diff to current
2020-09-06
Mark Felder
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-03
Mark Felder
Merge branch 'media-preview-proxy' of git.pleroma.socia...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-03
Ivan Tashkinov
[#2497] Added support for enforcing output format for...
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-01
lain
Merge branch 'fix/static-fe-nil-bio-crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-01
rinpatch
User table: ensure bio is always a string
blob
|
commitdiff
|
raw
|
diff to current
2020-09-01
Maksim Pechnikov
remove `unread_conversation_count` from User
blob
|
commitdiff
|
raw
|
diff to current
2020-08-30
Mark Felder
Merge branch 'develop' into feld-2168-media-preview...
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-27
Mark Felder
Support static avatars and header images with Mediaprox...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-25
Haelwenn
Merge branch 'buildx-multiarch-arm32v7' into 'develop'
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-08-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-05
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-05
Roman Chvanikov
Merge branch 'develop' into command-available-check
blob
|
commitdiff
|
raw
|
diff to current
2020-07-31
Haelwenn (lanodan...
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-29
lain
Merge branch 'issue/1023' into 'develop'
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-26
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
feld
Merge branch 'unblock-domain-via-query' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
feld
Merge branch 'feature/add-mrf-related-policies' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
Haelwenn
Merge branch '1976-status-view-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
Maksim Pechnikov
Merge branch 'develop' into issue/1934-welcome-email
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
lain
Merge branch '1973-chats-fix-with-restrict-unauthentica...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-23
Ivan Tashkinov
[#2791] AccountView: renamed `:force` option to `:skip_...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-22
Ivan Tashkinov
[#1973] Fixed accounts rendering in GET /api/v1/pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
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-13
feld
Merge branch 'features/profile-fields-emojo' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-13
feld
Merge branch 'fix/mediaproxy-cache-settings-types'...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
feld
Merge branch 'fix/1924-s3-descriptions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Mark Felder
Merge branch 'develop' into issue/1790-updated-oban
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
feld
Merge branch 'proxy-range-and-chunk' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'chat-federation-information' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'mix-tasks-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
lain
Merge branch 'cluster-test-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Haelwenn
Merge branch 'develop' into 'admin-api-user-credentials...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-10
Haelwenn
Merge branch 'user-search-nickname-rank-boost' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-09
Mark Felder
Merge branch 'develop' into fix/csp-for-captcha
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-09
lain
Merge branch 'features/favicons' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
Haelwenn (lanodan...
Add [:instances_favicons, :enabled] setting, defaults...
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
Haelwenn (lanodan...
Use instances table instead of Cachex
blob
|
commitdiff
|
raw
|
diff to current
2020-07-08
Haelwenn (lanodan...
Move get_favicon to Pleroma.Instances, use /
blob
|
commitdiff
|
raw
|
diff to current
next