1. 11 Nov, 2019 2 commits
  2. 10 Nov, 2019 5 commits
  3. 08 Nov, 2019 1 commit
  4. 07 Nov, 2019 1 commit
  5. 06 Nov, 2019 2 commits
  6. 05 Nov, 2019 1 commit
  7. 04 Nov, 2019 3 commits
  8. 03 Nov, 2019 1 commit
  9. 01 Nov, 2019 1 commit
  10. 30 Oct, 2019 3 commits
  11. 29 Oct, 2019 2 commits
  12. 28 Oct, 2019 2 commits
  13. 27 Oct, 2019 2 commits
  14. 25 Oct, 2019 1 commit
  15. 24 Oct, 2019 1 commit
  16. 23 Oct, 2019 3 commits
  17. 21 Oct, 2019 5 commits
  18. 20 Oct, 2019 2 commits
    • Ivan Tashkinov's avatar
      [#1304]. Post-merge fixes. Merge branch 'develop' of... · ee04fbc3
      Ivan Tashkinov authored
      [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
      
      # Conflicts:
      #	CHANGELOG.md
      #	lib/pleroma/notification.ex
      #	lib/pleroma/user.ex
      #	lib/pleroma/user/info.ex
      #	lib/pleroma/web/admin_api/admin_api_controller.ex
      #	lib/pleroma/web/ostatus/handlers/follow_handler.ex
      #	lib/pleroma/web/ostatus/ostatus.ex
      #	lib/pleroma/web/salmon/salmon.ex
      #	lib/pleroma/web/websub/websub.ex
      #	test/web/admin_api/admin_api_controller_test.exs
      #	test/web/federator_test.exs
      #	test/web/mastodon_api/controllers/conversation_controller_test.exs
      #	test/web/ostatus/ostatus_controller_test.exs
      #	test/web/ostatus/ostatus_test.exs
      #	test/web/salmon/salmon_test.exs
      #	test/web/websub/websub_test.exs
      ee04fbc3
    • Ivan Tashkinov's avatar
      [#1304] Moved remaining fields from User.Info to User. · e8843974
      Ivan Tashkinov authored
      Misc. fixes / improvements.
      e8843974
  19. 19 Oct, 2019 2 commits