Skip to content
Snippets Groups Projects
  1. Oct 24, 2019
  2. Oct 23, 2019
  3. Oct 21, 2019
  4. Oct 20, 2019
    • 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
      Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation · c6fdfbc4
      Ivan Tashkinov authored
      # Conflicts:
      #	CHANGELOG.md
      #	lib/pleroma/notification.ex
      #	lib/pleroma/user.ex
      #	lib/pleroma/user/info.ex
      #	lib/pleroma/web/activity_pub/activity_pub.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
      c6fdfbc4
    • kaniini's avatar
      Merge branch 'chore/add-missing-websub-drop-migration' into 'develop' · 62e3d76a
      kaniini authored
      add missing migration to drop websub table
      
      See merge request pleroma/pleroma!1868
      62e3d76a
    • Ivan Tashkinov's avatar
      [#1304] Analysis issue fix. · b4cbf056
      Ivan Tashkinov authored
      b4cbf056
    • Ivan Tashkinov's avatar
      [#1304] Moved remaining fields from User.Info to User. · e8843974
      Ivan Tashkinov authored
      Misc. fixes / improvements.
      e8843974
    • kaniini's avatar
      add missing migration to drop websub table · 34754938
      kaniini authored
      34754938
  5. Oct 19, 2019
Loading