Commits · 1a0391c8a474c282823d3b2ab7a0cae62328c5b3 · jeff / pleroma

Jan 01, 2019
- Add documentation. · 1a0391c8
  lain authored 6 years ago
  
  1a0391c8
- Make Federator options configurable. · 400337b0
  lain authored 6 years ago
  
  400337b0
Dec 31, 2018
- Merge branch 'features/admin-api-user-views' into 'develop' · 90e157ef
  kaniini authored 6 years ago
  
  User/Account views: Add rights.admin Closes #472 See merge request pleroma/pleroma!589
  90e157ef
- Merge branch 'docs/admin-api' into 'develop' · 1b1e9286
  kaniini authored 6 years ago
  
  Add docs/Admin-API.md See merge request pleroma/pleroma!611
  1b1e9286
- Merge branch 'maintenance/copyright-2019' into 'develop' · ede3fd74
  kaniini authored 6 years ago
  
  update copyright years to 2019 See merge request pleroma/pleroma!613
  ede3fd74
- update copyright years to 2019 · 980b5288
  kaniini authored 6 years ago
  
  980b5288
- Add docs/Admin-API.md · 286632df
  Haelwenn authored 6 years ago
  
  [ci skip]
  286632df
- Merge branch 'fix/scrubber-cache' into 'develop' · 33e3a7ba
  lain authored 6 years ago
  
  [#481] Store scrubbed posts in Cachex Closes #481 See merge request pleroma/pleroma!610
  33e3a7ba
- Fix a typo in user_test.ex · 9f5881cb
  Rin Toshaka authored 6 years ago
  
  9f5881cb
- Eh? · 6ed9b31a
  Rin Toshaka authored 6 years ago
  
  6ed9b31a
- Move scrubber cache-related functions to Pleroma.HTML · 7e09c2bd
  Rin Toshaka authored 6 years ago
  
  7e09c2bd
Dec 30, 2018
- Merge branch 'mr/retry-queue' into 'develop' · 8e7da98b
  kaniini authored 6 years ago
  
  Improves RetryQueue behavior See merge request pleroma/pleroma!609
  8e7da98b
- Get default scrubbers from config instead of hardcoded · 05743e20
  rinpatch authored 6 years ago
  
  05743e20
- Fix test failure · 91d5a7e8
  rinpatch authored 6 years ago
  
  91d5a7e8
- Resolve merge conflict · dec23500
  Rin Toshaka authored 6 years ago
  
  dec23500
- Fix comment in object.ex · ab3089d6
  Rin Toshaka authored 6 years ago
  
  ab3089d6
- Merge branch 'activitypub-c2s' into 'develop' · dfde2622
  kaniini authored 6 years ago
  
  Activitypub c2s See merge request pleroma/pleroma!608
  dfde2622
- shame on me for not testing after revert · c50353e6
  Rin Toshaka authored 6 years ago
  
  c50353e6
- Fix formating. Aparently my pre-commit hook broke. · 3f9da55a
  Rin Toshaka authored 6 years ago
  
  3f9da55a
- Revert some changes in html.ex · 62af23bd
  Rin Toshaka authored 6 years ago
  
  62af23bd
- Friendship ended with Postgresql now Cachex is my best friend · c119ea3a
  Rin Toshaka authored 6 years ago
  
  c119ea3a
- Friendship ended with Postgresql now Cachex is my best friend · 535fddd2
  Rin Toshaka authored 6 years ago
  
  535fddd2
- Added get_stripped_html_for_object. Renamed a few things · d9f40b05
  Rin Toshaka authored 6 years ago
  
  d9f40b05
- Improves RetryQueue behavior · cb286fde
  Michael Loftis authored 6 years ago
  
  reduces to one single timer firing once a second switches to a parallel worker model
  cb286fde
- Tidy up the code. Rename key to signature · bce152ab
  Rin Toshaka authored 6 years ago
  
  bce152ab
- Fix some stupid typos · 66d1c314
  Rin Toshaka authored 6 years ago
  
  66d1c314
- Respond with full activity to outbox post · f40562b4
  sxsdv1 authored 6 years ago
  
  f40562b4
- Limit activity types accepted to outbox to only 'Create' · 1e781715
  sxsdv1 authored 6 years ago
  
  1e781715
- Create activity when client posts to outbox · 569bad82
  sxsdv1 authored 6 years ago
  
  569bad82
- Implement ActivityPub inbox view · 26dc2ddd
  sxsdv1 authored 6 years ago
  
  More or less verbatim copied from the outbox template with only changes to the activities fetched and url reported
  26dc2ddd
- Use Object.change instead of Ecto.Changeset.change · a32e2390
  Rin Toshaka authored 6 years ago
  
  a32e2390
Dec 29, 2018
- Wire up stub routes for client calls of activitypub inbox/outbox · aa082ca7
  sxsdv1 authored 6 years ago
  
  Code style: remove wrapping function of outbox
  aa082ca7
- use Kernel.put_in instead of Map.merge · 9a0163db
  Rin Toshaka authored 6 years ago
  
  9a0163db
- Merge branch 'fix_485' into 'develop' · f5d7b000
  Haelwenn authored 6 years ago
  
  Change 'name' to 'instance_name' so option is used when running non-interactive See merge request pleroma/pleroma!607
  f5d7b000
- I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD · 19f9889f
  Rin Toshaka authored 6 years ago
  
  19f9889f
- Merge branch '2018-12-29-update-frontend' into 'develop' · e8ba390f
  lain authored 6 years ago
  
  update frontend See merge request pleroma/pleroma!606
  e8ba390f
- update frontend · e1227d81
  lain authored 6 years ago
  
  e1227d81
- Merge branch 'carrot-bullying' into 'develop' · 3dc5f049
  kaniini authored 6 years ago
  
  Add some hard limits on inserted activities. See merge request pleroma/pleroma!595
  3dc5f049
- Change 'name' to 'instance_name' so option is used when running non-interactive · ab9cda31
  spctrl authored 6 years ago
  
  ab9cda31
- Merge branch '483_blocks_import_export' into 'develop' · dd8f2196
  kaniini authored 6 years ago
  
  [#483] Blocked users list import & export Closes #483 See merge request pleroma/pleroma!603
  dd8f2196