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]
/
lib
/
pleroma
/
emails
/
user_email.ex
2019-04-29
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-04-19
lambda
Merge branch '923_oauth_consumer_refactoring_ci' into...
blob
|
commitdiff
|
raw
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
2019-04-16
kaniini
Merge branch 'feature/788-separate-email-addresses...
blob
|
commitdiff
|
raw
2019-04-14
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-13
Alex S
Merge develop to 788-separate-email-addresses
blob
|
commitdiff
|
raw
2019-04-13
Alex S
fallback to the old behaviour
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Alex S
Merge branch 'develop' into feature/788-separate-email...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Alex S
adding notify_email setting for trigger emails
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Haelwenn (lanodan...
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
de-group alias/es
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
William Pitcock
update copyright years to 2019
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
add license boilerplate to pleroma core
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
lambda
Merge branch 'hotfix/activity-without-content' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
lambda
Merge branch 'ci-test-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
kaniini
Merge branch '114_email_confirmation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
Ivan Tashkinov
[#114] Added :user_id component to email confirmation...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
Ivan Tashkinov
[#114] Account confirmation email, registration as...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
Haelwenn
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
eal
Merge branch 'fix/masto-put-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
lambda
Merge branch 'fix/views-ignore-unhandled-activites...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
lambda
Merge branch 'tests-warning-as-errors' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'fix/issue_433' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch '114_email_invites' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Ivan Tashkinov
[#114] Improved tests.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Ivan Tashkinov
[#114] Added UserInviteToken creation, adjusted invitat...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Ivan Tashkinov
[#114] Naive implementation of email invitations.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch '114_user_registration_emails' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-13
Ivan Tashkinov
[#114] Removed `email_invite` implementation (to be...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-13
Ivan Tashkinov
[#114] Initial implementation of user email invitations.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
Ivan Tashkinov
[#114] Initial implementation of user password reset...
blob
|
commitdiff
|
raw
|
diff to current