Commits · 1620ec502c962557fa12fff2babd39eabe550493 · jeff / pleroma · GitLab

Snippets Groups Projects

Jun 06, 2018
- testsuite: update fixture URIs that were http · 1620ec50
  kaniini authored 6 years ago
  
  1620ec50
- webfinger: use https as default fallback instead of http · 1abf0f3b
  kaniini authored 6 years ago
  1abf0f3b
- XML: handle erlang errors too · aaa81d35
  kaniini authored 6 years ago
  
  aaa81d35
Jun 01, 2018
- Merge branch 'fix/user-timeline-reading-user' into 'develop' · dca1d6d1
  eal authored 6 years ago
  dca1d6d1
- MastoAPI user timelines: render statuses for the logged in user. · 8c609ee3
  eal authored 6 years ago
  
  8c609ee3
- Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop' · 98b8f087
  lain authored 6 years ago
  98b8f087
May 31, 2018
- TwitterAPI: fix "Follows you" being shown for the wrong user. · 935e544e
  eal authored 6 years ago
  
  935e544e
May 30, 2018
- Fix url guessing attacks. · 349400c0
  lain authored 6 years ago
  
  349400c0
- Merge branch 'fix/dm-timeline-activities' into 'develop' · 196d36a7
  eal authored 6 years ago
  196d36a7
- MastoAPI: fix dm_timeline getting non-create activities. · 7cb2e297
  eal authored 6 years ago
  
  7cb2e297
May 29, 2018
- Merge branch 'patch-3' into 'develop' · 8bd7ace4
  lain authored 6 years ago
  8bd7ace4
- Merge branch 'fix/link-headers' into 'develop' · 52b04137
  lain authored 6 years ago
  52b04137
- MastoAPI: Fix link headers with restrictive params. · 35cb8969
  eal authored 6 years ago
  
  35cb8969
May 28, 2018
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop · 461f201c
  lain authored 6 years ago
  
  461f201c
- Only return certain activities in TwitterAPI mentions. · 3ece4a3e
  lain authored 6 years ago
  
  3ece4a3e
- Update pleroma.nginx · a6fd9c4b
  Dominik V. Salonen authored 6 years ago
  a6fd9c4b
May 27, 2018
- Merge branch 'feature/mastodon-context-microformat' into 'develop' · 8216d5e4
  lain authored 6 years ago
  8216d5e4
- run mix format · d7eb2e1b
  kaniini authored 6 years ago
  
  d7eb2e1b
- tests: update for html changes · f569b67c
  kaniini authored 6 years ago
  
  f569b67c
- formatter: use class='mention' on links to user profiles · a8df7fc6
  kaniini authored 6 years ago
  a8df7fc6
May 26, 2018
- Fix user topic streaming. · a9e36e5a
  lain authored 6 years ago
  
  a9e36e5a
- Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into develop · 46cc6fab
  lain authored 6 years ago
  
  46cc6fab
- Simplify DM query. · 841ee8e3
  lain authored 6 years ago
  841ee8e3
- Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api · 4b3ec535
  lain authored 6 years ago
  
  4b3ec535
- There are no symbols in JSON. · 6138b297
  lain authored 6 years ago
  
  6138b297
- Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop · 745072b2
  lain authored 6 years ago
  
  745072b2
- Formatting. · 0a6c897c
  lain authored 6 years ago
  
  0a6c897c
- Make Mastodon follow hack more explicit. · bfce2986
  lain authored 6 years ago
  
  bfce2986
- Don't treat remote accepts/rejects as local. · 3839a11e
  lain authored 6 years ago
  3839a11e
- Rename id helper method. · dd9bb378
  lain authored 6 years ago
  
  dd9bb378
- tests: add tests to verify the accept request is discarded if no follow activity could be found · 1db0dc30
  kaniini authored 6 years ago
  
  1db0dc30
- activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists · 7e873756
  kaniini authored 6 years ago
  
  7e873756
- Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop' · e1fe46e1
  lain authored 6 years ago
  e1fe46e1
- activitypub: allow mastodon S2S block extension support to be disabled · 1c926c7b
  kaniini authored 6 years ago
  
  1c926c7b
May 25, 2018
- activitypub transmogrifier: cleanups and tests for incoming accepts/rejects · 7cf3cf77
  kaniini authored 6 years ago
  
  7cf3cf77
- activitypub transmogrifier: clean up accept/reject handling a bit · f35e6bf7
  kaniini authored 6 years ago
  
  f35e6bf7
- introduce User.maybe_direct_follow() and use it where we used to call User.follow() · e80d91c6
  kaniini authored 6 years ago
  
  e80d91c6
- twitter api: also remove explicit User.follow here · c89b9022
  kaniini authored 6 years ago
  
  c89b9022
- run mix format · 62c95e8d
  kaniini authored 6 years ago
  
  62c95e8d
- Merge branch 'feature/blocks-deny-refollow' into 'develop' · 5d6d86bf
  lain authored 6 years ago
  5d6d86bf