Commits · dc60b1ee583e59ab1a6808700b45992a41fecd8f · Alex Gleason / pleroma

Jun 29, 2020
- updated swoosh · dc60b1ee
  Maksim authored 4 years ago
  
  dc60b1ee
- Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop' · 07ff2d62
  lain authored 4 years ago
  
  excluding attachment links from RichMedia See merge request pleroma/pleroma!2702
  07ff2d62
- excluding attachment links from RichMedia · 6512ef68
  Alexander Strizhakov authored 4 years ago
  
  Verified
  
  6512ef68
- Merge branch 'avatar-removing' into 'develop' · 651f2695
  lain authored 4 years ago
  
  UpdateCredentialsTest: Add test for removing profile images. See merge request !2701
  651f2695
- UpdateCredentialsTest: Add test for removing profile images. · e64d0843
  lain authored 4 years ago
  
  e64d0843
- Merge branch '1031-parent-visible' into 'develop' · 577da132
  lain authored 4 years ago
  
  Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request !2679
  577da132
- Merge branch 'openapi/schema-account-pleromafields' into 'develop' · e2296403
  lain authored 4 years ago
  
  ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses See merge request !2700
  e2296403
- ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses · 9f51b03e
  Haelwenn authored 4 years ago
  
  Verified
  
  9f51b03e
- Merge branch 'docs/mastoapi-account-fields' into 'develop' · cf1bd386
  Haelwenn authored 4 years ago
  
  differences_in_mastoapi_responses: Update account fields See merge request !2699
  cf1bd386
- differences_in_mastoapi_responses: Update account fields · efb5d64e
  Haelwenn authored 4 years ago
  
  Verified
  
  efb5d64e
Jun 27, 2020
- Merge branch 'reduce-preloading-defaults' into 'develop' · 4b32bc80
  lain authored 4 years ago
  
  Config: Reduce default preloaders to configuration endpoints. See merge request !2697
  4b32bc80
- Config: Reduce default preloaders to configuration endpoints. · 0313520c
  lain authored 4 years ago
  
  Fetching the timeline is a bit heavy to do by default.
  0313520c
- Merge branch 'fix/fetcher-transmogrifier-error' into 'develop' · dc31fbfe
  lain authored 4 years ago
  
  object/fetcher: Pass full Transmogrifier error See merge request !2696
  dc31fbfe
Jun 26, 2020
- object/fetcher: Pass full Transmogrifier error · 1566543b
  Haelwenn authored 4 years ago
  
  Verified
  
  1566543b
- Merge branch 'block-handling' into 'develop' · bf1c5e25
  Haelwenn authored 4 years ago
  
  Handle blocks with the pipeline See merge request !2685
  bf1c5e25
- Merge branch '1258-anti-link-spam-exemption' into 'develop' · 09478c9c
  Haelwenn authored 4 years ago
  
  AntiSpamLinkPolicy: Exempt local users. Closes #1258 See merge request !2686
  09478c9c
- Merge branch 'fix-chats' into 'develop' · 6db9f7cd
  lain authored 4 years ago
  
  Nodeinfo: Add chat information back in. See merge request !2691
  6db9f7cd
- Nodeinfo: Add chat information back in. · 7ed22964
  lain authored 4 years ago
  
  7ed22964
- User: Don't unfollow on block when the relevant setting is set. · 15a8b703
  lain authored 4 years ago
  
  15a8b703
- BlockValidator: Restore old behavior for incoming blocks. · c3383d4f
  lain authored 4 years ago
  
  c3383d4f
- Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop' · 7c7a6509
  Haelwenn authored 4 years ago
  
  nodeinfo: Fix MRF transparency See merge request !2689
  7c7a6509
- nodeinfo: Fix MRF transparency · d6c958b4
  Haelwenn authored 4 years ago
  
  Verified
  
  d6c958b4
Jun 25, 2020
- Merge branch 'preload-data' into 'develop' · 82884196
  feld authored 4 years ago
  
  Preload data into index.html Closes #1660 See merge request !2381
  82884196
- Merge branch 'mastoapi-omitted' into 'develop' · 2e39fbe0
  feld authored 4 years ago
  
  MastoAPI differences: Document not implemented features See merge request !2687
  2e39fbe0
- Merge branch 'update/admin-fe-20200625' into 'develop' · bb275c49
  feld authored 4 years ago
  
  Update AdminFE build See merge request !2688
  bb275c49
- Update AdminFE build · d9e46236
  feld authored 4 years ago
  
  d9e46236
- MastoAPI differences: Document not implemented features · 28d4e60f
  Alex Gleason authored 4 years ago
  
  Verified
  
  28d4e60f
- Merge branch 'chore/remove-reference-to-distsn' into 'develop' · 1d0804b4
  lain authored 4 years ago
  
  Remove reference to defunct distsn.org See merge request !2675
  1d0804b4
- AntiSpamLinkPolicy: Exempt local users. · 04abee78
  lain authored 4 years ago
  
  04abee78
- Apply suggestion to config/description.exs · f585622f
  lain authored 4 years ago
  
  f585622f
- Merge branch 'issue/1872-ex_aws' into 'develop' · 1cd1977c
  lain authored 4 years ago
  
  [#1872] use Pleroma.HTTP for ExAws.S3 See merge request !2683
  1cd1977c
- Blocking: Don't federate if the options is set. · 84f9ca19
  lain authored 4 years ago
  
  84f9ca19
- ActivityPub: Remove `block`. · 44bb7cfc
  lain authored 4 years ago
  
  44bb7cfc
- AccountController: Extract blocking to CommonAPI. · 8cfb58a8
  lain authored 4 years ago
  
  8cfb58a8
- Transmogrifier: Switch to pipeline for Blocks. · e38293c8
  lain authored 4 years ago
  
  e38293c8
- ObjectValidator: Basic `Block` support. · 89e5b204
  lain authored 4 years ago
  
  89e5b204
- Transmogrifier Test: Extract block handling. · d137f934
  lain authored 4 years ago
  
  d137f934
- Merge branch 'fix/following-request-from-deactivated' into 'develop' · 0e26ef2a
  lain authored 4 years ago
  
  Filter outstanding follower requests from deactivated accounts Closes #1771 See merge request !2682
  0e26ef2a
- added wrapper Pleroma.HTTP for ExAws.S3 · 439a1a02
  Maksim authored 4 years ago
  
  439a1a02
Jun 24, 2020
- Filter outstanding follower requests from deactivated accounts · 67ab5805
  feld authored 4 years ago
  
  67ab5805