lambda [Sun, 17 Jun 2018 10:33:08 +0000 (10:33 +0000)]
Merge branch 'patch-2' into 'develop'
Comment for Old Servers
See merge request pleroma/pleroma!224
Artik Banana [Sat, 16 Jun 2018 18:14:05 +0000 (18:14 +0000)]
Add comment about TLS curves for older servers.
lambda [Sat, 16 Jun 2018 10:39:36 +0000 (10:39 +0000)]
Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
Configs for mrf_rejectnonpublic
See merge request pleroma/pleroma!205
eal [Fri, 15 Jun 2018 20:43:30 +0000 (20:43 +0000)]
Merge branch 'bugfix/mastofe_thread_render' into 'develop'
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads
See merge request pleroma/pleroma!223
Haelwenn (lanodan) Monnier [Fri, 15 Jun 2018 19:37:29 +0000 (21:37 +0200)]
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
lain [Fri, 15 Jun 2018 20:01:17 +0000 (22:01 +0200)]
Fix typo
lambda [Thu, 14 Jun 2018 19:11:30 +0000 (19:11 +0000)]
Merge branch 'fix/missing-file-extension' into 'develop'
Add missing file extension if file does not have one
See merge request pleroma/pleroma!222
Francis Dinh [Thu, 14 Jun 2018 16:12:38 +0000 (12:12 -0400)]
Add missing file extension if file does not have one
lambda [Thu, 14 Jun 2018 13:55:50 +0000 (13:55 +0000)]
Merge branch 'fix/mp3-recognition' into 'develop'
upload.ex: add MPEG Layer 3 file header.
See merge request pleroma/pleroma!221
eal [Thu, 14 Jun 2018 13:41:08 +0000 (16:41 +0300)]
upload.ex: add MPEG Layer 3 file header.
lambda [Thu, 14 Jun 2018 07:23:14 +0000 (07:23 +0000)]
Merge branch 'patch-2' into 'develop'
* fix nginx 1.15 warning:
See merge request pleroma/pleroma!213
lambda [Thu, 14 Jun 2018 07:20:54 +0000 (07:20 +0000)]
Merge branch 'bugfix/mrf-orphaning' into 'develop'
activitypub transmogrifier: handle activity lookup failure
Closes #156
See merge request pleroma/pleroma!216
lambda [Thu, 14 Jun 2018 07:19:36 +0000 (07:19 +0000)]
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
lambda [Thu, 14 Jun 2018 07:14:18 +0000 (07:14 +0000)]
Merge branch 'bugfix/oauth2-param-name' into 'develop'
oauth: support either name or username parameter with grant_type=password
Closes #180
See merge request pleroma/pleroma!219
lambda [Thu, 14 Jun 2018 07:13:05 +0000 (07:13 +0000)]
Merge branch 'bugfix/oauth-password-with-email' into 'develop'
oauth: fix password-based login when username is email address
Closes #199
See merge request pleroma/pleroma!220
lambda [Thu, 14 Jun 2018 07:12:21 +0000 (07:12 +0000)]
Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'
streamer: don't relay boosts of messages which would otherwise be blocked
Closes #204
See merge request pleroma/pleroma!215
William Pitcock [Thu, 14 Jun 2018 02:29:52 +0000 (02:29 +0000)]
oauth: fix password-based login when username is email address
closes #199
William Pitcock [Thu, 14 Jun 2018 01:45:10 +0000 (01:45 +0000)]
oauth: support either name or username parameter with grant_type=password
closes #180
Francis Dinh [Thu, 14 Jun 2018 01:45:27 +0000 (21:45 -0400)]
fixup test
Francis Dinh [Thu, 14 Jun 2018 01:29:55 +0000 (21:29 -0400)]
Add unretweet TwAPI endpoint and cleanup AP.unannounce
William Pitcock [Wed, 13 Jun 2018 22:14:53 +0000 (22:14 +0000)]
activitypub transmogrifier: handle activity lookup failure
with the introduction of MRF, it is possible that an activity may be orphaned from it's parent, if
an activity in the chain was rejected by the active MRF policies. accordingly, handle this in the
same way as any other orphaned activity.
closes #156
William Pitcock [Wed, 13 Jun 2018 21:57:14 +0000 (21:57 +0000)]
streamer: don't relay boosts of messages which would otherwise be blocked
dex [Wed, 13 Jun 2018 09:54:23 +0000 (09:54 +0000)]
* fix nginx 1.15 warning:
nginx: [warn] the "ssl" directive is deprecated, use the "listen ... ssl" directive instead
lambda [Wed, 13 Jun 2018 07:18:03 +0000 (07:18 +0000)]
Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'
webfinger: send JRD by default instead of XRD
See merge request pleroma/pleroma!211
William Pitcock [Wed, 13 Jun 2018 06:56:14 +0000 (06:56 +0000)]
webfinger: send JRD by default instead of XRD
JRD being the default representation for WebFinger responses was standardized 5 years ago in
RFC 7033.
lambda [Wed, 13 Jun 2018 07:02:12 +0000 (07:02 +0000)]
Merge branch 'bugfix/webfinger-refactoring' into 'develop'
webfinger: refactor webfinger() functions
Closes #212
See merge request pleroma/pleroma!210
William Pitcock [Wed, 13 Jun 2018 06:37:02 +0000 (06:37 +0000)]
webfinger: refactor webfinger() functions
- remove code duplication
- move user lookup to parent with statement
- tighten both user lookup by nickname and activitypub URI with a type constraint
squidboi [Wed, 13 Jun 2018 04:40:22 +0000 (21:40 -0700)]
newlines
squidboi [Wed, 13 Jun 2018 04:38:28 +0000 (21:38 -0700)]
split lines, explicitly advised against editing default config files
lain [Tue, 12 Jun 2018 17:37:31 +0000 (19:37 +0200)]
update frontend
eal [Tue, 12 Jun 2018 12:42:40 +0000 (15:42 +0300)]
set_moderator: ensureall applications are started.
lambda [Tue, 12 Jun 2018 12:11:04 +0000 (12:11 +0000)]
Merge branch 'patch-2' into 'develop'
Proposal: Default Avatar Replacement
See merge request pleroma/pleroma!209
Artik Banana [Tue, 12 Jun 2018 11:55:38 +0000 (11:55 +0000)]
Replace avi.png with the Pleroma logo
lambda [Tue, 12 Jun 2018 08:26:26 +0000 (08:26 +0000)]
Merge branch 'develop' into 'develop'
Dedupe uploads
See merge request pleroma/pleroma!115
lambda [Tue, 12 Jun 2018 07:23:45 +0000 (07:23 +0000)]
Update sample_config.eex
lambda [Tue, 12 Jun 2018 07:19:45 +0000 (07:19 +0000)]
Merge branch 'feature/list-streaming' into 'develop'
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
lambda [Tue, 12 Jun 2018 07:18:19 +0000 (07:18 +0000)]
Merge branch 'feature/locked-accounts-part-1' into 'develop'
locked accounts
See merge request pleroma/pleroma!180
lambda [Tue, 12 Jun 2018 07:12:39 +0000 (07:12 +0000)]
Merge branch 'patch-2' into 'develop'
Nginx Config - Security Upgrades
See merge request pleroma/pleroma!207
William Pitcock [Mon, 11 Jun 2018 23:40:19 +0000 (23:40 +0000)]
router: remove stub /domain_blocks entry
Artik Banana [Mon, 11 Jun 2018 23:01:14 +0000 (23:01 +0000)]
* Removed TLSv1 and TLSv1.1
* Added OCSP Stapling
* Added SSL Cache
* Changed ciphers
* Specified ECDH curves
Artik Banana [Mon, 11 Jun 2018 22:56:54 +0000 (22:56 +0000)]
Security upgrades:
* Removed TLSv1 and TLSv1.1
* Added OCSP Stapling
* Added SSL Cache
* Changed ciphers
* Specified ECDH curves
William Pitcock [Thu, 7 Jun 2018 19:43:52 +0000 (19:43 +0000)]
tests: update twitterapi user view tests for new locked variable
William Pitcock [Thu, 7 Jun 2018 00:04:03 +0000 (00:04 +0000)]
twitter api: add approve/deny endpoints
William Pitcock [Wed, 6 Jun 2018 23:46:55 +0000 (23:46 +0000)]
tests: add tests for /api/pleroma/friend_requests
William Pitcock [Tue, 29 May 2018 15:30:06 +0000 (15:30 +0000)]
twitter api: add friend requests list api
William Pitcock [Tue, 29 May 2018 14:13:34 +0000 (14:13 +0000)]
twitterapi: user view: return if an account is locked or not
William Pitcock [Tue, 29 May 2018 10:18:23 +0000 (10:18 +0000)]
activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it
William Pitcock [Mon, 28 May 2018 18:31:48 +0000 (18:31 +0000)]
run mix format
William Pitcock [Mon, 28 May 2018 18:19:20 +0000 (18:19 +0000)]
twitterapi: add profile setting for locked/unlocked accounts
William Pitcock [Mon, 28 May 2018 17:51:50 +0000 (17:51 +0000)]
tests: assert the state prior to mutating it as well as afterward
William Pitcock [Mon, 28 May 2018 17:45:23 +0000 (17:45 +0000)]
testsuite: add mastodon api tests
William Pitcock [Mon, 28 May 2018 17:42:58 +0000 (17:42 +0000)]
activitypub transmogrifier: remove debug code
William Pitcock [Mon, 28 May 2018 16:42:18 +0000 (16:42 +0000)]
user: add a workaround for situations where Pleroma may believe a followee is followed
this was caused by lack of Undo follows in the early days, and can likely be eventually removed
William Pitcock [Sun, 27 May 2018 13:51:13 +0000 (13:51 +0000)]
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
William Pitcock [Sun, 27 May 2018 10:03:53 +0000 (10:03 +0000)]
mastodon api: allow setting an account locked or not
William Pitcock [Sun, 27 May 2018 09:45:12 +0000 (09:45 +0000)]
user: use Enum.uniq on the follow request query
William Pitcock [Sun, 27 May 2018 09:10:46 +0000 (09:10 +0000)]
activitypub transmogrifier: send Rejects in the format Mastodon wants
William Pitcock [Sun, 27 May 2018 09:09:35 +0000 (09:09 +0000)]
activitypub transmogrifier: send @context on accept activities
William Pitcock [Sat, 26 May 2018 18:03:23 +0000 (18:03 +0000)]
add a bunch of stuff
William Pitcock [Sat, 26 May 2018 16:16:20 +0000 (16:16 +0000)]
stash api controller
William Pitcock [Sat, 26 May 2018 16:03:32 +0000 (16:03 +0000)]
implement tracking of follow requests
William Pitcock [Sat, 26 May 2018 15:03:32 +0000 (15:03 +0000)]
activitypub transmogrifier: learn locked state in Update messages
William Pitcock [Sat, 26 May 2018 14:55:16 +0000 (14:55 +0000)]
activitypub: only send accept back automatically if the account is not locked
William Pitcock [Sat, 26 May 2018 14:45:41 +0000 (14:45 +0000)]
mix: add task for setting an account as locked or not
squidboi [Mon, 11 Jun 2018 21:59:04 +0000 (14:59 -0700)]
more rewording (x2)
squidboi [Mon, 11 Jun 2018 21:42:57 +0000 (14:42 -0700)]
more rewording
squidboi [Mon, 11 Jun 2018 21:29:50 +0000 (14:29 -0700)]
super-minor rewording
squidboi [Mon, 11 Jun 2018 21:27:16 +0000 (14:27 -0700)]
added CONFIGURATION.md containing some details about configuring mrf
eal [Mon, 11 Jun 2018 19:59:30 +0000 (19:59 +0000)]
Merge branch 'fix/mix-task-caching' into 'develop'
make_moderator.ex: set cache on update
See merge request pleroma/pleroma!206
eal [Mon, 11 Jun 2018 19:53:38 +0000 (22:53 +0300)]
make_moderator.ex: set cache on update
lambda [Mon, 11 Jun 2018 11:19:45 +0000 (11:19 +0000)]
Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks
See merge request pleroma/pleroma!190
squidboi [Sun, 10 Jun 2018 23:40:51 +0000 (16:40 -0700)]
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
lambda [Fri, 8 Jun 2018 11:10:10 +0000 (11:10 +0000)]
Merge branch 'users' into 'develop'
Fix users lookup/return type
See merge request pleroma/pleroma!201
lambda [Fri, 8 Jun 2018 11:08:50 +0000 (11:08 +0000)]
Merge branch 'feature/rejectnonpublic' into 'develop'
Add MRF to drop all posts with "followers-only" or "direct" privacy settings
See merge request pleroma/pleroma!202
Rachel H [Fri, 8 Jun 2018 04:23:30 +0000 (21:23 -0700)]
Fix users lookup/return type
* Allow viewing user in frontend by id on pageload
lambda [Fri, 8 Jun 2018 06:02:21 +0000 (06:02 +0000)]
Merge branch 'mastopost' into 'develop'
Allow posting images without text in mastofe
See merge request pleroma/pleroma!194
squidboi [Fri, 8 Jun 2018 05:33:50 +0000 (22:33 -0700)]
s/get_by_ap_id/get_cached_by_ap_id/
squidboi [Fri, 8 Jun 2018 05:14:39 +0000 (22:14 -0700)]
final format
squidboi [Fri, 8 Jun 2018 05:10:11 +0000 (22:10 -0700)]
even more formatting
lambda [Fri, 8 Jun 2018 05:10:08 +0000 (05:10 +0000)]
Merge branch 'bugfix/locked-account-regression' into 'develop'
security fix: locked account regression
See merge request pleroma/pleroma!200
squidboi [Fri, 8 Jun 2018 05:03:24 +0000 (22:03 -0700)]
more formatting
squidboi [Fri, 8 Jun 2018 04:55:58 +0000 (21:55 -0700)]
formatting
squidboi [Fri, 8 Jun 2018 04:00:57 +0000 (21:00 -0700)]
add mrf for dropping follower-only and direct posts
William Pitcock [Fri, 8 Jun 2018 02:47:07 +0000 (02:47 +0000)]
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly
William Pitcock [Fri, 8 Jun 2018 02:28:08 +0000 (02:28 +0000)]
tests: add regression test for locking/unlocking account updates
William Pitcock [Fri, 8 Jun 2018 02:18:47 +0000 (02:18 +0000)]
activitypub transmogrifier: fix locked account state from being clobbered
William Pitcock [Sat, 26 May 2018 15:03:32 +0000 (15:03 +0000)]
activitypub transmogrifier: learn locked state in Update messages
lambda [Thu, 7 Jun 2018 16:29:33 +0000 (16:29 +0000)]
Merge branch 'develop' into 'mastopost'
# Conflicts:
# .gitignore
lambda [Thu, 7 Jun 2018 14:44:08 +0000 (14:44 +0000)]
Merge branch 'feature/quarantine' into 'develop'
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
See merge request pleroma/pleroma!199
lambda [Thu, 7 Jun 2018 14:42:32 +0000 (14:42 +0000)]
Merge branch 'import' into 'develop'
Fix follow errors
See merge request pleroma/pleroma!198
William Pitcock [Thu, 7 Jun 2018 03:26:41 +0000 (03:26 +0000)]
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
Rachel H [Thu, 7 Jun 2018 04:26:44 +0000 (21:26 -0700)]
Fix follow errors
Sir_Boops [Sun, 15 Apr 2018 23:37:51 +0000 (17:37 -0600)]
Dedupe uploads
Rachel H [Wed, 6 Jun 2018 06:47:16 +0000 (23:47 -0700)]
Allow posting images without text in mastofe
eal [Wed, 6 Jun 2018 18:13:40 +0000 (21:13 +0300)]
Extract host from ap_id, add index
lambda [Wed, 6 Jun 2018 16:44:44 +0000 (16:44 +0000)]
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
webfinger robustness improvements
See merge request pleroma/pleroma!195
William Pitcock [Wed, 6 Jun 2018 16:36:58 +0000 (16:36 +0000)]
testsuite: update fixture URIs that were http
William Pitcock [Fri, 1 Jun 2018 17:58:20 +0000 (17:58 +0000)]
webfinger: use https as default fallback instead of http
realistically, all instances need to be on https anyway to properly federate with all
software
William Pitcock [Fri, 1 Jun 2018 17:55:25 +0000 (17:55 +0000)]
XML: handle erlang errors too
lambda [Wed, 6 Jun 2018 08:27:08 +0000 (08:27 +0000)]
Merge branch 'fix/oauth-http-basic' into 'develop'
Make OAuth token endpoint work with HTTP Basic auth
See merge request pleroma/pleroma!191
projects / akkoma / log