summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-14Merge branch '114_user_registration_emails' into 'develop'href
[#114] User registration emails Closes #114 See merge request pleroma/pleroma!531
2018-12-14[#114] Addressed MR comments. Removed functionality to be extracted to other ↵Ivan Tashkinov
MRs.
2018-12-14Merge branch 'fix/double-rt-or-fav' into 'develop'lambda
Prevent accidental double RTs or favorites See merge request pleroma/pleroma!542
2018-12-14Merge branch 'fix/qvitter-fav-object' into 'develop'lambda
TwitterAPI: Include favorited post in json Closes #405 See merge request pleroma/pleroma!543
2018-12-14Merge branch '2018-12-13-update-frontend' into 'develop'lambda
update frontend See merge request pleroma/pleroma!544
2018-12-14TwitterAPI: Include favorited post in jsoneal
2018-12-14Prevent accidental double RTs or favoriteseal
2018-12-13update frontendlain
2018-12-13Merge branch 'username-underscores' into 'develop'lambda
Allow underscores/dashes in usernames. Closes #429 See merge request pleroma/pleroma!537
2018-12-13Merge branch 'fix/mix-tasks-set-user-info' into 'develop'lambda
Fix mix task User See merge request pleroma/pleroma!539
2018-12-13[#114] Removed `email_invite` implementation (to be addressed separately).Ivan Tashkinov
2018-12-13[#114] Removed `email_invite` implementation (to be addressed separately).Ivan Tashkinov
2018-12-13[#114] Initial implementation of user email invitations.Ivan Tashkinov
2018-12-13[#114] Refactored `password_reset` (moved to TwitterAPI). Added homepage ↵Ivan Tashkinov
links to password reset result pages.
2018-12-12Extended nicknames: allow dashes.href
2018-12-12Allow to set both admin and moderator at the same time in mix task Userlink0ff
2018-12-12Merge branch 'fix/nginx-safari' into 'develop'lambda
Update proxy config to improve behavior and allow compatibility with Safari on MacOS and iOS See merge request pleroma/pleroma!538
2018-12-12Fix toggle_activated in mix task Userlink0ff
2018-12-12Allow underscores in usernames.href
Fixes #429.
2018-12-12proxy buffering still needs to be offMark Felder
2018-12-12Update proxy config to improve behavior and allow compatibility with Safari ↵Mark Felder
on MacOS and iOS
2018-12-12[#114] Routes and config for `confirm_email` and `email_invite` (Twitter API).Ivan Tashkinov
2018-12-12[#114] Addressed warnings. Fix of `with` statement clause in `password_reset`.Ivan Tashkinov
2018-12-12[#114] Added tests for "POST /api/account/password_reset".Ivan Tashkinov
2018-12-12[#114] Initial implementation of user password reset emails (user-initiated).Ivan Tashkinov
2018-12-12[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer ↵Ivan Tashkinov
config examples.
2018-12-12[#114] SMTP deps and config.Ivan Tashkinov
2018-12-12Merge branch 'support/issue_442' into 'develop'kaniini
[#442] fix warnings See merge request pleroma/pleroma!536
2018-12-12fix warningsMaksim Pechnikov
2018-12-10Merge branch 'new-fe-options' into 'develop'scarlett
Add new frontend options to server-side config. See merge request pleroma/pleroma!535
2018-12-10Document the new frontend options.scarlett
2018-12-10Add new frontend options to server-side config.scarlett
2018-12-10Merge branch '2018-12-10-update-frontend' into 'develop'lambda
2018 12 10 update frontend See merge request pleroma/pleroma!534
2018-12-10Fix warnings.lain
2018-12-10update frontendlain
2018-12-10Merge branch 'fix_empty_bio_crash' into 'develop'lambda
Fixes #415. Do not crash during registration when hasn't filled bio field Closes #415 See merge request pleroma/pleroma!529
2018-12-10Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'lambda
Mix tasks: improve uploads.ex moduledoc See merge request pleroma/pleroma!528
2018-12-10Merge branch 'fix/config-md-typos' into 'develop'lambda
config.md: Fix typos and add `federating` option description See merge request pleroma/pleroma!525
2018-12-10Merge branch 'support/bugfix_272' into 'develop'lambda
[#272] fix hashtags in api See merge request pleroma/pleroma!510
2018-12-10Merge branch 'fix/theora-detection-read-bytes' into 'develop'lambda
Fix Theora detection in mime.ex See merge request pleroma/pleroma!493
2018-12-10Merge branch 'anonymize-filter-text' into 'develop'lambda
AnonymizeFilename: allow for a pre-defined text instead of random string See merge request pleroma/pleroma!516
2018-12-10Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'lambda
# Conflicts: # lib/mix/tasks/pleroma/uploads.ex
2018-12-10Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'lambda
Parallel588/pleroma support/compile warnings See merge request pleroma/pleroma!532
2018-12-10Format.lain
2018-12-10Treat warnings as errors outside of tests.lain
2018-12-10updatesMaksim Pechnikov
2018-12-10Keep the shortdoc descriptiverinpatch
2018-12-10Use "~" as a route namespace symbol on FEMaxim Filippov
2018-12-10Fixes #415. Properly handle nil and empty string by User.parse_bioraeno
2018-12-09Mix tasks: improve uploads.ex moduledocRin Toshaka