Mark Felder
85d571fc23
Move Tesla repo to our GitLab
2020-03-02 12:52:41 -06:00
Ivan Tashkinov
b4367125e9
[ #1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
2020-03-02 21:43:18 +03:00
lain
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
Ivan Tashkinov
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-02 18:41:12 +03:00
eugenijm
7af431c150
Exclude reblogs from GET /api/pleroma/admin/statuses by default
2020-03-02 16:47:31 +03:00
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
2020-03-02 15:35:49 +04:00
rinpatch
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
ilja
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
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
Alexander Strizhakov
137c600cae
stop connections manually
2020-03-02 10:01:07 +03:00
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow
2020-03-02 09:27:20 +03:00
Alexander Strizhakov
2622cf1190
returning repo parameters
2020-03-02 09:22:34 +03:00
Haelwenn
6ceef768cb
Merge branch 'chores/bump-copyright' into 'develop'
...
Bump copyright
See merge request pleroma/pleroma!2265
2020-03-02 05:15:13 +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
Haelwenn (lanodan) Monnier
deb5f5c40e
pleroma_api.md: direct_conversation_id vs. conversation_id
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-02 04:01:37 +01:00
rinpatch
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
Ilja
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
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun
2020-03-01 12:48:49 +03:00
Alexander Strizhakov
400fbc7629
wait in mix task while pleroma is rebooted
2020-03-01 12:36:09 +03:00
Alexander Strizhakov
34f1d09f3a
spec fix
2020-03-01 12:01:39 +03:00
Alexander Strizhakov
ba87ed7335
fix for compiling
2020-03-01 12:01:39 +03:00
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
Phil Hagelberg
523f73dccd
Fix static FE plug to handle missing Accept header.
2020-02-29 18:53:49 -08:00
rinpatch
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
rinpatch
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
2020-03-01 02:03:46 +03:00
rinpatch
e6ccf12129
changelog: entries for timeline DoS fixes
2020-03-01 01:13:08 +03:00
rinpatch
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
2020-03-01 01:13:08 +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
df2173343a
pagination: limit the number of elements returned at one time to 40
2020-03-01 01:11:54 +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
rinpatch
269aa9c8a5
Merge branch 'chore/update-cachex' into 'develop'
...
deps: update cachex to 3.2.0
See merge request pleroma/pleroma!2259
2020-02-29 17:58:48 +00:00
rinpatch
c026128325
deps: update cachex to 3.2.0
2020-02-29 20:40:23 +03:00
rinpatch
0fefc4033f
Merge branch 'mastofe/bundle-2020-01-20' into 'develop'
...
MastoFE: Bundle 2020-01-20
See merge request pleroma/pleroma!2257
2020-02-29 16:31:31 +00:00
Haelwenn
5db2fb3ce7
Merge branch 'descriptions-changes' into 'develop'
...
Adding streamer group & Oban crontab child to descriptions.exs
Closes #1592
See merge request pleroma/pleroma!2258
2020-02-29 11:29:45 +00:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun
2020-02-29 11:34:50 +03:00
Alexander Strizhakov
04b03e4762
streamer group & Oban crontab child
2020-02-29 11:26:34 +03:00
Haelwenn (lanodan) Monnier
2a850abbeb
MastoFE: Bundle 2020-01-20
2020-02-29 06:41:13 +01:00
Haelwenn (lanodan) Monnier
3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-02-29 01:25:14 +01:00
aad057a2d6
Merge branch 'update/pleroma-fe-20200228' into 'develop'
...
Update PleromaFE bundle for the 2.0 release
See merge request pleroma/pleroma!2255
2020-02-28 23:28:58 +00:00
Mark Felder
bdd603e9f3
Merge branch 'develop' into update/pleroma-fe-20200228
2020-02-28 16:18:09 -06:00
Mark Felder
c28de93912
Update PleromaFE bundle for the 2.0 release
2020-02-28 16:15:12 -06:00
d075bdc9e9
Merge branch 'update/admin-fe-20200228' into 'develop'
...
Update AdminFE build
See merge request pleroma/pleroma!2254
2020-02-28 18:40:22 +00:00
Mark Felder
3d24a0917b
Update AdminFE build
...
- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements
2020-02-28 12:32:44 -06:00
Ivan Tashkinov
3759b146c4
Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex
2020-02-28 13:33:42 +00:00
Haelwenn
e892a7eb01
Merge branch 'filtered-params' into 'develop'
...
add confirm field to filtered params
See merge request pleroma/pleroma!2251
2020-02-28 04:27:50 +00:00
Steven Fuchs
fabcd82f4a
add confirm field to filtered params
2020-02-28 04:27:50 +00:00
457a653f88
Merge branch 'descriptions-changes' into 'develop'
...
Removing unnecessary groups from descriptions.exs
See merge request pleroma/pleroma!2247
2020-02-27 18:11:26 +00: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
