Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / emails / user_email.ex
2019-04-29 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-16 kaniiniMerge branch 'feature/788-separate-email-addresses...
2019-04-14 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-04-13 Alex SMerge develop to 788-separate-email-addresses
2019-04-13 Alex Sfallback to the old behaviour
2019-04-12 lambdaMerge branch 'bugfix/pleroma-email-naming' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-10 Alex SMerge branch 'develop' into feature/788-separate-email...
2019-04-10 Alex Sadding notify_email setting for trigger emails
2019-04-10 Haelwenn (lanodan... s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop'
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop'
2019-02-09 Haelwenn (lanodan... de-group alias/es
2019-01-13 rinpatchResolve merge conflict
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-12-23 lambdaMerge branch 'hotfix/activity-without-content' into...
2018-12-20 lambdaMerge branch 'ci-test-fix' into 'develop'
2018-12-20 kaniiniMerge branch '114_email_confirmation' into 'develop'
2018-12-20 Ivan Tashkinov[#114] Added :user_id component to email confirmation...
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 Ivan Tashkinov[#114] Account confirmation email, registration as...
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-16 HaelwennMerge branch 'develop' into 'develop'
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-15 lambdaMerge branch 'fix/views-ignore-unhandled-activites...
2018-12-15 lambdaMerge branch 'tests-warning-as-errors' into 'develop'
2018-12-14 hrefMerge branch 'fix/issue_433' into 'develop'
2018-12-14 hrefMerge branch '114_email_invites' into 'develop'
2018-12-14 raenoMerge branch 'develop' into oembed_provider
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 Ivan Tashkinov[#114] Improved tests.
2018-12-14 Ivan Tashkinov[#114] Added UserInviteToken creation, adjusted invitat...
2018-12-14 Ivan Tashkinov[#114] Naive implementation of email invitations.
2018-12-14 hrefMerge branch '114_user_registration_emails' into 'develop'
2018-12-13 Ivan Tashkinov[#114] Removed `email_invite` implementation (to be...
2018-12-13 Ivan Tashkinov[#114] Initial implementation of user email invitations.
2018-12-12 Ivan Tashkinov[#114] Initial implementation of user password reset...