lain
953aece848
Merge branch 'fix/post-length-validation' into 'develop'
...
Fix enforcement of character limits
Closes #1618
See merge request pleroma/pleroma!2283
5 years ago
Mark Felder
5af798f246
Fix enforcement of character limits
5 years ago
lain
841e4e4d83
Merge branch 'patch-1' into 'develop'
...
Better advice for vacuuming after restoring.
See merge request pleroma/pleroma!2233
5 years ago
rinpatch
5b74976c8d
Merge branch 'chore/mix-version-bump' into 'develop'
...
mix.exs: bump version to development one
See merge request pleroma/pleroma!2279
5 years ago
rinpatch
86e7709a4d
mix.exs: bump version to development one
5 years ago
rinpatch
663e466067
Merge branch 'stable' into 'develop'
...
Sync develop with stable
Closes #1262 , #1267 , #1293 , #1303 , #1287 , #1291 , #1382 , #1438 , #1129 , #1109 , and #1606
See merge request pleroma/pleroma!2278
5 years ago
rinpatch
e8493431bf
Merge branch 'release/2.0.0' into 'stable'
...
Release/2.0.0
See merge request pleroma/pleroma!2273
5 years ago
rinpatch
e7c49d51d7
pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
5 years ago
rinpatch
80ca06227a
Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'
...
moderation log: fix improperly migrated data
See merge request pleroma/pleroma!2277
5 years ago
rinpatch
6cf1958b02
moderation log: fix improperly migrated data
...
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
5 years ago
Alexander Strizhakov
474ef512df
wait in mix task while pleroma is rebooted
5 years ago
rinpatch
6d797b9928
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
...
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
5 years ago
rinpatch
f259b1adab
Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'
...
Remove EmojiPacks from AdminFE build
See merge request pleroma/pleroma!2275
5 years ago
feld
46f118d7e1
Merge branch 'revert-67cc4dce' into 'develop'
...
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
See merge request pleroma/pleroma!2276
5 years ago
feld
15d36b7f5f
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
...
This reverts merge request !2274
5 years ago
Mark Felder
e25bacabb1
Remove EmojiPacks from AdminFE build
...
Once more, with feeling
5 years ago
lain
67cc4dceb5
Merge branch 'update/admin-fe-without-emojipack' into 'develop'
...
Remove emoji support from AdminFE
See merge request pleroma/pleroma!2274
5 years ago
Mark Felder
d283c9abc1
Remove emoji support from AdminFE
5 years ago
rinpatch
a65ee8ead6
pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
5 years ago
rinpatch
4271cfb81a
Merge branch 'stable' into release/2.0.0
5 years ago
rinpatch
7605fe5065
Merge branch 'stable' into release/2.0.0
5 years ago
rinpatch
3508ae7039
version bump changelog and mix version
5 years ago
rinpatch
69a85e9c82
changelog: sync with stable
5 years ago
lain
47604907c9
Merge branch 'proper_error_messages' into 'develop'
...
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
5 years ago
lain
f1750b4658
Admin API tests: Fix wrong test.
5 years ago
Haelwenn
927079e2ff
Merge branch 'fix/stats-on-startup' into 'develop'
...
Generate instance stats on startup
Closes #1598
See merge request pleroma/pleroma!2271
5 years ago
Mark Felder
ec3dc462ff
Document the instance stats fix
5 years ago
Mark Felder
cdb05633a6
Generate instance stats on startup
5 years ago
feld
9b740cfb23
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
...
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
5 years ago
lain
4bce13fa2f
MastodonController: Return 404 errors correctly.
5 years ago
lain
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
5 years ago
Haelwenn
5992c256ad
Merge branch 'chore/update-copyrights' into 'develop'
...
Update Copyrights
See merge request pleroma/pleroma!2269
5 years ago
Mark Felder
5592db4757
Older copyright updates
5 years ago
Mark Felder
05da5f5cca
Update Copyrights
5 years ago
lain
4c02e04935
Merge branch 'prepared-statements-settings' into 'develop'
...
Prepared statements settings
See merge request pleroma/pleroma!2238
5 years ago
eugenijm
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
rinpatch
45b08ca166
Merge branch 'docs_cheatsheet_fix' into 'develop'
...
fix for :fetch_initial_posts
See merge request pleroma/pleroma!2266
5 years ago
ilja
036e8a40a2
fix for :fetch_initial_posts
...
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
5 years ago
Haelwenn
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
5 years ago
Haelwenn
6ceef768cb
Merge branch 'chores/bump-copyright' into 'develop'
...
Bump copyright
See merge request pleroma/pleroma!2265
5 years ago
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
--stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
5 years ago
Haelwenn (lanodan) Monnier
6c0d869d9d
Bump copyright years of files changed after 2019-01-01
...
Done via the following command:
git diff 1e6c102b
--stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
5 years ago
rinpatch
6471c09372
Merge branch 'docs_cheatsheet' into 'develop'
...
DOCS Add warning for fetch_initial_posts + more explicit distinction between OTP and from source
See merge request pleroma/pleroma!2262
5 years ago
Ilja
53ef8c11b9
Add warning to the fetch_initial_posts setting. Now we sometimes have people 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
5 years ago
Alexander Strizhakov
400fbc7629
wait in mix task while pleroma is rebooted
5 years ago
Alexander Strizhakov
34f1d09f3a
spec fix
5 years ago
Alexander Strizhakov
ba87ed7335
fix for compiling
5 years ago
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
rinpatch
438394d404
Merge branch 'fix/easy-timeline-dos' into 'develop'
...
Cap the number of requested statuses in timelines to 40 and rate limit them
See merge request pleroma/pleroma!2253
5 years ago
rinpatch
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
5 years ago