Commits · a5edc4da6225ff2bf1ea8862b1c857d7e87c920f · Pleroma / pleroma

29 Mar, 2019 6 commits
- Merge branch 'pleroma_job_queue' into 'develop' · a5edc4da
  lain authored Mar 29, 2019
```
Replace Pleroma.Jobs with `pleroma_job_queue`

See merge request !992
```
  a5edc4da
- Replace Pleroma.Jobs with `pleroma_job_queue` · 9a39d1d8
  minibikini authored Mar 29, 2019 and lain committed Mar 29, 2019
  
  9a39d1d8
- Merge branch 'sayonara-gitlab-wiki' into 'develop' · 749d53e2
  lain authored Mar 29, 2019
```
Move out of Gitlab Wiki

See merge request !990
```
  749d53e2
- Merge branch 'feature/deploy-docs' into 'develop' · 52bec238
  lain authored Mar 29, 2019
```
Add automatic documentation build and deploy for master and develop branches

Closes #478

See merge request !965
```
  52bec238
- Merge branch 'bugfix/migration-less_replies_count' into 'develop' · ef3c23d4
  kaniini authored Mar 29, 2019
```
Revert awfully long migration from 568e3485

See merge request !991
```
  ef3c23d4
- Revert awfully long migration from 568e3485 · b2f3a40e
  Haelwenn authored Mar 29, 2019
  
  b2f3a40e
28 Mar, 2019 7 commits
- Remove duplicated header from i2p.md · 634e09e1
  rinpatch authored Mar 28, 2019
  
  634e09e1
- did it really take me 4 commits to fix this? · 9bd80e60
  rinpatch authored Mar 28, 2019
  
  9bd80e60
- Remove duplicated header from admin_api.md · d16e2a2e
  rinpatch authored Mar 28, 2019
  
  d16e2a2e
- remove admin tasks as they have their page in mix tasks category already · e4601b2c
  rinpatch authored Mar 28, 2019
  
  e4601b2c
- cringe · d0026761
  rinpatch authored Mar 28, 2019
  
  d0026761
- Move out of Gitlab Wiki · dfae0050
  rinpatch authored Mar 28, 2019
```
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
```
  dfae0050
- Merge branch 'admin-api-user-show' into 'develop' · a71831d1
  lain authored Mar 28, 2019
```
Admin API user show

Closes #766

See merge request pleroma/pleroma!987
```
  a71831d1
27 Mar, 2019 7 commits
- Add user show endpoint for Pleroma admin API · 10c81fc9
  Eugenij authored Mar 27, 2019
  
  10c81fc9
- 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 !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 1 commit
- Attempt to fix incorrect federation of default instance avatars · 6f090f98
  feld authored Mar 25, 2019
  
  6f090f98