Commits · aab264db82054df470075c65ca25c42bbcc5d7a8 · Alex Gleason / pleroma

Sep 16, 2019
- Streamer refactoring · aab264db
  Steven Fuchs authored 5 years ago and kaniini committed 5 years ago
  
  aab264db
- Merge branch 'feature/delivery-tracking' into 'develop' · 17142a37
  kaniini authored 5 years ago
  
  Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661
  17142a37
- Merge branch 'feature/optimize_rich_media_parser' into 'develop' · d1a84cee
  kaniini authored 5 years ago
  
  added prepare html for RichMedia.Parser See merge request pleroma/pleroma!1672
  d1a84cee
- Merge branch 'fix/race-in-tests' into 'develop' · 74eba5af
  kaniini authored 5 years ago
  
  Fix a race condition in tests See merge request pleroma/pleroma!1673
  74eba5af
- Fix a race condition in tests · ca88e37a
  minibikini authored 5 years ago
  
  ca88e37a
Sep 15, 2019
- Merge branch '1149-oban-job-queue' into 'develop' · 2990c0a5
  rinpatch authored 5 years ago
  
  [#1149] `oban`-based job & retry queues Closes #1149 See merge request pleroma/pleroma!1518
  2990c0a5
- added prepare html for RichMedia.Parser · b4cf74c1
  Maksim authored 5 years ago
  
  b4cf74c1
- [#1149] Reinstated docs/config.md changes. · 3b8ec98b
  Ivan Tashkinov authored 5 years ago
  
  3b8ec98b
- [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue · 610236d6
  Ivan Tashkinov authored 5 years ago
  
  # Conflicts: # docs/config.md
  610236d6
Sep 14, 2019
- Merge branch 'config-changes' into 'develop' · 9c64a257
  rinpatch authored 5 years ago
  
  two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666
  9c64a257
- Merge branch 'fix/truncate-remote-user-fields' into 'develop' · 62bbba80
  rinpatch authored 5 years ago
  
  Truncate remote user fields See merge request pleroma/pleroma!1619
  62bbba80
- [#1149] Rewritten readme as config/description.exs. · e127b9ab
  Ivan Tashkinov authored 5 years ago
  
  e127b9ab
- [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue · 6bcedb69
  Ivan Tashkinov authored 5 years ago
  
  # Conflicts: # docs/config.md # mix.lock
  6bcedb69
- Merge branch 'fix-tests' into 'develop' · 3ae448b5
  rinpatch authored 5 years ago
  
  Fix `Activity.all_by_actor_and_id/2` test See merge request pleroma/pleroma!1668
  3ae448b5
- Fix `Activity.all_by_actor_and_id/2` test · b870ae08
  minibikini authored 5 years ago
  
  b870ae08
- Merge branch 'security/fav-reblog-access-control' into 'develop' · 4264c4b7
  rinpatch authored 5 years ago
  
  Mastodon API: Respect post privacy in favourited/reblogged endpoints See merge request pleroma/pleroma!1667
  4264c4b7
- Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs · a78a7ee4
  rinpatch authored 5 years ago
  
  a78a7ee4
- Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs · 85b6144f
  rinpatch authored 5 years ago
  
  85b6144f
Sep 13, 2019
- Mastodon API: Respect post privacy in favourited/reblogged endpoints · 5c5ebd38
  rinpatch authored 5 years ago
  
  5c5ebd38
- Merge branch 'capture-test-errors' into 'develop' · a9b78f55
  lain authored 5 years ago
  
  Capture test error messages where appropriate See merge request pleroma/pleroma!1665
  a9b78f55
- Merge branch 'refactor/add_link_headers' into 'develop' · 1be09bde
  lain authored 5 years ago
  
  Refactor `add_link_headers/7` -> `add_link_headers/3` See merge request pleroma/pleroma!1636
  1be09bde
- Merge branch 'develop' into feature/delivery-tracking · ba70a8ca
  rinpatch authored 5 years ago
  
  ba70a8ca
- Disallow NULLs in deliveries · ac4a748f
  rinpatch authored 5 years ago
  
  ac4a748f
- don't track generated_config.md · 4da0da9a
  Alexander Strizhakov authored 5 years ago
  
  4da0da9a
- config.md back · c625fe6f
  Alexander Strizhakov authored 5 years ago
  
  c625fe6f
- markdown generation to the new file · 69faec03
  Alexander Strizhakov authored 5 years ago
  
  69faec03
- Capture test error messages where appropriate · 25a64a4a
  Steven Fuchs authored 5 years ago
  
  25a64a4a
- Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex · 8900cb68
  rinpatch authored 5 years ago
  
  8900cb68
- Apply suggestion to lib/pleroma/delivery.ex · 05f8a066
  rinpatch authored 5 years ago
  
  05f8a066
- Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex · 2784962d
  rinpatch authored 5 years ago
  
  2784962d
- Merge branch 'cleanup-activity' into 'develop' · 53a3ad60
  lain authored 5 years ago
  
  Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623
  53a3ad60
- Merge branch 'feature/change-email' into 'develop' · 0d960989
  Haelwenn authored 5 years ago
  
  Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580
  0d960989
- Merge branch 'admin-config-description' into 'develop' · f884987a
  rinpatch authored 5 years ago
  
  Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611
  f884987a
- Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex · 3896a51b
  rinpatch authored 5 years ago
  
  3896a51b
- Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex · 51701704
  rinpatch authored 5 years ago
  
  51701704
- Remove unused functions and fix credo issues · fb96facc
  rinpatch authored 5 years ago
  
  fb96facc
- Use delivery info when federating deletes · ce23529d
  rinpatch authored 5 years ago
  
  ce23529d
- Add a note about compatibility with Mastodon · 7b5c81b3
  minibikini authored 5 years ago
  
  7b5c81b3
- Add email change endpoint · 25d82168
  minibikini authored 5 years ago
  
  25d82168
- Add more tests for Pleroma.Activity · 5bfbad13
  minibikini authored 5 years ago
  
  5bfbad13