rinpatch
9d09755291
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-16 00:15:11 +03:00
rinpatch
fcf51a77ba
Merge branch 'features/staticfe-sanitization' into 'develop'
...
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
2020-03-16 00:14:04 +03:00
rinpatch
0b823755a2
Merge branch 'fix/cache-control-headers' into 'develop'
...
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
2020-03-15 17:01:04 +03:00
Egor Kislitsyn
ffd636f109
Fix hashtags WebSocket streaming
2020-03-15 17:00:18 +03:00
Haelwenn (lanodan) Monnier
5f9fbd7d33
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-15 16:59:52 +03:00
rinpatch
80bc8c2cc9
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
2020-03-15 16:59:39 +03:00
e7837bc14e
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-15 16:58:51 +03:00
Mark Felder
f8dc597c51
Fix enforcement of character limits
2020-03-15 16:58:13 +03:00
rinpatch
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
Alexander Strizhakov
7cf7083076
relay list shows hosts without accepted follow
2020-03-15 16:55:20 +03:00
lain
f1750b4658
Admin API tests: Fix wrong test.
2020-03-05 12:42:02 +01:00
lain
4bce13fa2f
MastodonController: Return 404 errors correctly.
2020-03-04 18:09:06 +01:00
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
2020-03-04 12:43:06 +00:00
Mark Felder
5592db4757
Older copyright updates
2020-03-03 16:46:45 -06:00
Mark Felder
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
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
2020-03-02 07:58:01 +00:00
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
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
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
rinpatch
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
rinpatch
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
Ivan Tashkinov
c747260989
[ #2250 ] Tiny refactoring per merge request review.
2020-02-29 22:04:09 +03:00
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
2020-02-27 18:11:04 +00:00
Ivan Tashkinov
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
2020-02-27 18:46:05 +03:00
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email
2020-02-27 17:27:49 +04:00
eugenijm
4ab07cf0d5
Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses
2020-02-26 22:35:57 +03:00
eugenijm
e2a6a40367
Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)
2020-02-26 20:21:38 +03:00
97dae77240
Merge branch 'token-web-push-test' into 'develop'
...
Add a test to ensure OAuth tokens are tied to Push subscriptions
Closes #1551
See merge request pleroma/pleroma!2241
2020-02-25 16:06:06 +00:00
Egor Kislitsyn
c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions
2020-02-25 18:04:28 +04:00
Alexander Strizhakov
3eccdd15aa
compile fix
2020-02-25 15:19:52 +03:00
rinpatch
035c2c1415
Merge branch 'fix/instance-gen-custom-static' into 'develop'
...
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
2020-02-24 20:52:10 +00:00
rinpatch
5e4fe0e8f7
instance.gen task: fix crash when using custom static directory
...
Closes #1082
2020-02-24 23:42:24 +03:00
eugenijm
7ad5c51f23
Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope
2020-02-24 21:46:37 +03:00
lain
81f29e7c6a
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
...
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
2020-02-24 14:54:22 +00:00
Haelwenn (lanodan) Monnier
f9fe6a9e30
Captcha: return invalid when answer_data is nil
2020-02-24 02:49:53 +01:00
Haelwenn (lanodan) Monnier
ee57663d34
captcha_test.exs: Use the same testing logic in Kocaptcha and native
2020-02-24 01:27:16 +01:00
Ivan Tashkinov
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
2020-02-22 09:31:43 +03:00
Haelwenn
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
2020-02-20 23:50:40 +00:00
lain
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
2020-02-20 12:13:21 +00:00
lain
c69b04c490
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
...
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
2020-02-20 12:04:29 +00:00
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
2020-02-20 15:00:48 +03:00
lain
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
2020-02-20 11:58:37 +00:00
lain
cf4ecffcea
Merge branch 'tests-clear-config-tweaks' into 'develop'
...
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
2020-02-20 11:36:48 +00:00
lain
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
2020-02-19 17:16:45 +01:00
lain
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
2020-02-18 14:56:59 +00:00
Ivan Tashkinov
226f4d5ef9
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
...
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
2020-02-18 17:52:31 +03:00
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
lain
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
2020-02-18 14:32:03 +00:00
Egor Kislitsyn
ca7ac068f0
Add a test
2020-02-18 17:09:50 +04:00
rinpatch
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
