Commits · 2e697f87f45f2982b53c4a0ec73f14526b6f8cf4 · Alex Gleason / pleroma

Jul 23, 2019
- Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`. · 2e697f87
  oncletom authored 5 years ago
  
  2e697f87
Jul 22, 2019
- Merge branch 'tests/skip-some-tests-on-mac' into 'develop' · a042a7ac
  kaniini authored 5 years ago
  
  Exclude tests that use :crypt.crypt/2 on macOS See merge request pleroma/pleroma!1470
  a042a7ac
- Exclude tests that use :crypt.crypt/2 on macOS · 9340896c
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  9340896c
- Merge branch 'changelog' into 'develop' · 29517144
  kaniini authored 5 years ago
  
  changelog See merge request pleroma/pleroma!1469
  29517144
- changelog · 2442b5c1
  Alexander Strizhakov authored 5 years ago and kaniini committed 5 years ago
  
  2442b5c1
- Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop' · 4a8b5226
  kaniini authored 5 years ago
  
  Feature/1087 wildcard option for blocks Closes #1087 See merge request pleroma/pleroma!1467
  4a8b5226
- Feature/1087 wildcard option for blocks · b70e6593
  Alexander Strizhakov authored 5 years ago and kaniini committed 5 years ago
  
  b70e6593
- Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop' · 674ad5e1
  Haelwenn authored 5 years ago
  
  activitypub: publisher: align sharedinbox usage with AP specification rules See merge request pleroma/pleroma!1464
  674ad5e1
- Merge branch 'bugfix/muted-user-notif-streaming' into 'develop' · 7271b2a9
  kaniini authored 5 years ago
  
  Bugfix: muted/blocked user notification streaming Closes #1105 See merge request pleroma/pleroma!1461
  7271b2a9
- Bugfix: muted/blocked user notification streaming · f712ee87
  Sadposter authored 5 years ago and kaniini committed 5 years ago
  
  f712ee87
- Merge branch 'tests/improve-test-coverage' into 'develop' · 24362cbb
  kaniini authored 5 years ago
  
  Add tests for users tasks and PleromaAuthenticator See merge request pleroma/pleroma!1462
  24362cbb
- Add tests for users tasks and PleromaAuthenticator · 05b5af80
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  05b5af80
- Merge branch 'hide-blocked-from-interaction' into 'develop' · b391211a
  kaniini authored 5 years ago
  
  Hide blocked users from interactions See merge request pleroma/pleroma!1463
  b391211a
- Hide blocked users from interactions · a5d6287b
  Sadposter authored 5 years ago and kaniini committed 5 years ago
  
  a5d6287b
- activitypub: publisher: align sharedinbox usage with AP specification rules · 56019d53
  kaniini authored 5 years ago
  
  While debugging the follow breakage, I observed that our sharedInbox usage did not match the rules in the specification. Accordingly, I have better aligned our usage of sharedInbox with the rules outlined in the ActivityPub specification.
  56019d53
Jul 21, 2019
- Merge branch 'fix/rich-media-ttl-fallback' into 'develop' · a00aab34
  kaniini authored 5 years ago
  
  Fix rich media parser failing when no TTL can be found by image TTL setters See merge request pleroma/pleroma!1460
  a00aab34
- Fix rich media parser failing when no TTL can be found by image TTL · 33681747
  rinpatch authored 5 years ago
  
  setters
  33681747
- Merge branch 'bugfix/sharedinbox-path-first' into 'develop' · 1689a11a
  kaniini authored 5 years ago
  
  router: ensure the AP sharedinbox path is registered first See merge request pleroma/pleroma!1458
  1689a11a
- router: ensure the AP sharedinbox path is registered first · bc6c5c51
  kaniini authored 5 years ago
  
  bc6c5c51
Jul 20, 2019
- Merge branch '1112-user-insert-conflict-id-preservation' into 'develop' · fe548f32
  kaniini authored 5 years ago
  
  [#1112] Preserving `id` on user insert conflict Closes #1112 See merge request pleroma/pleroma!1456
  fe548f32
- Merge branch 'tests/mock-sha512-crypt' into 'develop' · 6e99e7c7
  kaniini authored 5 years ago
  
  [tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest Closes #1114 See merge request pleroma/pleroma!1455
  6e99e7c7
- [tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest · 43a7cd27
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  43a7cd27
- [#1112] Preserving `id` on user insert conflict on order not to violate... · d0198fe2
  Ivan Tashkinov authored 5 years ago
  
  [#1112] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
  d0198fe2
Jul 19, 2019
- Merge branch 'feature/matstodon-statuses-by-name' into 'develop' · 93df0796
  feld authored 5 years ago
  
  Feature/matstodon statuses by name See merge request pleroma/pleroma!1211
  93df0796
- Merge branch 'develop' into feature/matstodon-statuses-by-name · 9169f331
  feld authored 5 years ago
  
  9169f331
- Merge branch 'feature/richmedia-ttl' into 'develop' · 33729bbb
  kaniini authored 5 years ago
  
  add the rich media ttl based on image exp time See merge request pleroma/pleroma!1438
  33729bbb
- Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop' · c1c64d6d
  kaniini authored 5 years ago
  
  mix: add pleroma.user unsubscribe_all_from_instance See merge request pleroma/pleroma!1454
  c1c64d6d
- mix: add pleroma.user unsubscribe_all_from_instance · 9a8eb2c9
  kaniini authored 5 years ago
  
  9a8eb2c9
- Merge branch 'refactor/http-signature-plug' into 'develop' · 716afc83
  kaniini authored 5 years ago
  
  http signature plug: separation of concerns See merge request pleroma/pleroma!1449
  716afc83
- Merge branch 'issue/1110' into 'develop' · 65617097
  kaniini authored 5 years ago
  
  #1110 fixed /api/pleroma/healthcheck Closes #1110 See merge request pleroma/pleroma!1453
  65617097
- #1110 fixed /api/pleroma/healthcheck · c2e2aadc
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  c2e2aadc
- Merge branch 'patch-2' into 'develop' · 505613f6
  rinpatch authored 5 years ago
  
  Update clients.md for Fedilab See merge request pleroma/pleroma!1452
  505613f6
- Fix domain for the contact clients.md · 5c4a555b
  tom79 authored 5 years ago
  
  5c4a555b
- Update clients.md for Fedilab · b0b9eca3
  tom79 authored 5 years ago
  
  - Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
  b0b9eca3
- update the docs · 581756cc
  Sachin Joshi authored 5 years ago
  
  581756cc
- change the structure of image ttl parsar · de9906ad
  Sachin Joshi authored 5 years ago
  
  de9906ad
Jul 18, 2019
- mapped signature plug: use `user` assign like authentication plug · c947cfec
  kaniini authored 5 years ago
  
  c947cfec
- Merge branch 'tests/authentication_plug' into 'develop' · 16cfee70
  kaniini authored 5 years ago
  
  tests for Plugs.AuthenticationPlug See merge request pleroma/pleroma!1450
  16cfee70
- tests for Plugs.AuthenticationPlug · f435217e
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  f435217e
- tests: add tests for mapped signature plug · 621cacf6
  kaniini authored 5 years ago
  
  621cacf6