feld
|
46f118d7e1
|
Merge branch 'revert-67cc4dce' into 'develop'
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
See merge request pleroma/pleroma!2276
|
2020-03-06 16:03:24 +00:00 |
|
|
feld
|
15d36b7f5f
|
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
This reverts merge request !2274
|
2020-03-06 15:56:41 +00:00 |
|
|
Mark Felder
|
e25bacabb1
|
Remove EmojiPacks from AdminFE build
Once more, with feeling
|
2020-03-06 09:54:38 -06:00 |
|
|
lain
|
67cc4dceb5
|
Merge branch 'update/admin-fe-without-emojipack' into 'develop'
Remove emoji support from AdminFE
See merge request pleroma/pleroma!2274
|
2020-03-06 15:14:10 +00:00 |
|
|
Mark Felder
|
d283c9abc1
|
Remove emoji support from AdminFE
|
2020-03-06 07:53:33 -06:00 |
|
|
Ivan Tashkinov
|
027714b519
|
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
|
2020-03-06 11:48:30 +03:00 |
|
|
rinpatch
|
a65ee8ead6
|
pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
|
2020-03-05 23:41:47 +03:00 |
|
|
rinpatch
|
4271cfb81a
|
Merge branch 'stable' into release/2.0.0
|
2020-03-05 22:38:38 +03:00 |
|
|
rinpatch
|
7605fe5065
|
Merge branch 'stable' into release/2.0.0
|
2020-03-05 22:36:35 +03:00 |
|
|
rinpatch
|
3508ae7039
|
version bump changelog and mix version
|
2020-03-05 22:35:23 +03:00 |
|
|
rinpatch
|
69a85e9c82
|
changelog: sync with stable
|
2020-03-05 22:28:37 +03:00 |
|
|
Ivan Tashkinov
|
40765875d4
|
[#1560] Misc. improvements in ActivityPubController federation state restrictions.
|
2020-03-05 21:19:21 +03:00 |
|
|
eugenijm
|
ad22e94f33
|
Exclude private and direct statuses visible to the admin when using godmode
|
2020-03-05 15:15:27 +03:00 |
|
|
lain
|
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 |
|
|
lain
|
f1750b4658
|
Admin API tests: Fix wrong test.
|
2020-03-05 12:42:02 +01:00 |
|
|
Haelwenn
|
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 |
|
|
Mark Felder
|
ec3dc462ff
|
Document the instance stats fix
|
2020-03-04 13:41:04 -06:00 |
|
|
Mark Felder
|
cdb05633a6
|
Generate instance stats on startup
|
2020-03-04 13:33:26 -06:00 |
|
|
feld
|
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 |
|
|
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 |
|
|
Haelwenn
|
5992c256ad
|
Merge branch 'chore/update-copyrights' into 'develop'
Update Copyrights
See merge request pleroma/pleroma!2269
|
2020-03-03 23:15:12 +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 |
|
|
Ivan Tashkinov
|
b6fc98d9cd
|
[#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.
|
2020-03-03 22:22:02 +03:00 |
|
|
Egor Kislitsyn
|
4f3313bf80
|
Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
|
2020-03-03 00:29:51 +04:00 |
|
|
Ivan Tashkinov
|
bd8624d649
|
[#1560] Added tests for non-federating instance bahaviour to OStatusControllerTest.
|
2020-03-02 22:02:21 +03: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
|
cc98d010ed
|
relay list shows hosts without accepted follow
|
2020-03-02 09:27:20 +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 --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
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 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
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
|
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 |
|