Commit graph

7429 commits

Author SHA1 Message Date
Haelwenn
cec4b00140 Merge branch 'mark-all-conversations-as-read' into 'develop'
Pleroma API: `POST /api/v1/pleroma/conversations/read`

See merge request pleroma/pleroma!1830
2019-10-19 19:55:16 +00:00
rinpatch
289f011e0a Merge branch 'develop-version-bump' into 'develop'
mix.exs: Bump version for develop builds

See merge request pleroma/pleroma!1866
2019-10-19 19:13:00 +00:00
rinpatch
f94e28e8b6 mix.exs: Bump version for develop builds
As per discussion on irc, we already used GNU-style versioning system
for release candidates, so it makes sense to use it for develop builds as well.
2019-10-19 22:00:35 +03:00
eugenijm
52ed2f8f2d Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read 2019-10-19 15:24:06 +03:00
KokaKiwi
df3c2dfd8b Add documentation for PWA manifest configuration. 2019-10-19 12:15:16 +02:00
KokaKiwi
638457ba94 MastoFE: Add PWA manifest. 2019-10-19 12:15:14 +02:00
rinpatch
fd6d05dc45 Merge branch 'mix-emoji-task-pack-json' into 'develop'
For pleroma.emoji downloaded packs, generate pack.json instead

See merge request pleroma/pleroma!1748
2019-10-19 08:51:03 +00:00
Mark Felder
dcb23a85b6 Merge branch 'develop' into feature/push-subject-for-dm 2019-10-18 17:56:15 -05:00
Mark Felder
152caef51d Direct messages should provide a distinct push notification subject 2019-10-18 17:51:34 -05:00
rinpatch
5c6c3026ea Merge branch 'patch-1' into 'develop'
Fix a typo in default static directory configuration for OTP releases

Closes #1289

See merge request pleroma/pleroma!1829
2019-10-18 22:29:04 +00:00
rinpatch
0341f6f779 Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
pleroma_ctl: Fix attempting to use RPC for config generation

See merge request pleroma/pleroma!1862
2019-10-18 21:40:07 +00:00
rinpatch
901bf0fb8c pleroma_ctl: Fix attempting to use RPC for config generation 2019-10-19 00:37:39 +03:00
kaniini
c25a81b173 Merge branch 'feature/relay-list' into 'develop'
Admin API: Ability to list all followed relays

See merge request pleroma/pleroma!1835
2019-10-18 16:51:04 +00:00
Maxim Filippov
019147f115 Merge branch 'develop' into feature/relay-list 2019-10-18 18:35:58 +02:00
kaniini
4053a82f41 Merge branch 'feature/ostatus-removal' into 'develop'
ostatus removal

Closes #1145

See merge request pleroma/pleroma!1854
2019-10-18 16:04:57 +00:00
Ariadne Conill
c2ae6310dc tests: mastodon api: fix broken test that used OStatus 2019-10-18 15:46:46 +00:00
Ariadne Conill
44e64af5e7 object: containment: simplify the pattern match for OStatus testsuite hack 2019-10-18 15:39:15 +00:00
Ariadne Conill
e99fdfc32d object: containment: only allow OStatus references in test suite environment 2019-10-18 15:37:14 +00:00
Ariadne Conill
a8eb1f0975 tests: mastodon search: search for an account that is visible via activitypub, not ostatus 2019-10-18 14:50:10 +00:00
Ariadne Conill
3c785b85a6 object: fetcher: fix up formatting 2019-10-18 14:50:10 +00:00
Ariadne Conill
dbfdb1f6e3 add some missing tesla fixtures 2019-10-18 14:50:10 +00:00
Ariadne Conill
bae96de273 activitypub: tag containment checks for better error tracing 2019-10-18 14:50:10 +00:00
Ariadne Conill
7295a05cee object: containment: also allow OStatus object IDs through when comparing origins 2019-10-18 14:50:10 +00:00
Ariadne Conill
a177f22e02 object: fetcher: improve error reporting 2019-10-18 14:50:10 +00:00
Ariadne Conill
bf2107743f object: containment: don't try to contain ostatus objects 2019-10-18 14:50:10 +00:00
Ariadne Conill
85ddcaf418 tests: fix up signature tests 2019-10-18 14:50:10 +00:00
Ariadne Conill
700c654208 tests: fix relay tests 2019-10-18 14:50:10 +00:00
Ariadne Conill
6f110fc04c object fetcher: fix up error handling 2019-10-18 14:50:09 +00:00
Ariadne Conill
af9aa8e358 tests: simplify object fetching and containment tests 2019-10-18 14:50:09 +00:00
Ariadne Conill
597cb8897b tests: remove some more ostatus tests 2019-10-18 14:50:09 +00:00
Ariadne Conill
48059c03c9 fix up some tests 2019-10-18 14:50:09 +00:00
Ariadne Conill
d379b48769 kill almost all of the OStatus module 2019-10-18 14:50:09 +00:00
Ariadne Conill
6a1f4c5145 federator: remove OStatus incoming document support 2019-10-18 14:50:09 +00:00
Ariadne Conill
835ad52378 remove Salmon module 2019-10-18 14:50:09 +00:00
Ariadne Conill
beb9861f9d router: disconnect Salmon 2019-10-18 14:50:09 +00:00
Ariadne Conill
a7b92bba68 webfinger: stop pulling Salmon data out of WebFinger 2019-10-18 14:50:09 +00:00
Ariadne Conill
c00ae10af8 feed: don't advertise salmon endpoint 2019-10-18 14:50:09 +00:00
Ariadne Conill
adb639db56 publisher: move remote_users() from Salmon module 2019-10-18 14:50:09 +00:00
Ariadne Conill
4f82e42e4e websub: remove entirely 2019-10-18 14:50:09 +00:00
Ariadne Conill
b16a460916 federator: remove websub stuff 2019-10-18 14:50:09 +00:00
Ariadne Conill
25b7ff56c3 application: don't start Federator.init/1 anymore 2019-10-18 14:50:09 +00:00
Ariadne Conill
c6de0cbb4a config: disable Websub and Salmon publisher modules 2019-10-18 14:50:09 +00:00
Ariadne Conill
4e270964d7 update changelog 2019-10-18 14:50:09 +00:00
rinpatch
223c0c0136 Merge branch 'fix/changelog-typo' into 'develop'
Fix wrong list level in the changelog

See merge request pleroma/pleroma!1860
2019-10-18 13:00:33 +00:00
rinpatch
c2f1cc4f16 Fix wrong list level in the changelog 2019-10-18 15:56:14 +03:00
rinpatch
153f652d41 Merge branch 'chore/develop-changelog-sync' into 'develop'
Sync the changelog from stable and collapse the API sections

See merge request pleroma/pleroma!1859
2019-10-18 12:47:45 +00:00
rinpatch
09c1e7a82e Sync the changelog from stable and collapse the API sections 2019-10-18 15:46:51 +03:00
rinpatch
30a59ae97d Merge branch 'backport/develop-safe-jsonb' into 'develop'
Backport safe_jsonb_set fixes to develop

See merge request pleroma/pleroma!1858
2019-10-18 12:42:09 +00:00
rinpatch
b085cd2660 Add a test for safe_jsonb_set 2019-10-18 15:22:16 +03:00
rinpatch
39e996528c Fix a migration wiping user info of users that don't have any mutes
And introduce safe_jsonb_set
2019-10-18 15:22:07 +03:00