e3ccaeaa53
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
2020-03-15 16:58:29 +03:00
f8dc597c51
Fix enforcement of character limits
2020-03-15 16:58:13 +03:00
423cfaf141
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
2020-03-15 16:57:59 +03:00
7cf7083076
relay list shows hosts without accepted follow
2020-03-15 16:55:20 +03:00
963df689b9
static-fe.css: Restore from before a65ee8ea
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
2020-03-15 16:55:00 +03:00
e3f26920d0
mix.exs: bump version to 2.0.1
2020-03-15 16:54:27 +03:00
e8493431bf
Merge branch 'release/2.0.0' into 'stable'
...
Release/2.0.0
See merge request pleroma/pleroma!2273
2020-03-08 10:38:35 +00:00
e7c49d51d7
pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
2020-03-07 18:18:43 +03:00
80ca06227a
Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'
...
moderation log: fix improperly migrated data
See merge request pleroma/pleroma!2277
2020-03-07 14:45:00 +00:00
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
2020-03-07 17:00:58 +03:00
474ef512df
wait in mix task while pleroma is rebooted
2020-03-07 16:02:55 +03:00
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
2020-03-06 20:23:39 +00:00
e25bacabb1
Remove EmojiPacks from AdminFE build
...
Once more, with feeling
2020-03-06 09:54:38 -06:00
a65ee8ead6
pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
2020-03-05 23:41:47 +03:00
4271cfb81a
Merge branch 'stable' into release/2.0.0
2020-03-05 22:38:38 +03:00
7605fe5065
Merge branch 'stable' into release/2.0.0
2020-03-05 22:36:35 +03:00
3508ae7039
version bump changelog and mix version
2020-03-05 22:35:23 +03:00
69a85e9c82
changelog: sync with stable
2020-03-05 22:28:37 +03:00
47604907c9
Merge branch 'proper_error_messages' into 'develop'
...
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
2020-03-05 11:49:51 +00:00
f1750b4658
Admin API tests: Fix wrong test.
2020-03-05 12:42:02 +01:00
927079e2ff
Merge branch 'fix/stats-on-startup' into 'develop'
...
Generate instance stats on startup
Closes #1598
See merge request pleroma/pleroma!2271
2020-03-05 07:25:23 +00:00
ec3dc462ff
Document the instance stats fix
2020-03-04 13:41:04 -06:00
cdb05633a6
Generate instance stats on startup
2020-03-04 13:33:26 -06:00
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
2020-03-04 18:22:37 +00:00
4bce13fa2f
MastodonController: Return 404 errors correctly.
2020-03-04 18:09:06 +01:00
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
2020-03-04 12:43:06 +00:00
5992c256ad
Merge branch 'chore/update-copyrights' into 'develop'
...
Update Copyrights
See merge request pleroma/pleroma!2269
2020-03-03 23:15:12 +00:00
5592db4757
Older copyright updates
2020-03-03 16:46:45 -06:00
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
4c02e04935
Merge branch 'prepared-statements-settings' into 'develop'
...
Prepared statements settings
See merge request pleroma/pleroma!2238
2020-03-02 17:00:04 +00:00
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
2020-03-02 16:47:31 +03:00
45b08ca166
Merge branch 'docs_cheatsheet_fix' into 'develop'
...
fix for :fetch_initial_posts
See merge request pleroma/pleroma!2266
2020-03-02 10:05:03 +00:00
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
2020-03-02 10:29:24 +01:00
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
2020-03-02 07:58:01 +00:00
6ceef768cb
Merge branch 'chores/bump-copyright' into 'develop'
...
Bump copyright
See merge request pleroma/pleroma!2265
2020-03-02 05:15:13 +00:00
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
6c0d869d9d
Bump copyright years of files changed after 2019-01-01
...
Done via the following command:
git diff 1e6c102b
2020-03-02 05:54:56 +01:00
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
2020-03-01 19:16:54 +00:00
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
2020-03-01 19:16:54 +00:00
34f1d09f3a
spec fix
2020-03-01 12:01:39 +03:00
ba87ed7335
fix for compiling
2020-03-01 12:01:39 +03:00
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
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
2020-02-29 23:08:14 +00:00
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
2020-03-01 02:03:46 +03:00
e6ccf12129
changelog: entries for timeline DoS fixes
2020-03-01 01:13:08 +03:00
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
2020-03-01 01:13:08 +03:00
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.
2020-03-01 01:13:07 +03:00
df2173343a
pagination: limit the number of elements returned at one time to 40
2020-03-01 01:11:54 +03:00
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
2020-02-29 21:52:33 +00:00
c747260989
[ #2250 ] Tiny refactoring per merge request review.
2020-02-29 22:04:09 +03:00
Haelwenn (lanodan) Monnier
Mark Felder
rinpatch
Alexander Strizhakov
lain
Haelwenn
feld
eugenijm
ilja
Ilja
Ivan Tashkinov