Commits · ff3b09f6b307fc9f0d10b941f204824f496df2ae · Pleroma / pleroma

26 Mar, 2019 16 commits
- Merge branch 'fix/ap-icon' into 'develop' · ff3b09f6
  lain authored Mar 26, 2019
```
Do not federate instance avatar

Closes #759

See merge request !977
```
  ff3b09f6
- Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop' · c6ab5ebe
  lain authored Mar 26, 2019
```
Mastodon 2.7.2 instance attributes (registrations, languages)

See merge request !979
```
  c6ab5ebe
- AP UserView: Refactor banner / avatar display code, add test. · 10a7a4a8
  lain authored Mar 26, 2019
  
  10a7a4a8
- Test for MastoAPI /api/v1/instance response structure (formatting fix). · 47b49ab1
  Ivan Tashkinov authored Mar 26, 2019
  
  47b49ab1
- Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop' · 9e3899bf
  lain authored Mar 26, 2019
```
Mastodon-based auth error messages. User#auth_active?/1 refactoring.

See merge request !978
```
  9e3899bf
- Test for MastoAPI /api/v1/instance response structure. · caf0e9cf
  Ivan Tashkinov authored Mar 26, 2019
  
  caf0e9cf
- Merge branch 'replies-count' into 'develop' · 21ff78cd
  lain authored Mar 26, 2019
```
Increment replies_count (MastoAPI)

Closes #756

See merge request !974
```
  21ff78cd
- Merge branch 'refactor/remove-activity-representer' into 'develop' · 3f44433e
  lain authored Mar 26, 2019
```
Remove ActivityRepresenter

See merge request !980
```
  3f44433e
- Credo is upset about me not remembering the alphabet · aacdcac1
  rinpatch authored Mar 26, 2019
  
  aacdcac1
- Fix formatting · 087662d4
  rinpatch authored Mar 26, 2019
  
  087662d4
- Remove ActivityRepresenter · 406d1933
  rinpatch authored Mar 26, 2019
  
  406d1933
- Mastodon 2.7.2 instance attributes (registrations, languages). · eef1042b
  Ivan Tashkinov authored Mar 26, 2019
  
  eef1042b
- Increment replies_count on replies (MastoAPI) · 568e3485
  Eugenij authored Mar 25, 2019
  
  568e3485
- Comments split. · b0759f82
  Ivan Tashkinov authored Mar 26, 2019
  
  b0759f82
- Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`. · 263ca3de
  Ivan Tashkinov authored Mar 26, 2019
  
  263ca3de
- Try sending an empty map · c4102961
  feld authored Mar 25, 2019
  
  c4102961
25 Mar, 2019 7 commits
- Attempt to fix incorrect federation of default instance avatars · 6f090f98
  feld authored Mar 25, 2019
  
  6f090f98
- Merge branch 'fix/notification-id-index' into 'develop' · 15aa94f4
  rinpatch authored Mar 25, 2019
```
Add an `id desc nulls last` index to notifications

See merge request pleroma/pleroma!975
```
  15aa94f4
- Add an id index to notifications · 9725c93c
  rinpatch authored Mar 25, 2019
  
  9725c93c
- Merge branch 'bugfix/missing-announces' into 'develop' · b028b0f9
  rinpatch authored Mar 25, 2019
```
fix up missing announcements with preloads

See merge request !972
```
  b028b0f9
- fix up missing announcements with preloads · 26b0c802
  kaniini authored Mar 25, 2019
  
  26b0c802
- Merge branch 'features/s3-uploader-digital-ocean' into 'develop' · bc14c98d
  kaniini authored Mar 25, 2019
```
add overriding truncated_namespace condition for truncating paths for digital ocean

See merge request !969
```
  bc14c98d
- Merge branch 'fix/mastoapi-liked' into 'develop' · 63ffa484
  kaniini authored Mar 25, 2019
```
Serve non-public activities in /api/v1/favourites

Closes #648

See merge request !970
```
  63ffa484
24 Mar, 2019 6 commits
- Serve non-public activities in /api/v1/favourites · a7f58b3c
  rinpatch authored Mar 25, 2019
```
Fixes #648
```
  a7f58b3c
- add overriding truncated_namespace condition for truncating paths for digital ocean · 6c96d68f
  Austin authored Mar 24, 2019
  
  6c96d68f
- Merge branch 'features/mrf-keyword-nil-summary' into 'develop' · 750de7d8
  rinpatch authored Mar 24, 2019
```
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil

See merge request !968
```
  750de7d8
- mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil · eab9425c
  Haelwenn authored Mar 24, 2019
  
  eab9425c
- Merge branch 'fix/eldap-warnings' into 'develop' · a32bcab0
  rinpatch authored Mar 24, 2019
```
Ignore compilation warnings for undefined module :eldap

See merge request !956
```
  a32bcab0
- Merge branch 'feature/object-normalize-preload' into 'develop' · 9b6b2395
  kaniini authored Mar 24, 2019
```
preloaded object normalization

See merge request !967
```
  9b6b2395
23 Mar, 2019 11 commits
- tests: fix up activity collision test · 4a3dd86a
  kaniini authored Mar 23, 2019
  
  4a3dd86a
- activity: use left join instead of inner join when fetching activities that... · 4aa69927
  kaniini authored Mar 23, 2019
```
activity: use left join instead of inner join when fetching activities that may or may not have a child object
```
  4aa69927
- user: use preloads when deleting accounts · 332dc137
  kaniini authored Mar 23, 2019
  
  332dc137
- ostatus: use preload objects with Object.normalize() when opportunistic · debf7f01
  kaniini authored Mar 23, 2019
  
  debf7f01
- object: downgrade normalize warning to debug severity · 3c2350cb
  kaniini authored Mar 23, 2019
  
  3c2350cb
- activitypub: object view: use preloaded object when possible · 8c701561
  kaniini authored Mar 23, 2019
  
  8c701561
- activity: add get_by_ap_id_with_object() · f9d5c13b
  kaniini authored Mar 23, 2019
  
  f9d5c13b
- activitypub: when fetching objects, use the preloaded object from the synthesized activity · ce47eb8b
  kaniini authored Mar 23, 2019
  
  ce47eb8b
- notification: formatting · aabcecb2
  kaniini authored Mar 23, 2019
  
  aabcecb2
- streamer: use the preloaded object if possible · 07cdd9ed
  kaniini authored Mar 23, 2019
  
  07cdd9ed
- rich media: helpers: only crawl Create activities · c62220c5
  kaniini authored Mar 23, 2019
  
  c62220c5