Commits · cd90695a349f33b84f287794bae6070e9eec446a · Pleroma / pleroma

28 Mar, 2019 2 commits
- Add PUT /api/pleroma/notification_settings endpoint · cd90695a
  Eugenij authored Mar 28, 2019
  
  cd90695a
- Notification controls · 55d086b5
  Eugenij authored Mar 27, 2019
```
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
```
  55d086b5
27 Mar, 2019 6 commits
- Merge branch 'feature/more-user-filters' into 'develop' · 926bf114
  lain authored Mar 27, 2019
```
Add more user filters + move search to its own module

See merge request pleroma/pleroma!982
```
  926bf114
- Merge branch 'fix-reblog-tests' into 'develop' · a5f141d9
  lain authored Mar 27, 2019
```
Fix muting reblogs tests

See merge request pleroma/pleroma!984
```
  a5f141d9
- Fix muting reblogs tests · 776bb513
  rinpatch authored Mar 27, 2019
  
  776bb513
- Merge branch 'hotfix/missing-announce-mastoapi' into 'develop' · 6da1999f
  rinpatch authored Mar 27, 2019
```
Fix missing announces in MastoAPI home timeline

Closes #762

See merge request pleroma/pleroma!983
```
  6da1999f
- Fix missing announces in MastoAPI home timeline · ce6d64bb
  rinpatch authored Mar 27, 2019
```
Closes #762
```
  ce6d64bb
- Merge branch 'apps-verify-credentials' into 'develop' · b2e163ec
  lain authored Mar 27, 2019
```
MastodonAPI: Add GET /api/v1/apps/verify_credentials

See merge request pleroma/pleroma!981
```
  b2e163ec
26 Mar, 2019 19 commits
- Add more user filters + move search to its own module · 3cf7539b
  Maxim Filippov authored Mar 27, 2019
  
  3cf7539b
- Add vapid_key to the `POST /api/v1/apps` response · a4ab60ac
  Eugenij authored Mar 26, 2019
  
  a4ab60ac
- Add GET /api/v1/apps/verify_credentials · 691d1208
  Eugenij authored Mar 26, 2019
  
  691d1208
- Merge branch 'fix/ap-icon' into 'develop' · ff3b09f6
  lain authored Mar 26, 2019
```
Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!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 pleroma/pleroma!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 pleroma/pleroma!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 pleroma/pleroma!974
```
  21ff78cd
- Merge branch 'refactor/remove-activity-representer' into 'develop' · 3f44433e
  lain authored Mar 26, 2019
```
Remove ActivityRepresenter

See merge request pleroma/pleroma!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