Commits · f7a3dcd3200bd6072d61ca51e91d5a2a75a9ffe7 · Pleroma / pleroma

03 Nov, 2020 4 commits
- Merge branch 'patch-4' into 'develop' · f7a3dcd3
  lain authored Nov 03, 2020
```
ConversationView: add current user to conversations, according to Mastodon behaviour, fix last_status.account being not filled

Closes #2217

See merge request !3089
```
  f7a3dcd3
- Conversations: A few refactors · c37118e6
  lain authored Nov 03, 2020
  
  c37118e6
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4 · 91f6c324
  lain authored Nov 03, 2020
  
  91f6c324
- Merge branch 'fix/get_report_with_notes' into 'develop' · 0d8cc090
  Haelwenn authored Nov 03, 2020
```
Permit fetching individual reports with notes preloaded

See merge request !3118
```
  0d8cc090
02 Nov, 2020 6 commits
- Merge branch 'chore/deps-from-git' into 'develop' · 0fd2830f
  feld authored Nov 02, 2020
```
Ensure URLs for git repos end in .git for older git clients like on CentOS 7

See merge request !3119
```
  0fd2830f
- Ensure URLs for git repos end in .git for older git clients like on CentOS 7 · 2f2281fd
  feld authored Nov 02, 2020
  
  2f2281fd
- Test the note is returned when fetching a single report · 53dd0485
  feld authored Nov 02, 2020
  
  53dd0485
- Permit fetching individual reports with notes preloaded · 7efc074e
  feld authored Nov 02, 2020
  
  7efc074e
- Merge branch 'bugfix/poll_replies_count' into 'develop' · 24ce3249
  lain authored Nov 02, 2020
```
side_effects: Don’t increase_replies_count when it’s an Answer

Closes #2274

See merge request !3114
```
  24ce3249
- side_effects: Don’t increase_replies_count when it’s an Answer · 4caad4e9
  Haelwenn authored Nov 02, 2020
  
  4caad4e9
01 Nov, 2020 2 commits

Merge branch 'tesla-get-to-pleroma' into 'develop' · 9fbe9ef7
feld authored Nov 01, 2020
```
Use Pleroma.HTTP instead of Tesla

Closes #2275

See merge request !3113
```
9fbe9ef7

Use Pleroma.HTTP instead of Tesla · 8f00d90f

vaartis authored Nov 01, 2020

Closes #2275

As discovered in the issue, captcha used Tesla.get instead of
Pleroma.HTTP. I've also grep'ed the repo and changed the other place
where this was used.

8f00d90f

31 Oct, 2020 3 commits
- Merge branch 'feature/account-export' into 'develop' · 38b481d1
  feld authored Oct 31, 2020
```
Add account export

Closes #847

See merge request !2918
```
  38b481d1
- Merge branch 'idempotency-key-optimistic-posting' into 'develop' · 37e8e8bf
  feld authored Oct 31, 2020
```
Add `idempotency_key` to the chat message entity

Closes #2126

See merge request !3015
```
  37e8e8bf
- Add idempotency_key to the chat_message entity. · 8e41baff
  Eugenij authored Oct 31, 2020
  
  8e41baff
30 Oct, 2020 14 commits
- Fix credo warning · d1698267
  minibikini authored Oct 31, 2020
  
  d1698267
- Merge remote-tracking branch 'origin/develop' into feature/account-export · a2a7a1f2
  minibikini authored Oct 31, 2020
  
  a2a7a1f2
- Merge branch 'remove-unused-aliases' into 'develop' · 4fbdd1c8
  feld authored Oct 30, 2020
```
Remove unused aliases

See merge request !3111
```
  4fbdd1c8
- Merge remote-tracking branch 'origin/develop' into feature/account-export · d2113428
  minibikini authored Oct 30, 2020
  
  d2113428
- Remove unused aliases · 1a98476f
  minibikini authored Oct 30, 2020
  
  1a98476f
- ConversationViewTest: fix test · 1042c30f
  a1batross authored Oct 30, 2020
  
  1042c30f
- ConversationView: fix formatting · d63ec02f
  a1batross authored Oct 30, 2020
  
  d63ec02f
- ConversationControllerTest: fix test, fix formatting · 0552a08d
  a1batross authored Oct 30, 2020
  
  0552a08d
- Add entry in changelog · 5591dc02
  a1batross authored Oct 30, 2020
  
  5591dc02
- ConversationView: fix last_status.account being empty, fix current user being... · 9b93eef7
  a1batross authored Oct 30, 2020
```
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
```
  9b93eef7
- ConversationViewTest: fix test #2 · 630eb0f9
  a1batross authored Oct 18, 2020
  
  630eb0f9
- ConversationViewTest: fix test · 149589c8
  a1batross authored Oct 18, 2020
  
  149589c8
- ConversationControllerTest: fix test · 390a12d4
  a1batross authored Oct 18, 2020
  
  390a12d4
- ConversationView: add current user to conversations, according to Mastodon behaviour · 241bd061
  a1batross authored Oct 16, 2020
  
  241bd061
29 Oct, 2020 8 commits
- Merge branch 'issue/2069' into 'develop' · 131f3219
  Haelwenn authored Oct 29, 2020
```
[#2069] unread_conversation_count

See merge request !2939
```
  131f3219
- Merge branch 'fix/frontend-cli-docs' into 'develop' · a326a563
  feld authored Oct 29, 2020
```
Fix formatting and typos in "Managing frontends" guide

See merge request !3098
```
  a326a563
- Merge branch 'issue/2137-user-filters-admin-fe' into 'develop' · 1cce1bd7
  feld authored Oct 29, 2020
```
[#2137] admin/users filters

See merge request !3016
```
  1cce1bd7
- Merge branch 'mutes-blocks-pagination' into 'develop' · 6d7dc124
  feld authored Oct 29, 2020
```
Support pagination of blocks and mutes

Closes #642

See merge request !3080
```
  6d7dc124
- Merge branch 'fix/mrf-keyword-description' into 'develop' · 8b365099
  feld authored Oct 29, 2020
```
Improve Keyword descriptions for AdminFE

See merge request !3110
```
  8b365099
- Improve Keyword descriptions for AdminFE · 89c356d1
  feld authored Oct 29, 2020
  
  89c356d1
- Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination · fa902867
  minibikini authored Oct 29, 2020
  
  fa902867
- Merge branch 'bugfix/admin-api-account-view-is-discoverable-fix' into 'develop' · 0e0a6aef
  feld authored Oct 29, 2020
```
Fix: User.is_discoverable attribute rendering in Admin API User view

See merge request !3107
```
  0e0a6aef
28 Oct, 2020 3 commits
- Fixed User.is_discoverable attribute rendering in Admin API User view. · 9f5f7dc9
  Ivan Tashkinov authored Oct 28, 2020
  
  9f5f7dc9
- Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop' · 25832534
  feld authored Oct 28, 2020
```
OStatus / Static FE access control fixes

See merge request !3053
```
  25832534
- @doc fix. · da4a1e57
  Ivan Tashkinov authored Oct 28, 2020
  
  da4a1e57