c1665fd94d
Update CHANGELOG
2019-05-14 18:40:21 +07:00
b92c004ea8
Reuse query from User.restrict_deactivated/1
2019-05-14 18:29:10 +07:00
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
cdcdbd88da
Merge branch 'changelog/adminfe' into 'develop'
...
Document AdminFE in changelog
See merge request pleroma/pleroma!1147
2019-05-13 21:27:07 +00:00
6e1538cb76
Document AdminFE in changelog
2019-05-13 16:11:06 -05:00
119b758412
Merge branch 'bump-mastoapi' into 'develop'
...
Bump Mastodon API level
See merge request pleroma/pleroma!1146
2019-05-13 21:07:50 +00:00
bbacdf2352
Bump Mastodon API level
2019-05-13 15:52:16 -05:00
a0ec7326f9
Merge branch 'refactor/jason' into 'develop'
...
Switch to Jason over Poison
See merge request pleroma/pleroma!1145
2019-05-13 20:47:26 +00:00
498bfdf403
Switch to Jason over Poison
2019-05-13 15:37:38 -05:00
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
2019-05-13 18:58:04 +00:00
f3e8f5b1f2
Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'
...
Features/mastoapi/2.7.0 registration
Closes #773
See merge request pleroma/pleroma!1134
2019-05-13 18:35:45 +00:00
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
5a4d55cf91
Merge branch 'filter-irreversible' into 'develop'
...
Make irreversible field, default to false in filters
See merge request pleroma/pleroma!1144
2019-05-13 18:34:52 +00:00
7701a4c841
Make irreversible field default to false in filters
2019-05-14 00:13:15 +05:45
16cb9e5f1c
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
...
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
See merge request pleroma/pleroma!1139
2019-05-13 15:52:05 +00:00
17f7c5e290
Merge branch 'fix/unfollows-not-working' into 'develop'
...
Normalize the object in `create_or_bump_for` only after ensuring the activity type is Create
Closes #874
See merge request pleroma/pleroma!1138
2019-05-13 07:39:12 +00:00
15cda998f3
Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
2019-05-13 10:32:04 +03:00
44b182732e
nodeinfo: gather supported protocol names from federation modules
2019-05-12 19:15:29 +00:00
28f7f4c6de
webfinger: build the response based on enabled federation modules
2019-05-12 19:05:03 +00:00
80759f012e
xml builder: properly escape quotes
2019-05-12 19:04:37 +00:00
582bd9d170
tests: fix AP test failures
2019-05-12 14:40:57 +00:00
d823eb921b
tests: fix salmon tests
2019-05-12 14:35:38 +00:00
3ded995253
Merge branch 'update-changelog' into 'develop'
...
Update changelog
See merge request pleroma/pleroma!1141
2019-05-12 13:22:13 +00:00
2a4e41acb4
update changelog
2019-05-12 13:13:13 +05:45
2b847d4add
tests: chase federator publish_single_foo removals
2019-05-12 05:04:24 +00:00
55fa4b812a
federator: websub removal
2019-05-12 05:04:24 +00:00
c23276a59a
activitypub: publisher: fixups
2019-05-12 05:04:24 +00:00
fedaca15a3
websub: adapt to work as a federator publishing module
2019-05-12 05:04:24 +00:00
179293e51c
salmon: refactor to work as a federator publishing module
2019-05-12 05:04:21 +00:00
2aee62a456
federator: publisher: only attempt publishing if we know the activity is representable
2019-05-12 05:04:16 +00:00
69158f1065
ostatus: only as:Public activities are representable
2019-05-12 05:04:16 +00:00
85377c0b67
federator: move activitypub relaying to the AP publisher module
2019-05-12 05:04:16 +00:00
676752bb83
federator: hook up Publisher.publish()
2019-05-12 05:04:16 +00:00
f7a6a37c4e
federator: remove no longer used :publish_single_ap
2019-05-12 05:04:16 +00:00
10695a28d2
federator: publisher: add publish() wrapper
2019-05-12 05:04:16 +00:00
0afc8d7856
federator: publisher: integrate job queue, simplify publish_one logic
2019-05-12 05:04:16 +00:00
ef1f9e8d4e
activitypub: split out outgoing federation into a federation module
2019-05-12 05:04:11 +00:00
566a968ab3
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
...
Commissioned by https://shitposter.club/users/moonman and
drawn by https://shpposter.club/users/Nightingalle
Intended to be used when mastofe crashes out and allows to report a bug
among other things.
Should require a bit of modification on mastofe to use the image as it's more
of a vanilla flavour thing.
2019-05-12 05:09:15 +02:00
e7d292f80e
federator: add publisher module defining a contract for publishing behaviours
2019-05-12 03:08:50 +00:00
b9f84a382a
Normalize the object only after ensuring the activity type is Create
2019-05-12 03:01:42 +03:00
131f883207
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
2019-05-11 16:52:26 +00:00
8caea9be72
Merge branch 'fix/readme-release' into 'develop'
...
Update release info in README.md
See merge request pleroma/pleroma!1133
2019-05-11 16:51:47 +00:00
1cb7a15727
Merge branch 'uniform-admin-api-url' into 'develop'
...
make user related url uniform in admin api
See merge request pleroma/pleroma!1135
2019-05-11 16:51:23 +00:00
f01f995816
make url uniform in admin api
2019-05-11 14:46:00 +05:45
03dc19e7b0
Update release info in README.md
...
Removed mention that there is no release of Pleroma (there actually has
been a few the last couple of months).
2019-05-11 02:55:12 -04:00
8d13c42926
Merge branch 'feature/adminfe' into 'develop'
...
Feature/adminfe
See merge request pleroma/pleroma!1116
2019-05-11 01:34:17 +00:00
c953ae8c3d
Initial bundle of basic AdminFE
...
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
2019-05-11 01:34:17 +00:00
1d78e42fd4
Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
2019-05-10 13:49:34 +03:00
17d01869ea
Merge branch 'fix/retweet-language' into 'develop'
...
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
Closes pleroma-fe#533
See merge request pleroma/pleroma!1130
2019-05-10 09:49:46 +00:00
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
2019-05-09 19:58:34 -04:00
Egor Kislitsyn