Commits · a050f3e015a6c5c8d38d535692d4da7a6b1e9c60 · Alex Gleason / pleroma

Apr 13, 2020
- fix for logger configuration through admin-fe · a050f3e0
  Alexander Strizhakov authored 4 years ago
  
  Verified
  
  a050f3e0
Apr 12, 2020
- Merge branch 'fix/mix-tasks-failing-otp' into 'develop' · 7ee35eb9
  rinpatch authored 4 years ago
  
  Fix mix tasks failing on OTP releases Closes #1678 See merge request pleroma/pleroma!2369
  7ee35eb9
- Fix mix tasks failing on OTP releases · 2ba754ff
  rinpatch authored 4 years ago
  
  No idea why this was even added. Closes #1678
  2ba754ff
Apr 11, 2020
- Merge branch 'following-relationships-optimizations' into 'develop' · 5e365448
  rinpatch authored 4 years ago
  
  FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
  5e365448
- Merge branch 'support/update_oban' into 'develop' · c682563b
  rinpatch authored 4 years ago
  
  [#1555] updated the Oban package See merge request pleroma/pleroma!2346
  c682563b
Apr 10, 2020
- fix Oban migration · ad92cef8
  Maksim authored 4 years ago
  
  ad92cef8
- Merge branch 'develop' into support/update_oban · c255c2e4
  Maksim authored 4 years ago
  
  c255c2e4
- Merge branch 'chore/changelog-organization' into 'develop' · aae22ab6
  feld authored 4 years ago
  
  Add a section for changelog entries that pertain to the next patch release. See merge request pleroma/pleroma!2366
  aae22ab6
- Add a section for changelog entries that pertain to the next patch release. · 6ff8812e
  feld authored 4 years ago
  
  This will make it easier to keep changelogs synced between develop and stable branches.
  6ff8812e
- Merge branch 'fix/support-conversations-pagination' into 'develop' · fc4f92c5
  Haelwenn authored 4 years ago
  
  Support pagination in conversations See merge request pleroma/pleroma!2329
  fc4f92c5
- Merge branch 'develop' into fix/support-conversations-pagination · cf2a0574
  minibikini authored 4 years ago
  
  Verified
  
  cf2a0574
- Merge branch 'chore/fix-changelog' into 'develop' · ce089615
  Haelwenn authored 4 years ago
  
  Chore/fix changelog See merge request pleroma/pleroma!2364
  ce089615
- Merge branch 'bugfix/apc2s_upload_activity' into 'develop' · 4d33e0bd
  Haelwenn authored 4 years ago
  
  bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316
  4d33e0bd
- Merge branch 'develop' into support/update_oban · 648cc699
  Maksim authored 4 years ago
  
  648cc699
- Merge branch 'fix-otp-version-file-in-docker' into 'develop' · c433ed9d
  Haelwenn authored 4 years ago
  
  Create OTP_VERSION file by `mix release` See merge request pleroma/pleroma!2362
  c433ed9d
Apr 09, 2020
- Rename function · c2aad36a
  kPherox authored 4 years ago
  
  c2aad36a
- CHANGELOG.md: update 2.0.2 release date · 9abf13ab
  rinpatch authored 4 years ago and feld committed 4 years ago
  
  9abf13ab
- CHANGELOG.md: add 2.0.2 update notes · adeb82e4
  rinpatch authored 4 years ago and feld committed 4 years ago
  
  adeb82e4
- CHANGELOG.md: add entries for funkwhale-related changes · 0b8f9a66
  rinpatch authored 4 years ago and feld committed 4 years ago
  
  0b8f9a66
- CHANGELOG.md: Add 2.0.2 entry · 7306d2d0
  rinpatch authored 4 years ago and feld committed 4 years ago
  
  7306d2d0
- CHANGELOG.md: Add upgrade notes for 2.0.1 · 2a08f44b
  rinpatch authored 5 years ago and feld committed 4 years ago
  
  2a08f44b
- changelog.md: add 2.0.1 entry · 781ac288
  rinpatch authored 5 years ago and feld committed 4 years ago
  
  781ac288
- Merge branch 'update-changelog' into 'develop' · fd388a09
  rinpatch authored 4 years ago
  
  Update CHANGELOG See merge request pleroma/pleroma!2363
  fd388a09
- Update CHANGELOG · c826d519
  minibikini authored 4 years ago
  
  Verified
  
  c826d519
- Merge branch 'notifications-dismiss-api' into 'develop' · c23532d2
  feld authored 4 years ago
  
  Add `/api/v1/notifications/:id/dismiss` endpoint Closes #1673 See merge request pleroma/pleroma!2360
  c23532d2
- Create OTP_VERSION file by `mix release` · 0e8f6d24
  kPherox authored 4 years ago
  
  Verified
  
  0e8f6d24
- Merge branch 'fix-otp-version-file-in-docker' into 'develop' · e84c0450
  lain authored 4 years ago
  
  Add OTP_VERSION file to docker Closes #1662 See merge request pleroma/pleroma!2361
  e84c0450
- Add `/api/v1/notifications/:id/dismiss` endpoint · d545b883
  minibikini authored 4 years ago
  
  Verified
  
  d545b883
- Fix OTP_VERSION file in docker · d37a1029
  kPherox authored 4 years ago
  
  Unverified
  
  d37a1029
- Merge branch 'fix/1658-invite-send' into 'develop' · b87b798c
  lain authored 4 years ago
  
  Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344
  b87b798c
- typo fix · f20a19de
  Alexander Strizhakov authored 4 years ago
  
  Verified
  
  f20a19de
- Apply suggestion to test/web/admin_api/admin_api_controller_test.exs · 9795ff5b
  Alexander Strizhakov authored 4 years ago
  
  9795ff5b
- Apply suggestion to test/web/admin_api/admin_api_controller_test.exs · 365c34a7
  Alexander Strizhakov authored 4 years ago
  
  365c34a7
- Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex · 1cf0d5ab
  Alexander Strizhakov authored 4 years ago
  
  1cf0d5ab
- Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex · 4c60fdcb
  Alexander Strizhakov authored 4 years ago
  
  4c60fdcb
- Apply suggestion to docs/API/admin_api.md · c8bfbf51
  Alexander Strizhakov authored 4 years ago
  
  c8bfbf51
- Merge branch 'open-api' into 'develop' · d2e21fbc
  lain authored 4 years ago
  
  Add OpenAPI Closes pleroma-meta#19 See merge request pleroma/pleroma!2345
  d2e21fbc
- Merge branch 'formatter-html-safe' into 'develop' · 564f3f01
  lain authored 4 years ago
  
  formatter.ex: Use Phoenix.HTML for mention/hashtag generation See merge request pleroma/pleroma!2357
  564f3f01
- Merge branch 'changelog-update' into 'develop' · de592a6d
  Haelwenn authored 4 years ago
  
  No changelog entry - bug fixed only in develop See merge request pleroma/pleroma!2359
  de592a6d
- no changelog entry - bug fixed only in develop · 73134e24
  Alexander Strizhakov authored 4 years ago
  
  Verified
  
  73134e24