rinpatch [Sun, 17 Feb 2019 10:46:40 +0000 (13:46 +0300)]
Fix recipient count in hellthread policy
lambda [Fri, 15 Feb 2019 14:58:13 +0000 (14:58 +0000)]
Merge branch 'bugfix/oauth-token-padding' into 'develop'
oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825
rinpatch [Fri, 15 Feb 2019 13:18:35 +0000 (13:18 +0000)]
Merge branch 'hellthread-filter-fix' into 'develop'
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
Karen Konou [Fri, 15 Feb 2019 13:05:20 +0000 (14:05 +0100)]
Readd threshold is not 0 check, optmization?
Karen Konou [Fri, 15 Feb 2019 12:43:14 +0000 (13:43 +0100)]
Rename test, add check for follower collection when delisting
rinpatch [Fri, 15 Feb 2019 12:27:03 +0000 (12:27 +0000)]
Merge branch 'bugfix/actor-containment' into 'develop'
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
Karen Konou [Fri, 15 Feb 2019 11:47:50 +0000 (12:47 +0100)]
Add tests, change default config values, fix a bug
William Pitcock [Thu, 14 Feb 2019 19:59:12 +0000 (19:59 +0000)]
test: user: add a test for whether user search returns a user or not
William Pitcock [Thu, 14 Feb 2019 19:58:24 +0000 (19:58 +0000)]
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
get_or_fetch() handles the nickname verses URI differences transparently.
lambda [Thu, 14 Feb 2019 19:54:16 +0000 (19:54 +0000)]
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
William Pitcock [Thu, 14 Feb 2019 19:42:33 +0000 (19:42 +0000)]
activitypub: clean up logging statements a little
href [Thu, 14 Feb 2019 10:10:13 +0000 (10:10 +0000)]
Merge branch 'fix/mediaproxy-s3' into 'develop'
Fix S3 links encoding in Mediaproxy
Closes #580
See merge request pleroma/pleroma!828
Egor Kislitsyn [Thu, 14 Feb 2019 08:55:21 +0000 (15:55 +0700)]
fix S3 links encoding in Mediaproxy
kaniini [Thu, 14 Feb 2019 03:55:26 +0000 (03:55 +0000)]
Merge branch 'fix/credo-issues-test' into 'develop'
Fix credo issues in ./test
See merge request pleroma/pleroma!808
Haelwenn [Thu, 14 Feb 2019 03:40:33 +0000 (03:40 +0000)]
Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'
activitypub: user inbox/outbox: `totalItems` removal
See merge request pleroma/pleroma!827
William Pitcock [Thu, 14 Feb 2019 03:22:54 +0000 (03:22 +0000)]
tests: update tests for totalItems leak fix
William Pitcock [Thu, 14 Feb 2019 03:13:07 +0000 (03:13 +0000)]
activitypub: user view: formatting
William Pitcock [Thu, 14 Feb 2019 03:03:41 +0000 (03:03 +0000)]
activitypub: user view: report totalItems=0 for follows/followers when hidden
William Pitcock [Thu, 14 Feb 2019 03:02:45 +0000 (03:02 +0000)]
activitypub: user view: remove totalItems from user outbox
(this is based on a counter in User.Info, but the counter is not reliable.)
William Pitcock [Thu, 14 Feb 2019 03:01:39 +0000 (03:01 +0000)]
activitypub: user view: remove totalInbox from user inbox view
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
kaniini [Thu, 14 Feb 2019 02:50:06 +0000 (02:50 +0000)]
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
William Pitcock [Thu, 14 Feb 2019 02:41:21 +0000 (02:41 +0000)]
activitypub: user view: do not expose oAuth endpoints for instance users
William Pitcock [Thu, 14 Feb 2019 01:05:25 +0000 (01:05 +0000)]
oauth: never use base64 padding when returning tokens to applications
The normal Base64 alphabet uses the equals sign (=) as a padding character. Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.
William Pitcock [Thu, 14 Feb 2019 00:59:18 +0000 (00:59 +0000)]
tests: add some reserialization tests based on IR differences
William Pitcock [Thu, 14 Feb 2019 00:34:20 +0000 (00:34 +0000)]
activitypub: transmogrifier: correctly handle nil inReplyTo value
William Pitcock [Thu, 14 Feb 2019 00:27:35 +0000 (00:27 +0000)]
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
kaniini [Wed, 13 Feb 2019 23:42:11 +0000 (23:42 +0000)]
Merge branch 'feature/better-login-errors' into 'develop'
Improve login error for OAuth flow
See merge request pleroma/pleroma!824
Mark Felder [Wed, 13 Feb 2019 22:33:22 +0000 (22:33 +0000)]
Improve login error for OAuth flow
William Pitcock [Wed, 13 Feb 2019 19:48:24 +0000 (19:48 +0000)]
tests: add tests for endpoints
William Pitcock [Wed, 13 Feb 2019 19:20:41 +0000 (19:20 +0000)]
activitypub: user view: use route helpers instead of hardcoded URIs
William Pitcock [Tue, 12 Feb 2019 21:49:48 +0000 (21:49 +0000)]
activitypub: user view: add oauthRegistrationEndpoint to user profiles
William Pitcock [Tue, 12 Feb 2019 21:42:32 +0000 (21:42 +0000)]
activitypub: user view: fix up endpoints rendering
William Pitcock [Tue, 12 Feb 2019 21:37:37 +0000 (21:37 +0000)]
litepub schema: add oauthRegistrationEndpoint [ci skip]
William Pitcock [Tue, 12 Feb 2019 21:28:11 +0000 (21:28 +0000)]
user view: add AP C2S oauth endpoints to local user profiles
Karen Konou [Wed, 13 Feb 2019 15:23:09 +0000 (16:23 +0100)]
refactored code
Karen Konou [Tue, 12 Feb 2019 23:04:26 +0000 (00:04 +0100)]
Merge branch 'develop' into hellthread-filter-fix
rinpatch [Wed, 13 Feb 2019 13:04:23 +0000 (13:04 +0000)]
Merge branch 'mass-follow-fixes' into 'develop'
User.follow_all: Respect blocks in both directions.
See merge request pleroma/pleroma!823
lain [Wed, 13 Feb 2019 12:52:27 +0000 (13:52 +0100)]
User.follow_all: Respect blocks in both directions.
kaniini [Wed, 13 Feb 2019 07:51:14 +0000 (07:51 +0000)]
Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'
Mark streaming feature for desktop apps in Clients.md
See merge request pleroma/pleroma!818
Hakaba Hitoyo [Wed, 13 Feb 2019 07:51:14 +0000 (07:51 +0000)]
Mark streaming feature for desktop apps in Clients.md
kaniini [Wed, 13 Feb 2019 07:32:56 +0000 (07:32 +0000)]
Merge branch 'bugfix/mdii-uploader' into 'develop'
Bugfix for MDII Uploader
See merge request pleroma/pleroma!822
hakabahitoyo [Wed, 13 Feb 2019 06:46:42 +0000 (15:46 +0900)]
bugfix mdii uploader
Karen Konou [Tue, 12 Feb 2019 22:25:09 +0000 (23:25 +0100)]
added checks for public url and follower collections
kaniini [Tue, 12 Feb 2019 22:41:46 +0000 (22:41 +0000)]
Merge branch 'feature/csp_mastofe-dev' into 'develop'
Add CSP for mastofe development, remove secure-cookies in MIX_ENV=dev
See merge request pleroma/pleroma!820
Haelwenn (lanodan) Monnier [Sat, 2 Feb 2019 18:06:26 +0000 (19:06 +0100)]
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
Haelwenn (lanodan) Monnier [Fri, 1 Feb 2019 12:10:50 +0000 (13:10 +0100)]
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
This is needed to run dev mode mastofe at the same time
Haelwenn (lanodan) Monnier [Thu, 22 Nov 2018 06:12:13 +0000 (07:12 +0100)]
config/dev.exs: Don’t put secure cookies on dev
Haelwenn [Tue, 12 Feb 2019 02:44:23 +0000 (02:44 +0000)]
Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'
Fix CSP check for 'upgrade-insecure-requests'
See merge request pleroma/pleroma!814
Haelwenn [Tue, 12 Feb 2019 02:35:15 +0000 (02:35 +0000)]
Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'
Mark streaming feature for mobile/web apps in Clients.md
See merge request pleroma/pleroma!816
[ci skip]
Hakaba Hitoyo [Tue, 12 Feb 2019 02:35:15 +0000 (02:35 +0000)]
Mark streaming feature for mobile/web apps in Clients.md
shibayashi [Mon, 11 Feb 2019 23:08:52 +0000 (00:08 +0100)]
Use url[:scheme] instead of protocol to determine if https is enabled
kaniini [Mon, 11 Feb 2019 18:45:15 +0000 (18:45 +0000)]
Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'
Filter summary field in KeywordPolicy
See merge request pleroma/pleroma!812
rinpatch [Mon, 11 Feb 2019 18:35:40 +0000 (21:35 +0300)]
Filter summary in keywordpolicy
rinpatch [Mon, 11 Feb 2019 15:02:14 +0000 (15:02 +0000)]
Merge branch 'feature/thread-muting' into 'develop'
Feature/thread muting
See merge request pleroma/pleroma!796
lambda [Mon, 11 Feb 2019 12:33:58 +0000 (12:33 +0000)]
Merge branch 'feature/rich-media-limits' into 'develop'
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
Karen Konou [Mon, 11 Feb 2019 11:10:10 +0000 (12:10 +0100)]
Merge branch 'develop' into feature/thread-muting
Karen Konou [Mon, 11 Feb 2019 10:59:51 +0000 (11:59 +0100)]
Refactor as per Rin's suggestions, add endpoint tests
lambda [Mon, 11 Feb 2019 08:22:54 +0000 (08:22 +0000)]
Merge branch 'revert-
e0de0fcf' into 'develop'
Revert "Merge branch 'object-creation' into 'develop'"
See merge request pleroma/pleroma!810
lambda [Mon, 11 Feb 2019 08:07:39 +0000 (08:07 +0000)]
Revert "Merge branch 'object-creation' into 'develop'"
This reverts merge request !802
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 23:08:48 +0000 (00:08 +0100)]
test: Change `lenght(…) == 0` to `Enum.empty?(…)`
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 21:57:38 +0000 (22:57 +0100)]
test: de-group alias/es
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 21:56:47 +0000 (22:56 +0100)]
.credo.exs: Add test directory as well
William Pitcock [Sun, 10 Feb 2019 21:37:51 +0000 (21:37 +0000)]
rich media: tighten fetching timeouts and size limits
kaniini [Sun, 10 Feb 2019 21:28:41 +0000 (21:28 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
Update Mastodon Frontend to 2019-02-10 bundle
See merge request pleroma/pleroma!806
kaniini [Sun, 10 Feb 2019 21:16:29 +0000 (21:16 +0000)]
Merge branch 'feather_mention' into 'develop'
Add Feather to the clients list
See merge request pleroma/pleroma!804
kaniini [Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)]
Merge branch 'fix/credo-issues' into 'develop'
Fix credo issues
See merge request pleroma/pleroma!786
kaniini [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'
Update service files of OpenRC and systemd to new recommended paths
See merge request pleroma/pleroma!798
shibayashi [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Update service files of OpenRC and systemd to new recommended paths
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 18:55:22 +0000 (19:55 +0100)]
Update Mastodon Frontend to 2019-02-10 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10
[ci skip]
succfemboi [Sun, 10 Feb 2019 15:18:04 +0000 (16:18 +0100)]
add feather to webclients
lambda [Sun, 10 Feb 2019 14:21:12 +0000 (14:21 +0000)]
Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'
Recommend the acme-challenge path that is used in the installation guides
See merge request pleroma/pleroma!803
lambda [Sun, 10 Feb 2019 13:47:26 +0000 (13:47 +0000)]
Merge branch 'docs/pleroma-clients' into 'develop'
docs/Clients.md: Add documentation about clients supporting pleroma
See merge request pleroma/pleroma!726
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 13:42:32 +0000 (14:42 +0100)]
docs/Clients.md: Add Nekonium
[ci skip]
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 13:24:48 +0000 (14:24 +0100)]
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically
[ci skip]
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:39:29 +0000 (18:39 +0100)]
docs/Clients.md: Add Social (GNOME)
[ci skip]
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:28:25 +0000 (18:28 +0100)]
docs/Clients.md: Add per-type sections
helps differenciate between Electrons and others like Brutaldon.
[ci skip]
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:20:10 +0000 (18:20 +0100)]
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 04:50:08 +0000 (05:50 +0100)]
WIP: docs/Clients.md: Add documentation about clients supporting pleroma
[ci skip]
Karen Konou [Sun, 10 Feb 2019 08:31:20 +0000 (09:31 +0100)]
refactor, status view updating, error handling
rinpatch [Sun, 10 Feb 2019 07:39:27 +0000 (07:39 +0000)]
Merge branch 'object-creation' into 'develop'
Do object insertion through Cachex
See merge request pleroma/pleroma!802
shibayashi [Sat, 9 Feb 2019 22:08:27 +0000 (23:08 +0100)]
Recommend the acme-challenge path that is used in the installation guides
kaniini [Sat, 9 Feb 2019 21:03:42 +0000 (21:03 +0000)]
Merge branch 'follow-enhancements' into 'develop'
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
lain [Sat, 9 Feb 2019 21:01:08 +0000 (22:01 +0100)]
Do object insertion through Cachex
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
Karen Konou [Sat, 9 Feb 2019 19:52:11 +0000 (20:52 +0100)]
Add unique index and unique constraint check, uniqueness test fails
Karen Konou [Sat, 9 Feb 2019 17:34:00 +0000 (18:34 +0100)]
Merged "check mute" test into the other two
Karen Konou [Sat, 9 Feb 2019 17:08:46 +0000 (18:08 +0100)]
elixir too new for CI's mix format lol
Karen Konou [Sat, 9 Feb 2019 16:47:57 +0000 (17:47 +0100)]
it works!!
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:30:42 +0000 (16:30 +0100)]
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:20:18 +0000 (16:20 +0100)]
de-group import/s
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:16:26 +0000 (16:16 +0100)]
de-group alias/es
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 13:39:27 +0000 (14:39 +0100)]
HTML.Scrubber.Default: Consistency
Haelwenn (lanodan) Monnier [Fri, 8 Feb 2019 16:18:44 +0000 (17:18 +0100)]
Stash
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:19:35 +0000 (21:19 +0100)]
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:24:57 +0000 (21:24 +0100)]
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:04:11 +0000 (21:04 +0100)]
Web.Federator: Fix unused variable
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 19:20:02 +0000 (20:20 +0100)]
Credo fixes: alias grouping/ordering
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 19:19:39 +0000 (20:19 +0100)]
Credo fixes: parameter consistency
Haelwenn (lanodan) Monnier [Sun, 3 Feb 2019 17:44:18 +0000 (18:44 +0100)]
Make credo happy
Karen Konou [Sat, 9 Feb 2019 13:34:42 +0000 (14:34 +0100)]
added another test
Karen Konou [Sat, 9 Feb 2019 13:23:51 +0000 (14:23 +0100)]
Made a test!
projects / akkoma / log