d283c9abc1
Remove emoji support from AdminFE
5 years ago
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
a65ee8ead6
pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
5 years ago
4271cfb81a
Merge branch 'stable' into release/2.0.0
5 years ago
7605fe5065
Merge branch 'stable' into release/2.0.0
5 years ago
3508ae7039
version bump changelog and mix version
5 years ago
69a85e9c82
changelog: sync with stable
5 years ago
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
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
f1750b4658
Admin API tests: Fix wrong test.
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
ec3dc462ff
Document the instance stats fix
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
5992c256ad
Merge branch 'chore/update-copyrights' into 'develop'
...
Update Copyrights
See merge request pleroma/pleroma!2269
5 years ago
5592db4757
Older copyright updates
5 years ago
05da5f5cca
Update Copyrights
5 years ago
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
5 years ago
4f3313bf80
Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
5 years ago
bd8624d649
[ #1560 ] Added tests for non-federating instance bahaviour to OStatusControllerTest.
5 years ago
b4367125e9
[ #1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
5 years ago
4c02e04935
Merge branch 'prepared-statements-settings' into 'develop'
...
Prepared statements settings
See merge request pleroma/pleroma!2238
5 years ago
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
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
45b08ca166
Merge branch 'docs_cheatsheet_fix' into 'develop'
...
fix for :fetch_initial_posts
See merge request pleroma/pleroma!2266
5 years ago
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
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
6ceef768cb
Merge branch 'chores/bump-copyright' into 'develop'
...
Bump copyright
See merge request pleroma/pleroma!2265
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
6c0d869d9d
Bump copyright years of files changed after 2019-01-01
...
Done via the following command:
git diff 1e6c102b
5 years ago
deb5f5c40e
pleroma_api.md: direct_conversation_id vs. conversation_id
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
5 years ago
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
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
400fbc7629
wait in mix task while pleroma is rebooted
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
523f73dccd
Fix static FE plug to handle missing Accept header.
5 years ago
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
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
5 years ago
e6ccf12129
changelog: entries for timeline DoS fixes
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
Mark Felder