squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,596 Commits 154 Branches 42 Tags 503 MiB
2420d7f439
Commit Graph

9596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9b26d1608f Merge branch 'release/1.1.2' into 'stable' 
1.1.2 Release

See merge request pleroma/pleroma!1863
 2019-10-18 21:44:14 +00:00
rinpatch
59d447d555 pleroma_ctl: Fix attempting to use RPC for config generation 2019-10-19 00:41:26 +03:00
rinpatch
1a063c92ab Bump version to 1.1.2 in mix.exs 2019-10-19 00:40:23 +03: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
rinpatch
bb73f100b8 Merge branch 'release/1.1.1' into 'stable' 
1.1.1 Release

See merge request pleroma/pleroma!1857
 2019-10-18 12:08:03 +00:00
rinpatch
c00b55bc80 Add a changelog entry for user search refactoring 2019-10-18 14:57:13 +03:00
rinpatch
eca86330b4 Remove a failing search test due to it being unrealistic 
While the case tested (`lain@ple`) gives wrong ordering due to
using only trigram to order, it almost never happens in reality. In reality
it would be either `lain` (in which case it's fine to list the user with `lain`
in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is
handled fine as well)
 2019-10-18 14:56:27 +03:00
rinpatch
7a00acb3e4 Order fts results by trigram 2019-10-18 14:56:20 +03:00
rinpatch
713b2187b9 User search: Remove trigram and refactor the module 
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
 2019-10-18 14:56:14 +03:00