projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅ next
Fix merge conflicts with upstream
[akkoma]
/
test
/
pleroma
/
user_test.exs
2021-01-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2021-01-08
lain
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
blob
|
commitdiff
|
raw
2021-01-07
lain
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
blob
|
commitdiff
|
raw
2021-01-07
lain
Merge branch 'object-normalize-refactor' into 'develop'
blob
|
commitdiff
|
raw
2021-01-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
2021-01-04
lain
Object: Rework how Object.normalize works
blob
|
commitdiff
|
raw
2020-12-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-26
lain
Merge branch 'cachex-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-23
lain
Merge branch 'stable' into mergeback/2.2.1
blob
|
commitdiff
|
raw
|
diff to current
2020-12-23
lain
Merge branch 'release/2.2.1' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-22
lain
User: Don't allow local users in remote changesets
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
feld
Merge branch 'registration-workflow' into 'develop'
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-09
lain
Merge branch 'stream-follow-updates' 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-07
lain
Merge branch 'feature/configdb-mix-tasks' into '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-12-03
rinpatch
Merge branch 'supported-emojos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Haelwenn
Merge branch '2339-local-remote-mixup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-02
lain
User: Don't allow local users in remote changesets
blob
|
commitdiff
|
raw
|
diff to current
2020-12-01
Egor Kislitsyn
Stream follow updates
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-28
Ivan Tashkinov
OAuth form user remembering feature. Local MastoFE...
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-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-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-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
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
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-28
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-28
Mark Felder
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-28
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
feld
Merge branch 'feature/autofollowing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
feld
Merge branch 'develop' into 'feature/autofollowing'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-27
feld
Merge branch 'develop' into 'feature/autofollowing'
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-16
Mark Felder
Adds feature to permit e.g., local admins and community...
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
Alex Gleason
Replace User.toggle_confirmation/1 with User.confirm...
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
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
Alexander Strizhakov
tests consistency
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history