sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6642 commits 2 branches 40 tags 290 MiB
Commit graph

6642 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
rinpatch
4123c9db07 Bump the version in mix.exs 2019-10-18 14:53:13 +03:00
rinpatch
deee9f3196 Merge branch 'bugfix/jsonb-set-fuckup' into 'release/1.1.1' 
Fix a migration wiping user info of users that don't have any mutes

See merge request pleroma/pleroma!1856
 2019-10-18 11:49:27 +00:00
rinpatch
41c47639e3 Add a changelog entry for yet another jsonb_set data loss 2019-10-18 14:40:47 +03:00
rinpatch
98c9affc48 Add a test for safe_jsonb_set 2019-10-18 14:33:51 +03:00
rinpatch
a1c4a5d7cf Fix a migration wiping user info of users that don't have any mutes 
And introduce safe_jsonb_set
 2019-10-18 14:11:30 +03:00
rinpatch
c00797d08e Merge branch 'fix/version-branch-skip' into 'stable' 
Fix hiding branch name logic

See merge request pleroma/pleroma!1845
 2019-10-14 19:14:47 +00:00
rinpatch
0733da3205 Fix hiding branch name logic 2019-10-14 22:13:18 +03:00
rinpatch
988654a720 Merge branch 'stable-fix-docs' into 'stable' 
Fix documentation deploy for stable

See merge request pleroma/pleroma!1844
 2019-10-14 18:55:09 +00:00
rinpatch
dd859e6847 Fix documentation deploy for stable 2019-10-14 21:54:13 +03:00
rinpatch
442acb31ac Fix pleroma_ctl link 2019-10-14 21:29:47 +03:00
rinpatch
832d892c2c Merge branch 'final-release-prep' into 'maint/1.1' 
Final 1.1 release preparations

See merge request pleroma/pleroma!1843
 2019-10-14 18:21:49 +00:00
rinpatch
8ef4afcc3b Final 1.1 release preparations 2019-10-14 21:20:29 +03:00
rinpatch
13966f1504 Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1' 
Backport/1.1 branch name change

See merge request pleroma/pleroma!1841
 2019-10-14 16:47:27 +00:00
rinpatch
2b6cd10b68 Correct version parser branch name detection 2019-10-14 19:34:38 +03:00
rinpatch
164f42c5f8 Add a changelog entry for branch-moving 2019-10-14 19:34:29 +03:00
rinpatch
bbe409c914 Prepare pleroma_ctl for moving master to stable and relax the error 
message
 2019-10-14 19:34:06 +03:00
rinpatch
3d3c166e59 Preparations for renaming master to stable 2019-10-14 19:33:57 +03:00
rinpatch
1f99abbeba Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1' 
Backport mediaproxy failure tracking enchancements to maint

See merge request pleroma/pleroma!1837
 2019-10-12 14:54:49 +00:00
rinpatch
a8afbe977a Merge branch 'fix/mediaproxy-too-brutal' into 'develop' 
Make MediaProxy failure tracking less brutal

See merge request pleroma/pleroma!1836

(cherry picked from commit 930cbd6d05)

9bdbf081 Make MediaProxy failure tracking less brutal
 2019-10-12 14:43:20 +00:00
rinpatch
d9410c488a Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1' 
Backport pleroma-ctl enchancements to maint

See merge request pleroma/pleroma!1833
 2019-10-11 19:39:37 +00:00
Haelwenn
fbbb032bc5 Merge branch 'pleroma-ctl-enchancements' into 'develop' 
pleroma_ctl: Make it possible to specify branches/flavours when updating

See merge request pleroma/pleroma!1832

(cherry picked from commit 44afe4c887)

b750135a pleroma_ctl: Make it possible to specify branches/flavours when updating
 2019-10-11 10:57:30 +00:00
kaniini
ac113f6724 Merge branch 'backport/exclude-replies' into 'maint/1.1' 
mastodon api: fix exclude_replies (closes #1287)

See merge request pleroma/pleroma!1816
 2019-10-07 13:12:46 +00:00
Ariadne Conill
3e1d2ace73 mastodon api: fix exclude_replies (closes #1287) 2019-10-07 13:01:05 +00:00
kaniini
72bd763d9f Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1' 
update changelog date

See merge request pleroma/pleroma!1812
 2019-10-07 12:14:56 +00:00
Ariadne Conill
129fb9f499 update changelog date 2019-10-07 12:14:04 +00:00
kaniini
d928f0c4c3 Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1' 
Pleroma 1.0.91 (aka 1.1 RC2).

See merge request pleroma/pleroma!1811
 2019-10-07 12:12:45 +00:00
Ariadne Conill
c5b7d2ef26 Pleroma 1.0.91 (aka 1.1 RC2). 2019-10-07 12:10:57 +00:00
kaniini
079d069eb4 Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1' 
backport: Mastodon API: Fix private and direct statuses not being filtered out from the...

See merge request pleroma/pleroma!1807
 2019-10-07 11:40:31 +00:00
kaniini
cb36fe0128 Merge branch 'backport/chore-context-cleanups' into 'maint/1.1' 
clean up bundled litepub schema (closes #1303)

See merge request pleroma/pleroma!1809
 2019-10-07 11:37:01 +00:00
Ariadne Conill
d3e04d5590 clean up bundled litepub schema (closes #1303) 2019-10-07 11:36:05 +00:00
eugenijm
790ae8e189 Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public) 2019-10-07 11:28:51 +00:00
kaniini
f6ff19e074 Merge branch 'backport/custom-field-update' into 'maint/1.1' 
Backport: custom field update

See merge request pleroma/pleroma!1805
 2019-10-06 15:33:33 +00:00
rinpatch
b5e6ba323d Merge branch 'backport/key-moveout-1.1' into 'maint/1.1' 
Backport moving out keys from user info to 1.1

See merge request pleroma/pleroma!1801
 2019-10-06 15:32:33 +00:00
Ariadne Conill
c6b7980303 changelog 2019-10-06 15:21:18 +00:00
rinpatch
e442180d11 Fix muted notification migration only working with a schema 
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
 2019-10-06 18:20:24 +03:00
kPherox
c5338764df Extract if block into private function 2019-10-06 15:14:53 +00:00
kPherox
cc84563796 Update test for custom fields when content-type urlencoded 2019-10-06 15:14:46 +00:00
kPherox
86bc83efe5 Update test for custom fields when name empty string 2019-10-06 15:14:39 +00:00
kPherox
db6c5aa66a Change to delete empty name field 2019-10-06 15:14:31 +00:00
kPherox
313b134fac Fix type of fields_attributes 
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
 2019-10-06 15:14:27 +00:00
kPherox
81abee22b6 Rename fields to fields_attributes 2019-10-06 15:14:21 +00:00
kaniini
8a52f30356 Merge branch 'backport/feature-poll-refresh' into 'maint/1.1' 
backport: poll refreshing

See merge request pleroma/pleroma!1804
 2019-10-06 15:07:38 +00:00
kaniini
10f4ce848a Merge branch 'backport/fix-report-email' into 'maint/1.1' 
backport: Use the user.id instead of nickname in report URLs

See merge request pleroma/pleroma!1802
 2019-10-06 14:59:58 +00:00