c6eb1c1b92
Merge branch 'develop' into fix/cache-control-headers
5 years ago
7321429a2e
Lint
5 years ago
3b1b183b42
Synchronize cache-control header for local media with the mediaproxy
5 years ago
413177c8f0
Set correct Cache-Control header for local media
5 years ago
c62195127d
Update comment to reflect what the code is actually doing
5 years ago
ad31d0726a
Do not trust remote Cache-Control headers for mediaproxy
5 years ago
096c5c52e0
Merge branch 'revert/cache-control' into 'develop'
...
Revert "Set better Cache-Control header for static content"
Closes #1613
See merge request pleroma/pleroma!2290
5 years ago
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
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
5 years ago
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
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
5 years ago
c3b9fbd3a7
Revert "Set better Cache-Control header for static content"
...
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.
Closes #1613
5 years ago
fce090c1de
using Pleroma.Config instead of ets
5 years ago
193d67cde5
compile fix
5 years ago
282a93554f
merging release default config on app start
5 years ago
5af798f246
Fix enforcement of character limits
5 years ago
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
474ef512df
wait in mix task while pleroma is rebooted
5 years ago
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
5 years ago
47604907c9
Merge branch 'proper_error_messages' into 'develop'
...
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
5 years ago
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
cdb05633a6
Generate instance stats on startup
5 years ago
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
4bce13fa2f
MastodonController: Return 404 errors correctly.
5 years ago
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
05da5f5cca
Update Copyrights
5 years ago
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
5 years ago
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
cc98d010ed
relay list shows hosts without accepted follow
5 years ago
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
5 years ago
34f1d09f3a
spec fix
5 years ago
ba87ed7335
fix for compiling
5 years ago
32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
5 years ago
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
4d416343fa
rate limiter: Fix a race condition
...
When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.
5 years ago
df2173343a
pagination: limit the number of elements returned at one time to 40
5 years ago
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
5 years ago
c747260989
[ #2250 ] Tiny refactoring per merge request review.
5 years ago
3759b146c4
Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex
5 years ago
f2216287a7
Merge branch 'admin-status-list' into 'develop'
...
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192
5 years ago
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
cb60a9c42f
Do not fail when user has no email
5 years ago
4ab07cf0d5
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
5 years ago
e2a6a40367
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
5 years ago
f446744a6a
Allow account registration without an email
5 years ago
fda6f35a46
Merge branch 'feat/instance-gen-improvements' into 'develop'
...
small instance.gen task improvements
See merge request pleroma/pleroma!2245
5 years ago
3bbfebd1c2
instance.gen task: make example instance name less confusing
...
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
5 years ago
359faa8645
instance.gen task: remind to transfer the config to the database after
...
migrations
5 years ago
Mark Felder