Commits · 4263edc9c9bbff17c7beb5495d6e7b4b4f8683ef · Pleroma / pleroma

05 Mar, 2019 1 commit
- Properly escape reserved URI charachters in upload urls · 4263edc9
  rinpatch authored Mar 05, 2019
  
  4263edc9
04 Mar, 2019 3 commits
- Merge branch 'unify-follow' into 'develop' · 10248d86
  kaniini authored Mar 04, 2019
```
Unify follow code with CommonAPI

Closes #690

See merge request !889
```
  10248d86
- Merge branch 'dm-visibility-for-blocking-users' into 'develop' · c63a45cd
  kaniini authored Mar 04, 2019
```
Fix DM visibility for blocking users #698

Closes #698

See merge request pleroma/pleroma!890
```
  c63a45cd
- Fix DM visibility for blocking users · 86e4b48a
  Eugenij authored Mar 04, 2019
  
  86e4b48a
03 Mar, 2019 16 commits
- Unify Mastodon and Twitter follow implementations using CommonAPI · 59469460
  Eugenij authored Mar 04, 2019
  
  59469460
- Merge branch 'muting' into 'develop' · dd586553
  kaniini authored Mar 03, 2019
```
Don't stream muted accounts

See merge request !888
```
  dd586553
- Don't stream muted accounts · 818a7894
  uiri authored Jan 20, 2019
  
  818a7894
- Merge branch 'remove-todo-txt' into 'develop' · 8543e7f7
  rinpatch authored Mar 03, 2019
```
Remove TODO.txt

See merge request !887
```
  8543e7f7
- Remove TODO.txt · 9962121b
  rinpatch authored Mar 03, 2019
  
  9962121b
- Merge branch 'features/bio_rel_me' into 'develop' · ace42316
  kaniini authored Mar 03, 2019
```
Add rel=me to the User bio

Closes #423

See merge request !813
```
  ace42316
- Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop' · 6c6a2dbf
  kaniini authored Mar 03, 2019
```
Add pagination and search to users

See merge request !873
```
  6c6a2dbf
- Merge branch 'get-follow-requests-sql' into 'develop' · b531e366
  kaniini authored Mar 03, 2019
```
Use sql query in User.get_follow_requests/1 for filtering logic

See merge request !883
```
  b531e366
- Merge branch 'atomic-note-count-updates' into 'develop' · 413cf00c
  kaniini authored Mar 03, 2019
```
Atomic update for note count and follower count

See merge request !885
```
  413cf00c
- Merge branch 'count-only-public-statuses' into 'develop' · c93479c6
  kaniini authored Mar 03, 2019
```
Increment user note count only on public activities #703

See merge request !884
```
  c93479c6
- Merge branch 'remove-follow-request-count' into 'develop' · dfdbb6f1
  kaniini authored Mar 03, 2019
```
Remove follow_request_count as it's not needed for FE anymore.

See merge request !886
```
  dfdbb6f1
- Remove follow_request_count as it's not needed for FE anymore. · d5418e9f
  Eugenij authored Mar 03, 2019
```
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
```
  d5418e9f
- Use atomic update for note count and follower count · af0039a3
  Eugenij authored Mar 03, 2019
  
  af0039a3
- Added migration to update existing user note counters · 8a1e0c9b
  Eugenij authored Mar 03, 2019
  
  8a1e0c9b
- Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop' · 9b63fda9
  lain authored Mar 03, 2019
```
[#675] Do not show DMs in mentions timeline

See merge request !877
```
  9b63fda9
- Increment user note count only on public activities · c46950d3
  Eugenij authored Mar 03, 2019
  
  c46950d3
02 Mar, 2019 15 commits
- Use sql query in User.get_follow_requests/1 for filtering logic · 1a1f4520
  Eugenij authored Mar 02, 2019
  
  1a1f4520
- Add docs · 08c6aeee
  Maxim Filippov authored Mar 02, 2019
  
  08c6aeee
- We do not guarantee the order of elements when we search · bf30df99
  Maxim Filippov authored Mar 02, 2019
  
  bf30df99
- Add pagination to search · 2ec8cf56
  Maxim Filippov authored Mar 02, 2019
  
  2ec8cf56
- Merge branch 'bugfix/oauth-scopes-join' into 'develop' · f38c316e
  rinpatch authored Mar 02, 2019
```
Bugfix: OAuth scopes formatting

Closes #702

See merge request !881
```
  f38c316e
- Pleroma.User: mix format · f2452d57
  Haelwenn authored Mar 02, 2019
  
  f2452d57
- Pleroma.UserTest: Add tests for rel=me · 7b9868f3
  Haelwenn authored Mar 02, 2019
  
  7b9868f3
- RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil · 8e6f7fdb
  Haelwenn authored Mar 02, 2019
  
  8e6f7fdb
- Pleroma.User: Fix syntax and user.ap_id call · 39a5bea9
  Haelwenn authored Mar 02, 2019
  
  39a5bea9
- Pleroma.User: Pass an array to profile_urls · 3d226423
  Haelwenn authored Mar 02, 2019
  
  3d226423
- Pleroma.Web.RelMe: fixups · 9b83236f
  Haelwenn authored Mar 02, 2019
  
  9b83236f
- Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe · 25e58849
  Haelwenn authored Mar 02, 2019
  
  25e58849
- Pleroma.User: Add rel=me to URLs where it linkbacks to the profile · 56d4e390
  Haelwenn authored Feb 11, 2019
  
  56d4e390
- Web.OAuth.OAuthControllerTest: Add test against token formatting · bb9e4096
  Haelwenn authored Mar 02, 2019
  
  bb9e4096
- Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response · b6a001a3
  Haelwenn authored Mar 02, 2019
  
  b6a001a3
01 Mar, 2019 5 commits
- Refactor a little bit · f635b675
  Maxim Filippov authored Mar 01, 2019
  
  f635b675
- Format · a25c1313
  Maxim Filippov authored Mar 01, 2019
  
  a25c1313
- Fix user_test · aaa9fed1
  Maxim Filippov authored Mar 01, 2019
  
  aaa9fed1
- Format · f384a9a2
  Maxim Filippov authored Mar 01, 2019
  
  f384a9a2
- Show current user in users list as well · f1a4c316
  Maxim Filippov authored Mar 01, 2019
  
  f1a4c316