summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-11installation: Add ERL_EPMD_ADDRESS=127.0.0.1,::1 to servicesfix/epmd-loopbackHaelwenn (lanodan) Monnier
[ci skip]
2020-03-10Merge branch 'fix/post-length-validation' into 'develop'lain
Fix enforcement of character limits Closes #1618 See merge request pleroma/pleroma!2283
2020-03-10Fix enforcement of character limitsMark Felder
2020-03-09Merge branch 'patch-1' into 'develop'lain
Better advice for vacuuming after restoring. See merge request pleroma/pleroma!2233
2020-03-08Merge branch 'chore/mix-version-bump' into 'develop'rinpatch
mix.exs: bump version to development one See merge request pleroma/pleroma!2279
2020-03-08mix.exs: bump version to development onerinpatch
2020-03-08Merge branch 'stable' into 'develop'rinpatch
Sync develop with stable Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606 See merge request pleroma/pleroma!2278
2020-03-08Merge branch 'release/2.0.0' into 'stable'v2.0.0rinpatch
Release/2.0.0 See merge request pleroma/pleroma!2273
2020-03-07pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6afrinpatch
2020-03-07Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'rinpatch
moderation log: fix improperly migrated data See merge request pleroma/pleroma!2277
2020-03-07moderation log: fix improperly migrated datarinpatch
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
2020-03-07wait in mix task while pleroma is rebootedAlexander Strizhakov
2020-03-07Merge branch 'restart-fix-for-mix-tasks' into 'develop'rinpatch
Wait in mix task while pleroma is rebooted See merge request pleroma/pleroma!2225
2020-03-06Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'rinpatch
Remove EmojiPacks from AdminFE build See merge request pleroma/pleroma!2275
2020-03-06Merge branch 'revert-67cc4dce' into 'develop'feld
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'" See merge request pleroma/pleroma!2276
2020-03-06Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"feld
This reverts merge request !2274
2020-03-06Remove EmojiPacks from AdminFE buildMark Felder
Once more, with feeling
2020-03-06Merge branch 'update/admin-fe-without-emojipack' into 'develop'lain
Remove emoji support from AdminFE See merge request pleroma/pleroma!2274
2020-03-06Remove emoji support from AdminFEMark Felder
2020-03-05pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4ddrinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05version bump changelog and mix versionrinpatch
2020-03-05changelog: sync with stablerinpatch
2020-03-05Merge branch 'proper_error_messages' into 'develop'lain
MastodonController: Return 404 errors correctly. See merge request pleroma/pleroma!2270
2020-03-05Admin API tests: Fix wrong test.lain
2020-03-05Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn
Generate instance stats on startup Closes #1598 See merge request pleroma/pleroma!2271
2020-03-04Document the instance stats fixMark Felder
2020-03-04Generate instance stats on startupMark Felder
2020-03-04Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default Closes #1596 See merge request pleroma/pleroma!2267
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
Do not fail when user has no email See merge request pleroma/pleroma!2249
2020-03-03Merge branch 'chore/update-copyrights' into 'develop'Haelwenn
Update Copyrights See merge request pleroma/pleroma!2269
2020-03-03Older copyright updatesMark Felder
2020-03-03Update CopyrightsMark Felder
2020-03-02Merge branch 'prepared-statements-settings' into 'develop'lain
Prepared statements settings See merge request pleroma/pleroma!2238
2020-03-02Exclude reblogs from `GET /api/pleroma/admin/statuses` by defaulteugenijm
2020-03-02Merge branch 'docs_cheatsheet_fix' into 'develop'rinpatch
fix for :fetch_initial_posts See merge request pleroma/pleroma!2266
2020-03-02fix for :fetch_initial_postsilja
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
2020-03-02Merge branch 'feature/1482-activity_pub_transactions' into 'develop'Haelwenn
ActivityPub actions & side-effects in transaction Closes #1482 See merge request pleroma/pleroma!2089
2020-03-02Merge branch 'chores/bump-copyright' into 'develop'Haelwenn
Bump copyright See merge request pleroma/pleroma!2265
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-03-02Bump copyright years of files changed after 2019-01-01Haelwenn (lanodan) Monnier
Done via the following command: git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2020-03-01Merge branch 'docs_cheatsheet' into 'develop'rinpatch
DOCS Add warning for fetch_initial_posts + more explicit distinction between OTP and from source See merge request pleroma/pleroma!2262
2020-03-01Add warning to the fetch_initial_posts setting. Now we sometimes have people ↵Ilja
who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users) I also made a more explicit distinction between OTP and from source installs in the general explanation
2020-03-01wait in mix task while pleroma is rebootedAlexander Strizhakov
2020-03-01spec fixAlexander Strizhakov
2020-03-01fix for compilingAlexander Strizhakov
2020-03-01ActivityPub actions & side-effects in transactionAlexander Strizhakov
2020-02-29Merge branch 'fix/easy-timeline-dos' into 'develop'rinpatch
Cap the number of requested statuses in timelines to 40 and rate limit them See merge request pleroma/pleroma!2253
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-03 15:54:30 +0000