projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma...
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
account_controller.ex
2021-01-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2021-01-05
lain
Merge branch '1526-account-aliases' into 'develop'
blob
|
commitdiff
|
raw
2021-01-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2020-12-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-12-23
lain
Merge branch 'stable' into mergeback/2.2.1
blob
|
commitdiff
|
raw
|
diff to current
2020-12-20
rinpatch
Merge branch 'bugfix/mastofe-install-script' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-17
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-15
lain
Merge branch 'support/2255_posix_errors' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-09
lain
Merge branch 'auth-improvements' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-04
feld
Merge branch 'issue/2256' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-28
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Ivan Tashkinov
Session token setting on token exchange. Auth-related...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-23
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
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-21
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-20
feld
Merge branch 'fix/2302-report-duplicates' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-19
feld
Merge branch '2301-users-search-discoverability-fix...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-19
feld
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-19
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-19
Ivan Tashkinov
[#2301] Proper handling of `User.is_discoverable`:...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-19
Haelwenn
Merge branch '2317-old-reset-tokens' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-19
lain
Merge branch 'hide-muted-reactions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-18
minibikini
Merge branch 'develop' into 'hide-muted-reactions'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
Egor Kislitsyn
Merge branch 'develop' into hide-muted-reactions
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-16
Egor Kislitsyn
Hide reactions from muted and blocked users
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-12
rinpatch
Merge branch 'release/2.2.0' into 'stable'
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-10
lain
Merge branch '2260-wrong-report-link' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-05
lain
Merge branch 'feature/expire-mutes' 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-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'ejabberd-pleroma-auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-03
lain
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-02
lain
Merge branch 'bugfix/poll_replies_count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-02
minibikini
Merge branch 'develop' into 'frontend-admin-api'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-30
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-30
minibikini
Merge branch 'develop' into 'feature/local-only-scope'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
feld
Merge branch 'fix/frontend-cli-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
feld
Merge branch 'issue/2137-user-filters-admin-fe' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
feld
Merge branch 'mutes-blocks-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
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
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
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-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Egor Kislitsyn
Add pagination for Mutes
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Egor Kislitsyn
Add pagination for Blocks
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into chore/elixir-1.11
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
feld
Merge branch 'feature/1822-files-consistency' into...
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-13
Alexander Strizhakov
fixes after rebase
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
alias alphabetically order
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
EnsurePublicOrAuthenticatedPlug module name
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
OAuthScopesPlug module name
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
RateLimiter module name
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-23
Roman Chvanikov
Merge 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-17
Roman Chvanikov
Merge branch 'develop' into feature/expire-mutes
blob
|
commitdiff
|
raw
|
diff to current
2020-09-13
Roman Chvanikov
Merge 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-08
Roman Chvanikov
Merge branch 'develop' into feature/expire-mutes
blob
|
commitdiff
|
raw
|
diff to current
2020-09-08
Roman Chvanikov
Add expires_in param for account mutes
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
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-25
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-12
feld
Merge branch 'docs_improve_static_dir_documentation...
blob
|
commitdiff
|
raw
|
diff to current
2020-08-12
feld
Merge branch 'feature/update-welcome-setting-in-descrip...
blob
|
commitdiff
|
raw
|
diff to current
next