projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge remote-tracking branch 'upstream/develop' into registration-workflow
[akkoma]
/
lib
/
pleroma
/
user.ex
2020-11-21
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2020-11-20
feld
Merge branch 'fix/2302-report-duplicates' into 'develop'
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
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-18
lain
Merge branch 'frontend-admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-17
feld
Merge branch 'remove/fedsockets' into 'develop'
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
rinpatch
Remove FedSockets
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
Haelwenn
Merge branch '2236-no-name' 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
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
Haelwenn
Merge branch '2236-no-name' 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
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
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-23
lain
User: Correctly handle whitespace names.
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
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-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-12
Alex Gleason
Refactor User.post_register_action/1 emails
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
Alex Gleason
Make User.confirm/1 and User.approve/1 idempotent
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
Alex Gleason
Refactor User.confirm/1, add more tests
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
Alex Gleason
Move admin approval email logic into User.post_register...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
Alex Gleason
Registration tests
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
Alex Gleason
Send approval pending email during registration
blob
|
commitdiff
|
raw
|
diff to current
2020-10-12
Alex Gleason
Registration: user state is separate from instance...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-11
Alex Gleason
Handle User.post_register_action/1 in steps
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-10-06
Mark Felder
Merge branch 'develop' into revert/rich-media-censorship
blob
|
commitdiff
|
raw
|
diff to current
2020-10-06
rinpatch
Merge branch 'filtering-following' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-06
rinpatch
Merge branch 'feature/update-description-for-frontends...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-05
Mark Felder
Merge branch 'develop' into feature/1893-remote-emoji...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-03
rinpatch
Merge branch 'fix/empty-params-openapi' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-30
feld
Merge branch 'chore/pleroma-vcl' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-30
rinpatch
Merge branch 'update/oban' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-30
rinpatch
Merge branch '2201-i-hate-this' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-29
Haelwenn
Merge branch 'fix/2189-unpin-activity' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-29
Mark Felder
More robust expires_at timestamp processing
blob
|
commitdiff
|
raw
|
diff to current
2020-09-29
lain
Merge branch 'ffmpeg-imagemagick-dependencies-documenta...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-29
lain
Merge branch 'issue/2170' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-28
Maksim Pechnikov
added `force` option to the unfollow operation
blob
|
commitdiff
|
raw
|
diff to current
2020-09-25
Mark Felder
Merge branch 'develop' into fix/deprecation-warning...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-25
feld
Merge branch 'feature/bulk-confirmation' into 'develop'
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-23
Roman Chvanikov
Merge develop
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
feld
Merge branch 'fix/fedsocket-useragent' into 'develop'
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-21
lain
Merge branch '2074-streaming-api-oauth-scopes-validatio...
blob
|
commitdiff
|
raw
|
diff to current
2020-09-21
lain
Merge branch 'issue/2099' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-09-20
Roman Chvanikov
Refactor mutes removing in CommonAPI and User
blob
|
commitdiff
|
raw
|
diff to current
2020-09-20
Roman Chvanikov
Merge branch 'develop' into feature/expire-mutes
blob
|
commitdiff
|
raw
|
diff to current
next