Commits · a65c18859307f4aacf42eb5dd14e63ad76747a6d · Pleroma / pleroma

27 Jan, 2019 1 commit
- Web.MastodonAPI.AccountView: Add is_moderator and is_admin · a65c1885
  Haelwenn authored Jan 27, 2019
```
Closes: #557
```
  a65c1885
26 Jan, 2019 21 commits
- Merge branch 'hardening/mastodon-rich-media' into 'develop' · 71757933
  Haelwenn authored Jan 26, 2019
```
rich media: minor hardening

See merge request pleroma/pleroma!717
```
  71757933
- Merge branch 'webpush-endpoint-size' into 'develop' · c410fe96
  kaniini authored Jan 26, 2019
```
Change webpush endpoint to unlimited varchar

Closes #552

See merge request pleroma/pleroma!716
```
  c410fe96
- rich media: gracefully handle fetching nil URIs · 8f2f471e
  kaniini authored Jan 26, 2019
  
  8f2f471e
- Change webpush endpoint to unlimited varchar · 4a13bb75
  href authored Jan 26, 2019
```
Fixes #552
```
  4a13bb75
- Merge branch 'flake-from-int' into 'develop' · 155a8843
  kaniini authored Jan 26, 2019
```
Flake: support integers in from_string/1

See merge request pleroma/pleroma!715
```
  155a8843
- Flake: support integers in from_string/1 · d6015338
  href authored Jan 26, 2019
```
Some previously issued stateless tokens have integer ids in them.
```
  d6015338
- Merge branch 'join-in-preloads' into 'develop' · 3e66723f
  kaniini authored Jan 26, 2019
```
Join on preloads to avoid N+1 queries

See merge request pleroma/pleroma!714
```
  3e66723f
- Merge branch 'features/mastoapi-cards' into 'develop' · e91f867c
  kaniini authored Jan 26, 2019
```
MastoAPI: Add Rich-Media support

See merge request pleroma/pleroma!664
```
  e91f867c
- mastodon api: use OGP uri instead of page_url for deducing domain name, fix test · 1f7843b9
  kaniini authored Jan 26, 2019
  
  1f7843b9
- mastodon api: use HTML.extract_first_external_url() · 86037e9c
  kaniini authored Jan 26, 2019
  
  86037e9c
- Join on preloads to avoid N+1 queries · 8018ae7a
  href authored Jan 26, 2019
  
  8018ae7a
- html: add utility function to extract first URL from an object and cache the result · be9abb2c
  kaniini authored Jan 26, 2019
  
  be9abb2c
- mastodon api: provider_name setting is required too on the card · 78047d57
  kaniini authored Jan 26, 2019
  
  78047d57
- Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x · 39863236
  Haelwenn authored Jan 21, 2019 and kaniini committed Jan 26, 2019
```
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
```
  39863236
- Web.MastodonAPI.MastodonAPIController: Add Rich-Media support · 3f64379b
  Haelwenn authored Jan 14, 2019 and kaniini committed Jan 26, 2019
  
  3f64379b
- Move definitions of RichMedia fixtures to test/support/http_request_mock.ex · d9f3af47
  Haelwenn authored Jan 14, 2019 and kaniini committed Jan 26, 2019
  
  d9f3af47
- Merge branch 'documentation/mastalab' into 'develop' · c00fba4f
  kaniini authored Jan 26, 2019
```
README: Mastalab officially supports Pleroma.

See merge request pleroma/pleroma!713
```
  c00fba4f
- README: Mastalab officially supports Pleroma. · 18b80be5
  kaniini authored Jan 26, 2019
  
  18b80be5
- Merge branch 'bugfix/content_nil_lenght_check' into 'develop' · b050d27c
  kaniini authored Jan 26, 2019
```
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil

See merge request pleroma/pleroma!711
```
  b050d27c
- Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null · 499a4591
  Haelwenn authored Jan 26, 2019
  
  499a4591
- Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil · 15aa45ae
  Haelwenn authored Jan 26, 2019
  
  15aa45ae
25 Jan, 2019 10 commits
- Merge branch 'oembed_provider' into 'develop' · 6383fa3a
  kaniini authored Jan 25, 2019
```
Opengraph/TwitterCard::summary for statuses and user profiles

See merge request pleroma/pleroma!533
```
  6383fa3a
- Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop' · b9cd5117
  lain authored Jan 25, 2019
```
update pleroma frontend (summary_html hotfix)

See merge request pleroma/pleroma!710
```
  b9cd5117
- update pleroma frontend (summary_html hotfix) · 57c3f821
  kaniini authored Jan 25, 2019
  
  57c3f821
- Fix OGP provider tests · a45a9034
  rinpatch authored Jan 25, 2019
  
  a45a9034
- Merge remote-tracking branch 'pl/develop' into oembed_provider · 3a5b3c5a
  rinpatch authored Jan 25, 2019
  
  3a5b3c5a
- Merge branch 'fix/tusky-dm' into 'develop' · 4c99b6d3
  kaniini authored Jan 25, 2019
```
Add actor to recipients list

Closes #390

See merge request !683
```
  4c99b6d3
- Merge branch 'develop' into 'oembed_provider' · c9b418e5
  kaniini authored Jan 25, 2019
```
# Conflicts:
#   lib/pleroma/activity.ex
```
  c9b418e5
- Merge branch 'classic-flakeids' into 'develop' · 4df71cd8
  kaniini authored Jan 25, 2019
```
Flake Ids for Users and Activities

Closes #450

See merge request !645
```
  4df71cd8
- Merge branch 'update/pleroma-fe-20190125' into 'develop' · 9bf1a423
  kaniini authored Jan 25, 2019
```
update pleroma frontend

See merge request !709
```
  9bf1a423
- update pleroma frontend · 4b76f14d
  kaniini authored Jan 25, 2019
  
  4b76f14d
24 Jan, 2019 8 commits
- Use correct logic to determine "attentions" list · 9274cabe
  Maxim Filippov authored Jan 24, 2019
  
  9274cabe
- Fix clippy with one/five lines · a3ba72d9
  href authored Jan 24, 2019
  
  a3ba72d9
- Merge branch 'fix-activity_visibility-autovacuum' into 'develop' · 2ebabaeb
  kaniini authored Jan 24, 2019
```
Fix postgres activity_visibility when running in autovacuum

See merge request !708
```
  2ebabaeb
- Fix postgres activity_visibility when running in autovacuum · e02b19d1
  href authored Jan 24, 2019
  
  e02b19d1
- FlakeId: ignore null mac for workerid, use first mac · be43aa28
  href authored Jan 24, 2019
  
  be43aa28
- Merge branch 'feature/mrf-anti-followbot' into 'develop' · 0f80bc2d
  href authored Jan 24, 2019
```
mrf: add anti-followbot policy

See merge request !706
```
  0f80bc2d
- test: add anti-followbot policy tests · 13d72826
  kaniini authored Jan 24, 2019
  
  13d72826
- mrf: add anti-followbot policy · 54ec6d09
  kaniini authored Jan 24, 2019
  
  54ec6d09