Commits · b38d21060e6c7e71171229e0cb457ee3b49286b9 · Alex Gleason / pleroma

Jul 28, 2019
- Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop' · b38d2106
  kaniini authored 5 years ago
  
  transmogrifier: use User.delete() instead of handrolled user deletion code for remote users Closes #1104 See merge request pleroma/pleroma!1498
  b38d2106
- transmogrifier: use User.delete() instead of handrolled user deletion code for remote users · 492d854e
  kaniini authored 5 years ago
  
  Closes #1104
  492d854e
- Merge branch 'confirmation-resend' into 'develop' · 44bfff22
  kaniini authored 5 years ago
  
  add account confirmation email resend in mastodon api See merge request pleroma/pleroma!1492
  44bfff22
- add account confirmation email resend in mastodon api · 242f5c58
  Sachin Joshi authored 5 years ago and kaniini committed 5 years ago
  
  242f5c58
- Merge branch 'fix/user_update_and_set_cache' into 'develop' · 0d05ec38
  kaniini authored 5 years ago
  
  fixed User.update_and_set_cache for stale user See merge request pleroma/pleroma!1493
  0d05ec38
- fixed User.update_and_set_cache for stale user · 6a4b8b26
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  6a4b8b26
- Merge branch 'develop' into 'develop' · 488c06b6
  kaniini authored 5 years ago
  
  Fix HTTP sig tweak on KeyId See merge request pleroma/pleroma!1496
  488c06b6
- Merge branch 'feature/hackney-303-redirect' into 'develop' · f78390ff
  kaniini authored 5 years ago
  
  Handle 303 redirects Closes #1127 See merge request pleroma/pleroma!1497
  f78390ff
- Handle 303 redirects · 02dc6518
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  02dc6518
- Fix HTTP sig tweak on KeyId · 961e7785
  Thomas Sileo authored 5 years ago
  
  961e7785
Jul 26, 2019
- Merge branch 'issue/1097' into 'develop' · 08960d50
  rinpatch authored 5 years ago
  
  [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ See merge request pleroma/pleroma!1495
  08960d50
- [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ · 6b77a883
  Maksim authored 5 years ago
  
  6b77a883
- Merge branch 'changelog/1484-base_url-remove-media' into 'develop' · 46e8b680
  Haelwenn authored 5 years ago
  
  Changelog: !1484 base_url removed /media/ See merge request pleroma/pleroma!1494
  46e8b680
- CHANGELOG.md: Add entry for !1484 · 7c8abbcb
  Haelwenn authored 5 years ago
  
  Related to: pleroma/pleroma!1484 [ci skip]
  Verified
  
  7c8abbcb
Jul 25, 2019
- Merge branch 'tests/filter_dedupe' into 'develop' · d1e89106
  kaniini authored 5 years ago
  
  fixed test for elixir 1.7.4 See merge request pleroma/pleroma!1487
  d1e89106
- fixed test for elixir 1.7.4 · 03c38661
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  03c38661
Jul 24, 2019
- Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop' · 19835be0
  kaniini authored 5 years ago
  
  Fix remote follow from /ostatus_subscribe Closes #1103 See merge request pleroma/pleroma!1472
  19835be0
- Merge branch 'fix/put-correct-activity-url' into 'develop' · 931c4974
  kaniini authored 5 years ago
  
  Show the url advertised in the Activity in the Status JSON response Closes #1077 See merge request pleroma/pleroma!1485
  931c4974
- Show the url advertised in the Activity in the Status JSON response · b20020da
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  b20020da
- Add WebFinger test for AP-only account · 8d9f43e1
  kPherox authored 5 years ago
  
  Verified
  
  8d9f43e1
- Merge branch 'fix/Upload_base_url' into 'develop' · acd20914
  kaniini authored 5 years ago
  
  Fix/upload base url See merge request pleroma/pleroma!1484
  acd20914
- Do not prepend /media/ when using base_url · 84fca14c
  feld authored 5 years ago and kaniini committed 5 years ago
  
  This ensures admin has full control over the path where media resides.
  84fca14c
- Change to not require `magic-public-key` on WebFinger · ac27b94f
  kPherox authored 5 years ago
  
  Verified
  
  ac27b94f
- Merge branch 'tests/web_finger' into 'develop' · 7286cdff
  kaniini authored 5 years ago
  
  tests WebFinger See merge request pleroma/pleroma!1483
  7286cdff
- tests WebFinger · 55341ac7
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  55341ac7
- Merge branch 'domain-blocking-relationship-api' into 'develop' · b7fae304
  kaniini authored 5 years ago
  
  Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships) See merge request pleroma/pleroma!1481
  b7fae304
- Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships) · 45041358
  Eugenij authored 5 years ago and kaniini committed 5 years ago
  
  45041358
- Merge branch 'develop' into 'develop' · 53fad36b
  lain authored 5 years ago
  
  Honour domain blocks on streamed notifications/statuses See merge request pleroma/pleroma!1482
  53fad36b
- check both item and parent domain blocks · f5d574f4
  Sadposter authored 5 years ago
  
  f5d574f4
- move domain block check to with block · 48bd3be9
  Sadposter authored 5 years ago
  
  48bd3be9
- honour domain blocks on streaming notifications · 4af4f616
  Sadposter authored 5 years ago
  
  4af4f616
- Merge branch 'Fix-static-dir-doc' into 'develop' · 0be548b9
  kaniini authored 5 years ago
  
  Fix static_dir docs See merge request pleroma/pleroma!1465
  0be548b9
- Add text about gitignore · 9638da43
  aries authored 5 years ago
  
  9638da43
Jul 23, 2019
- Merge branch 'feature/admin-api-user-statuses' into 'develop' · 9c635732
  kaniini authored 5 years ago
  
  Admin API: Endpoint for fetching latest user's statuses See merge request pleroma/pleroma!1413
  9c635732
- Merge branch 'bugfix/rich-media-splice-url' into 'develop' · 2ae510ee
  kaniini authored 5 years ago
  
  rich media: parser: splice the given URL into the result See merge request pleroma/pleroma!1480
  2ae510ee
- rich media: parser: splice the given URL into the result · d3bdb8e7
  kaniini authored 5 years ago
  
  d3bdb8e7
- Merge branch 'develop' into feature/admin-api-user-statuses · f46805bb
  Maxim Filippov authored 5 years ago
  
  f46805bb
- AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) · 03471151
  Maxim Filippov authored 5 years ago
  
  03471151
- Merge branch 'chore/update-mix-lock' into 'develop' · 1a751529
  kaniini authored 5 years ago
  
  update mix.lock See merge request pleroma/pleroma!1478
  1a751529
- update mix.lock · 0afaf966
  kaniini authored 5 years ago
  
  0afaf966