Mark Felder
3b1b183b42
Synchronize cache-control header for local media with the mediaproxy
5 years ago
Mark Felder
db36b48180
Remove test verifying we preserve cache-control headers; we don't
5 years ago
Mark Felder
470090471d
Fix test to use new cache-control settings
5 years ago
Mark Felder
413177c8f0
Set correct Cache-Control header for local media
5 years ago
Mark Felder
c62195127d
Update comment to reflect what the code is actually doing
5 years ago
Mark Felder
e04e16bbc0
Do not strip Cache-Control headers from media. Trust the Pleroma backend.
5 years ago
Mark Felder
ad31d0726a
Do not trust remote Cache-Control headers for mediaproxy
5 years ago
feld
802b991814
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
...
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
5 years ago
rinpatch
00d1752031
Merge branch 'docs/new_user' into 'develop'
...
CLI_tasks/user.md: Fix `pleroma.user new` documentation
Closes #1621
See merge request pleroma/pleroma!2286
5 years ago
feld
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
5 years ago
rinpatch
7cdabdc0df
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
...
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
5 years ago
feld
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
5 years ago
Alexander Strizhakov
fce090c1de
using Pleroma.Config instead of ets
5 years ago
Alexander Strizhakov
193d67cde5
compile fix
5 years ago
Alexander Strizhakov
282a93554f
merging release default config on app start
5 years ago
rinpatch
9dbf493b65
Merge branch 'docs/debian-install' into 'develop'
...
installation/otp_en.md: Fix pleroma.nginx target [deb]
See merge request pleroma/pleroma!2280
5 years ago
Haelwenn (lanodan) Monnier
6316726a5f
CLI_tasks: Use manpage formatting conventions
...
- [] for options
- <> for mandatory arguments
- foo ... when foo can be repeated
[ci skip]
5 years ago
Haelwenn (lanodan) Monnier
a06104b9d5
CLI_tasks/user.md: Fix `pleroma.user new` documentation
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621
[ci skip]
5 years ago
Haelwenn
8ad73445cd
Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'
...
static-fe.css: Restore from before a65ee8ea
See merge request pleroma/pleroma!2284
5 years ago
Haelwenn (lanodan) Monnier
a747eb6df9
static-fe.css: Restore from before a65ee8ea
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
5 years ago
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
Haelwenn (lanodan) Monnier
d9134d4430
installation/otp_en.md: Fix pleroma.nginx target [deb]
...
Needs to be backported to stable.
Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29
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
eugenijm
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
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