Commits · develop · phaer / pleroma

10 Mar, 2020 1 commit
- doc: Add erlang-inets to debian dependencies. · 73197de3
  phaer authored Mar 10, 2020
  
  73197de3
09 Mar, 2020 1 commit

Merge branch 'patch-1' into 'develop' · 841e4e4d

lain authored Mar 09, 2020

Better advice for vacuuming after restoring.

See merge request pleroma/pleroma!2233

841e4e4d

08 Mar, 2020 4 commits
- Merge branch 'chore/mix-version-bump' into 'develop' · 5b74976c
  rinpatch authored Mar 08, 2020
```
mix.exs: bump version to development one

See merge request pleroma/pleroma!2279
```
  5b74976c
- mix.exs: bump version to development one · 86e7709a
  rinpatch authored Mar 08, 2020
  
  86e7709a
- Merge branch 'stable' into 'develop' · 663e4660
  rinpatch authored Mar 08, 2020
```
Sync develop with stable

Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606

See merge request pleroma/pleroma!2278
```
  663e4660
- Merge branch 'release/2.0.0' into 'stable' · e8493431
  rinpatch authored Mar 08, 2020
```
Release/2.0.0

See merge request pleroma/pleroma!2273
```
  e8493431
07 Mar, 2020 5 commits

pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af · e7c49d51
rinpatch authored Mar 07, 2020

e7c49d51
Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0' · 80ca0622
rinpatch authored Mar 07, 2020
```
moderation log: fix improperly migrated data

See merge request pleroma/pleroma!2277
```
80ca0622

moderation log: fix improperly migrated data · 6cf1958b

rinpatch authored Mar 07, 2020

Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.

Closes #1606

6cf1958b

wait in mix task while pleroma is rebooted · 474ef512
Alexander Strizhakov authored Feb 18, 2020

474ef512
Merge branch 'restart-fix-for-mix-tasks' into 'develop' · 6d797b99
rinpatch authored Mar 07, 2020
```
Wait in mix task while pleroma is rebooted

See merge request pleroma/pleroma!2225
```
6d797b99

06 Mar, 2020 6 commits
- Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0' · f259b1ad
  rinpatch authored Mar 06, 2020
```
Remove EmojiPacks from AdminFE build

See merge request pleroma/pleroma!2275
```
  f259b1ad
- Merge branch 'revert-67cc4dce' into 'develop' · 46f118d7
  feld authored Mar 06, 2020
```
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"

See merge request pleroma/pleroma!2276
```
  46f118d7
- Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'" · 15d36b7f
  feld authored Mar 06, 2020
```
This reverts merge request !2274
```
  15d36b7f
- Remove EmojiPacks from AdminFE build · e25bacab
  feld authored Mar 06, 2020
```
Once more, with feeling
```
  e25bacab
- Merge branch 'update/admin-fe-without-emojipack' into 'develop' · 67cc4dce
  lain authored Mar 06, 2020
```
Remove emoji support from AdminFE

See merge request pleroma/pleroma!2274
```
  67cc4dce
- Remove emoji support from AdminFE · d283c9ab
  feld authored Mar 06, 2020
  
  d283c9ab
05 Mar, 2020 8 commits
- pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd · a65ee8ea
  rinpatch authored Mar 05, 2020
  
  a65ee8ea
- Merge branch 'stable' into release/2.0.0 · 4271cfb8
  rinpatch authored Mar 05, 2020
  
  4271cfb8
- Merge branch 'stable' into release/2.0.0 · 7605fe50
  rinpatch authored Mar 05, 2020
  
  7605fe50
- version bump changelog and mix version · 3508ae70
  rinpatch authored Mar 05, 2020
  
  3508ae70
- changelog: sync with stable · 69a85e9c
  rinpatch authored Mar 05, 2020
  
  69a85e9c
- Merge branch 'proper_error_messages' into 'develop' · 47604907
  lain authored Mar 05, 2020
```
MastodonController: Return 404 errors correctly.

See merge request pleroma/pleroma!2270
```
  47604907
- Admin API tests: Fix wrong test. · f1750b46
  lain authored Mar 05, 2020
  
  f1750b46
- Merge branch 'fix/stats-on-startup' into 'develop' · 927079e2
  Haelwenn authored Mar 05, 2020
```
Generate instance stats on startup

Closes #1598

See merge request pleroma/pleroma!2271
```
  927079e2
04 Mar, 2020 5 commits
- Document the instance stats fix · ec3dc462
  feld authored Mar 04, 2020
  
  ec3dc462
- Generate instance stats on startup · cdb05633
  feld authored Mar 04, 2020
  
  cdb05633
- Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop' · 9b740cfb
  feld authored Mar 04, 2020
```
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default

Closes #1596

See merge request !2267
```
  9b740cfb
- MastodonController: Return 404 errors correctly. · 4bce13fa
  lain authored Mar 04, 2020
  
  4bce13fa
- Merge branch 'fix/no-email-no-fail' into 'develop' · 6f7a8c43
  lain authored Mar 04, 2020
```
Do not fail when user has no email

See merge request !2249
```
  6f7a8c43
03 Mar, 2020 3 commits
- Merge branch 'chore/update-copyrights' into 'develop' · 5992c256
  Haelwenn authored Mar 03, 2020
```
Update Copyrights

See merge request !2269
```
  5992c256
- Older copyright updates · 5592db47
  feld authored Mar 03, 2020
  
  5592db47
- Update Copyrights · 05da5f5c
  feld authored Mar 03, 2020
  
  05da5f5c
02 Mar, 2020 7 commits
- Merge branch 'prepared-statements-settings' into 'develop' · 4c02e049
  lain authored Mar 02, 2020
```
Prepared statements settings

See merge request !2238
```
  4c02e049
- Exclude reblogs from `GET /api/pleroma/admin/statuses` by default · 7af431c1
  Eugenij authored Mar 02, 2020
  
  7af431c1
- Merge branch 'docs_cheatsheet_fix' into 'develop' · 45b08ca1
  rinpatch authored Mar 02, 2020
```
fix for :fetch_initial_posts

See merge request !2266
```
  45b08ca1
- fix for :fetch_initial_posts · 036e8a40
  ilja authored Mar 02, 2020
```
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
```
  036e8a40
- Merge branch 'feature/1482-activity_pub_transactions' into 'develop' · 764a50f8
  Haelwenn authored Mar 02, 2020
```
ActivityPub actions & side-effects in transaction

Closes #1482

See merge request !2089
```
  764a50f8
- Merge branch 'chores/bump-copyright' into 'develop' · 6ceef768
  Haelwenn authored Mar 02, 2020
```
Bump copyright

See merge request !2265
```
  6ceef768
- Bump copyright years of files changed after 2020-01-07 · 6da65400
  Haelwenn authored Mar 02, 2020
```
Done via the following command:
git diff fcd5dd25 --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
```
  6da65400