10b7b2b4a4
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-31 13:40:28 +03:00
rinpatch
0e92aa0025
Merge branch '1364-notifications-sending-control' into 'develop'
...
[#1364 ] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
2020-03-31 13:39:58 +03:00
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
Alexander Strizhakov
7cf7083076
relay list shows hosts without accepted follow
2020-03-15 16:55:20 +03: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
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
Alexander Strizhakov
34f1d09f3a
spec fix
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
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email
2020-02-27 17:27:49 +04: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
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings
2020-02-25 18:34:56 +04:00
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
lain
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
2020-02-18 14:36:10 +00:00
rinpatch
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
2020-02-15 20:41:38 +03:00
Mark Felder
478619782b
Standardize @behaviour usage in MRFs
2020-02-14 11:02:24 -06:00
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
rinpatch
ea1631d7e6
Make Floki use fast_html
2020-02-11 16:17:21 +03:00
Ivan Tashkinov
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests.
2020-02-09 17:34:48 +03:00
Ivan Tashkinov
6ea3c06d8d
[ #1505 ] Minor refactoring.
2020-02-09 14:09:01 +03:00
Ivan Tashkinov
7c3991f59e
[ #1505 ] Fixed replies serialization (included objects' ids instead of activities' ids).
2020-02-09 10:17:21 +03:00
Ivan Tashkinov
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-08 19:59:37 +03:00
Ivan Tashkinov
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
2020-02-08 19:58:02 +03:00
Haelwenn
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
2020-02-07 16:10:43 +00:00
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
Egor Kislitsyn
8c71f7e11a
Add support for cancellation of a follow request
2020-02-05 20:22:15 +04:00
Ivan Tashkinov
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-05 07:56:36 +03:00
lain
a0d9d42eaa
Emoji Reactions: Actually use the validation.
2020-01-30 16:07:37 +01:00
lain
46915207b6
Remove whole_db parameter everywhere, it's not used anymore
2020-01-28 14:40:40 +01:00
Ivan Tashkinov
86e4d23acb
[ #1505 ] Background fetching of incoming activities' replies collections.
2020-01-25 10:47:30 +03:00
lain
34fc0ca053
Emoji reactions: Add sanity checks for the cache
2020-01-23 12:34:34 +01:00
Ivan Tashkinov
cf96c40057
[ #1505 ] Added Mastodon-compatible replies collection to Note federated representation.
2020-01-22 21:10:17 +03:00
rinpatch
6e6f1ead31
Merge branch 'no-error-404' into 'develop'
...
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
2020-01-22 17:55:49 +00:00
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
2020-01-22 17:13:17 +00:00
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
2020-01-21 10:32:27 +03:00
lain
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
Haelwenn (lanodan) Monnier
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
2020-01-19 07:06:15 +01:00
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
2020-01-14 14:52:00 +03:00
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
2020-01-12 12:12:15 -06:00
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be
2020-01-11 12:15:42 +03:00
Alex S
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
Maksim Pechnikov
70410dfafd
fix create service actor
2020-01-08 16:40:49 +03:00
rinpatch
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
2019-12-21 11:56:24 +00:00
Maksim Pechnikov
7bd0bca2ab
fixed remote follow
2019-12-20 16:33:44 +03:00
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
2019-12-19 19:26:46 +07:00
