Commits · 833161b5d21f85e2276cd0cee3e148ecbe6e1f05 · Pleroma / pleroma

18 Feb, 2019 6 commits
- Merge branch 'feature/jobs' into 'develop' · 833161b5
  kaniini authored Feb 18, 2019
```
Job Queue

See merge request !732
```
  833161b5
- Merge branch 'patch-image-description' into 'develop' · a39a094c
  kaniini authored Feb 18, 2019
```
Patch to support image descriptions for pleroma-fe

See merge request !626
```
  a39a094c
- Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop' · 7456338e
  kaniini authored Feb 18, 2019
```
Add OAuth tokens endpoint

See merge request !805
```
  7456338e
- Merge branch 'features/flavour-switching' into 'develop' · c23bd057
  kaniini authored Feb 18, 2019
```
[MastoAPI] Add switching of frontend flavours

See merge request !807
```
  c23bd057
- Merge branch 'follow-request-count' into 'develop' · cd019a59
  kaniini authored Feb 18, 2019
```
Follow request count

See merge request !817
```
  cd019a59
- Merge branch 'csv-export' into 'develop' · 3f38a055
  kaniini authored Feb 18, 2019
```
Add option to return all friends in twitter api.

Closes #602

See merge request !833
```
  3f38a055
17 Feb, 2019 14 commits
- Fix test · fd17a0cc
  Maxim Filippov authored Feb 18, 2019
  
  fd17a0cc
- Render only "id", "valid_until" and "app_name" in TokenView · 94708d63
  Maxim Filippov authored Feb 17, 2019
  
  94708d63
- Merge branch 'docs/add-clients-to-ex_doc' into 'develop' · 28a249be
  lain authored Feb 17, 2019
```
mix.exs: Add docs/Clients.md to docs.extras

See merge request !835
```
  28a249be
- Merge branch 'develop' into 'docs/add-clients-to-ex_doc' · a2f4fc49
  lain authored Feb 17, 2019
```
# Conflicts:
#   mix.exs
```
  a2f4fc49
- Merge branch 'docker-speedup' into 'develop' · 79e503b3
  lain authored Feb 17, 2019
```
Docker speedup

See merge request !837
```
  79e503b3
- Merge branch 'mastoapi-stop-capping-attachments' into 'develop' · f26582aa
  lain authored Feb 17, 2019
```
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon

See merge request !834
```
  f26582aa
- Update Differences-in-MastodonAPI-Responses.md · 6a8a8e90
  lain authored Feb 17, 2019
  
  6a8a8e90
- Merge branch 'fix/hellthread-policy-recipient-check' into 'develop' · ae84af4a
  lain authored Feb 17, 2019
```
Fix recipient count in hellthread policy

See merge request !836
```
  ae84af4a
- More speedup, test fixes. · 71c8c60d
  lain authored Feb 17, 2019
  
  71c8c60d
- more tests for HellthreadPolicy · d0a94f98
  rinpatch authored Feb 17, 2019
  
  d0a94f98
- Speed up docker postgres. · fa191a65
  lain authored Feb 17, 2019
  
  fa191a65
- Fix recipient count in hellthread policy · 8f98d970
  rinpatch authored Feb 17, 2019
  
  8f98d970
- Fix formating · ccd30a18
  rinpatch authored Feb 17, 2019
  
  ccd30a18
- Add differences in MastoAPI responses to mix.exs extras · 006bec8c
  rinpatch authored Feb 17, 2019
  
  006bec8c
16 Feb, 2019 11 commits
- Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching · 72a4272d
  Haelwenn authored Feb 10, 2019
  
  72a4272d
- [MastoAPI] Add switching of frontend flavours · 4df455f6
  Haelwenn authored Feb 03, 2019
  
  4df455f6
- mix.exs: Add docs/Clients.md to docs.extras · 25ab90ed
  Haelwenn authored Feb 16, 2019
```
[ci skip]
```
  25ab90ed
- Add a section on how to identify a pleroma instance, clarify that post upload... · c788f154
  rinpatch authored Feb 16, 2019
```
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too
```
  c788f154
- Merge branch 'welcome-message' into 'develop' · 3b141194
  rinpatch authored Feb 16, 2019
```
Add optional welcome message.

See merge request !832
```
  3b141194
- Remove a limit on attachments in Mastodon API and document the changes in... · 96c72532
  rinpatch authored Feb 16, 2019
```
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
```
  96c72532
- WelcomeMessage: specify that the user has to be local. · 27375e55
  lain authored Feb 16, 2019
  
  27375e55
- WelcomeMessage: Get rid of Ecto reference. · 269d3e1c
  lain authored Feb 16, 2019
  
  269d3e1c
- Check that the welcome message is sent from the correct user. · f469a861
  lain authored Feb 16, 2019
  
  f469a861
- Add option to return all friends in twitter api. · 38e15930
  lain authored Feb 16, 2019
```
Mainly useful for user export.
```
  38e15930
- Add optional welcome message. · d812a347
  lain authored Feb 16, 2019
  
  d812a347
15 Feb, 2019 7 commits
- Merge branch 'bugfix/oauth-token-padding' into 'develop' · 1ce1b7b5
  lain authored Feb 15, 2019
```
oauth: never use base64 padding when returning tokens to applications

See merge request !825
```
  1ce1b7b5
- Merge branch 'hellthread-filter-fix' into 'develop' · 921571c1
  rinpatch authored Feb 15, 2019
```
Hellthread filter fix

Closes #634

See merge request !831
```
  921571c1
- Readd threshold is not 0 check, optmization? · c2e0a0c8
  Karen Konou authored Feb 15, 2019
  
  c2e0a0c8
- Rename test, add check for follower collection when delisting · dca6bee2
  Karen Konou authored Feb 15, 2019
  
  dca6bee2
- Merge branch 'bugfix/actor-containment' into 'develop' · b63a5e30
  rinpatch authored Feb 15, 2019
```
activitypub: correctly handle bare URIs in user lookup

Closes #645

See merge request !829
```
  b63a5e30
- Add tests, change default config values, fix a bug · d943c902
  Karen Konou authored Feb 15, 2019
  
  d943c902
- Add logic for keeping follow_request_count up-to-date on the `follow`, · ecdf0657
  Eugenij authored Feb 10, 2019
```
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
```
  ecdf0657
14 Feb, 2019 2 commits
- test: user: add a test for whether user search returns a user or not · 32b16494
  kaniini authored Feb 14, 2019
  
  32b16494
- user: search: use get_or_fetch() instead of get_or_fetch_by_nickname() · da44cdd3
  kaniini authored Feb 14, 2019
```
get_or_fetch() handles the nickname verses URI differences transparently.
```
  da44cdd3