6538 Commits (96e1db1cf1c244ccdd0ec02516f4bb2cce49154a)
 

Author SHA1 Message Date
  kaniini 96e1db1cf1 Merge branch 'ci/build-otp-maint' into 'develop' 4 years ago
  kaniini 4f3b8d5399 Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1' 4 years ago
  Ariadne Conill 979f66a99c update pleroma fe 4 years ago
  rinpatch 2b98ef832c Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1' 4 years ago
  rinpatch 6d1ca73466 Linting 4 years ago
  rinpatch 4c6e5639d3 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex 4 years ago
  rinpatch cfd9f73f0d Credo considered harmful 4 years ago
  rinpatch 9d32f38b39 Remove useless with clause 4 years ago
  rinpatch 22a16a3e81 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 4 years ago
  rinpatch d4a76b0a6f Don't embed the first page in inboxes/outboxes and refactor the views to 4 years ago
  Haelwenn (lanodan) Monnier e91f0e2801 mix.lock: Bump hackney to 1.15.2 4 years ago
  kaniini 53b4daa514 Merge branch 'update/admin-fe-stable' into 'maint/1.1' 4 years ago
  Mark Felder fe33084ea8 Update AdminFE for 1.1 branch 4 years ago
  rinpatch 2ab7aeb3ab Merge branch 'cherry-pick-764931fc' into 'maint/1.1' 4 years ago
  feld f339ec3939 Merge branch 'deps/update-tesla' into 'develop' 4 years ago
  rinpatch 6c3f5e8ba0 Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1' 4 years ago
  rinpatch c64ab84e6a Merge branch 'fix-tests' into 'develop' 4 years ago
  rinpatch e71d662d3a Merge branch 'cherry-pick-9c64a257' into 'maint/1.1' 4 years ago
  rinpatch ea1867f48e Merge branch 'config-changes' into 'develop' 4 years ago
  rinpatch 90b0bd3984 Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1' 4 years ago
  rinpatch dca545bb0d Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 4 years ago
  rinpatch ae33cca4cf Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 4 years ago
  rinpatch 056780fd8e Mastodon API: Respect post privacy in favourited/reblogged endpoints 4 years ago
  lain 53a3ad6043 Merge branch 'cleanup-activity' into 'develop' 4 years ago
  Haelwenn 0d9609894f Merge branch 'feature/change-email' into 'develop' 4 years ago
  rinpatch f884987ace Merge branch 'admin-config-description' into 'develop' 4 years ago
  Egor Kislitsyn 7b5c81b391 Add a note about compatibility with Mastodon 4 years ago
  Egor Kislitsyn 25d8216804 Add email change endpoint 4 years ago
  Egor Kislitsyn 5bfbad13ad Add more tests for Pleroma.Activity 4 years ago
  Egor Kislitsyn 39dc9b470c Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils 4 years ago
  kaniini 5ca643b80d Merge branch 'fix/admin-api-docs' into 'develop' 4 years ago
  Angelina Filippova 528a88a686 Fix admin api docs for creating users 4 years ago
  Haelwenn 51609217c2 Merge branch 'fix/error-log-double-quotes' into 'develop' 4 years ago
  Mark Felder 102eb4455c Fix associated test as well 4 years ago
  Mark Felder 74e4c72c4a Fix double quotes in error logs 4 years ago
  kaniini 50269e9cac Merge branch 'feature/jason-view-render' into 'develop' 4 years ago
  rinpatch 56828abf6d Use Jason for rendering responses 4 years ago
  Haelwenn 46ae62d159 Merge branch 'patch-5' into 'develop' 4 years ago
  lain fb7332aec7 Merge branch 'fix/oom-parallel-rendering' into 'develop' 4 years ago
  rinpatch 5a76d5d239 Add extended benchmark 4 years ago
  Alex S e47089cf55 web_cache_ttl description 4 years ago
  Alex S 38b29779c3 refactoring 4 years ago
  Alex S be32d90a0c little refactor 4 years ago
  Alex S 5ff12e7df1 some changes 4 years ago
  Alex S aa7fb22008 placeholder for config.md 4 years ago
  Alex S 57dc59d98d little fix 4 years ago
  Alex S 6b0e8b73df bump ex_doc version 4 years ago
  Alex S 10827eecad formatting 4 years ago
  Alex S 35757b6d0e don't add behaviour to suggestions 4 years ago
  Alexander Strizhakov 5db2920644 Apply suggestion to config/description.exs 4 years ago