Commits · 29807ef6a5b43a528ffca08b4f721b251f331c8d · Alex Gleason / pleroma

Aug 08, 2019
- Merge branch 'feature/digest-email' into 'develop' · 29807ef6
  lain authored 5 years ago
  
  Feature/digest email See merge request pleroma/pleroma!1078
  29807ef6
Aug 07, 2019
- Merge branch 'patch-3' into 'develop' · b18234e0
  rinpatch authored 5 years ago
  
  Return profile URL when available instead of actor URI for MastodonAPI mention URL Closes #1165 See merge request pleroma/pleroma!1541
  b18234e0
- Return profile URL in MastodonAPI's `url` field · 9c0da100
  Claire authored 5 years ago
  
  9c0da100
- Simplify logic to mention.js `url` field · 089d53a9
  Claire authored 5 years ago
  
  `User.profile_url` already fallbacks to ap_id
  089d53a9
- Return profile URL when available instead of actor URI for MastodonAPI mention URL · a10c840a
  Claire authored 5 years ago
  
  Fixes #1165
  a10c840a
Aug 06, 2019
- Merge branch 'fix/object-reembeds' into 'develop' · aa718ab8
  Haelwenn authored 5 years ago
  
  Do not rembed the object after updating it Closes #1142 See merge request pleroma/pleroma!1538
  aa718ab8
- Do not rembed the object after updating it · 4f1b9c54
  rinpatch authored 5 years ago
  
  4f1b9c54
- OStatus tests: stop relying on embedded objects · 5329e84d
  rinpatch authored 5 years ago
  
  5329e84d
- ActivityPub tests: remove assertions of embedded object being updated, · 32018a4e
  rinpatch authored 5 years ago
  
  because the objects are no longer supposed to be embedded
  32018a4e
- OStatus Announce Representer: Do not depend on the object being embedded · 03ad3132
  rinpatch authored 5 years ago
  
  in the Create activity
  03ad3132
- Stop depending on the embedded object in restrict_favorited_by · 73d8d5c4
  rinpatch authored 5 years ago
  
  73d8d5c4
- Merge branch 'issue/1150' into 'develop' · dea3bd02
  kaniini authored 5 years ago
  
  [#1150] fixed parser TwitterCard See merge request pleroma/pleroma!1537
  dea3bd02
- [#1150 ] fixed parser TwitterCard · 139b196b
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  139b196b
Aug 05, 2019
- Merge branch 'test/common_api_utils.ex' into 'develop' · 486b4743
  kaniini authored 5 years ago
  
  tests for CommonApi/Utils See merge request pleroma/pleroma!1534
  486b4743
- tests for CommonApi/Utils · bdc9a722
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  bdc9a722
Aug 04, 2019
- Merge branch 'report-email-from-remote-user' into 'develop' · fd60fd47
  kaniini authored 5 years ago
  
  Remove Reply-To from report emails Closes #1141 See merge request pleroma/pleroma!1531
  fd60fd47
- Remove Reply-To from report emails · 96028cd5
  Eugenij authored 5 years ago and kaniini committed 5 years ago
  
  96028cd5
- Merge branch 'feature/relay-list-task' into 'develop' · f7fc902c
  kaniini authored 5 years ago
  
  tasks: relay: add list task Closes #1101 See merge request pleroma/pleroma!1528
  f7fc902c
- Merge branch 'fix/wrong-next-key-likes-json' into 'develop' · bedabf7d
  kaniini authored 5 years ago
  
  Do not add the "next" key to likes.json if there is no more items See merge request pleroma/pleroma!1530
  bedabf7d
- Do not add the "next" key to likes.json if there is no more items · e8ad116c
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  e8ad116c
- Merge branch 'patch-2' into 'develop' · 9e7c633b
  kaniini authored 5 years ago
  
  Replace "impode" with "implode" See merge request pleroma/pleroma!1532
  9e7c633b
- Replace "impode" with "implode" for · 3411f506
  x0rz3q authored 5 years ago
  
  3411f506
- Merge branch 'remove-longfox-emoji-set' into 'develop' · cee0d355
  kaniini authored 5 years ago
  
  Remove longfox emoji set See merge request pleroma/pleroma!1525
  cee0d355
- Remove longfox emoji set · 39c7bbe1
  Hakaba Hitoyo authored 5 years ago and kaniini committed 5 years ago
  
  39c7bbe1
- Merge branch 'develop' into 'develop' · b9497ead
  kaniini authored 5 years ago
  
  Fix a stale link and a few typos See merge request pleroma/pleroma!1529
  b9497ead
- Fix some typos and rework a few lines in howto_mediaproxy.md · 9b9453ce
  Pierce authored 5 years ago
  
  9b9453ce
- Update link in README.md · c10a3e03
  Pierce authored 5 years ago
  
  c10a3e03
Aug 03, 2019
- tasks: relay: add list task · cef3af55
  kaniini authored 5 years ago
  
  cef3af55
- Merge branch 'bugfix/password-reset-link-styling' into 'develop' · b1fb5b93
  kaniini authored 5 years ago
  
  templates/layout/app.html.eex: Style anchors See merge request pleroma/pleroma!1527
  b1fb5b93
- templates/layout/app.html.eex: Style anchors · a035ab8c
  Haelwenn authored 5 years ago
  
  [ci skip]
  Verified
  
  a035ab8c
- Merge branch 'patch-2' into 'develop' · 86fffe9c
  kaniini authored 5 years ago
  
  Add preferredUsername to service actors so Mastodon can resolve them See merge request pleroma/pleroma!1526
  86fffe9c
- Refactor · 1fce56c7
  Claire authored 5 years ago
  
  1fce56c7
- Only add `preferredUsername` to service actor json when the underlying user actually has a username · 16cfb892
  Claire authored 5 years ago
  
  16cfb892
- Merge branch 'admin-fixes' into 'develop' · 4ae0a665
  kaniini authored 5 years ago
  
  Admin fixes See merge request pleroma/pleroma!1524
  4ae0a665
- Admin fixes · de0f3b73
  Alexander Strizhakov authored 5 years ago and kaniini committed 5 years ago
  
  de0f3b73
- Merge branch 'fix/search-space-error' into 'develop' · 99ce6d60
  kaniini authored 5 years ago
  
  Remove spaces from the domain search Closes #1154 See merge request pleroma/pleroma!1521
  99ce6d60
- Remove spaces from the domain search · 040347b2
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  040347b2
- Merge branch 'fix/with-reject-nil-clause' into 'develop' · 7319b41e
  kaniini authored 5 years ago
  
  Handle MRF rejections of incoming AP activities Closes #1095 See merge request pleroma/pleroma!1520
  7319b41e
- Handle MRF rejections of incoming AP activities · 8b2fa31f
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  8b2fa31f
- Merge branch 'official-docker-support' into 'develop' · ba72d02f
  kaniini authored 5 years ago
  
  Add Dockerfile See merge request pleroma/pleroma!1523
  ba72d02f