00d7d109ef
Fix typo
6 years ago
de20c8d620
Merge branch 'fix/missing-file-extension' into 'develop'
...
Add missing file extension if file does not have one
See merge request pleroma/pleroma!222
6 years ago
0a95b5594b
Add missing file extension if file does not have one
6 years ago
1c676b7573
Merge branch 'fix/mp3-recognition' into 'develop'
...
upload.ex: add MPEG Layer 3 file header.
See merge request pleroma/pleroma!221
6 years ago
12c7a023de
upload.ex: add MPEG Layer 3 file header.
6 years ago
678df59d22
Merge branch 'patch-2' into 'develop'
...
* fix nginx 1.15 warning:
See merge request pleroma/pleroma!213
6 years ago
2723fb5150
Merge branch 'bugfix/mrf-orphaning' into 'develop'
...
activitypub transmogrifier: handle activity lookup failure
Closes #156
See merge request pleroma/pleroma!216
6 years ago
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
6 years ago
2c303b3302
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
6 years ago
280ac243aa
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
6 years ago
408152e232
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
6 years ago
5442466569
oauth: fix password-based login when username is email address
...
closes #199
6 years ago
4894b88b1b
oauth: support either name or username parameter with grant_type=password
...
closes #180
6 years ago
fc15f30a3c
fixup test
6 years ago
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
6 years ago
401e8af943
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
6 years ago
b5bc08fac3
streamer: don't relay boosts of messages which would otherwise be blocked
6 years ago
750cfbf38d
* fix nginx 1.15 warning:
...
nginx: [warn] the "ssl" directive is deprecated, use the "listen ... ssl" directive instead
6 years ago
ea42ba603f
Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'
...
webfinger: send JRD by default instead of XRD
See merge request pleroma/pleroma!211
6 years ago
3d402a9e20
webfinger: send JRD by default instead of XRD
...
JRD being the default representation for WebFinger responses was standardized 5 years ago in
RFC 7033.
6 years ago
c02d03a4c2
Merge branch 'bugfix/webfinger-refactoring' into 'develop'
...
webfinger: refactor webfinger() functions
Closes #212
See merge request pleroma/pleroma!210
6 years ago
59f95a7095
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
6 years ago
2586426fa0
newlines
6 years ago
a2f7c02108
split lines, explicitly advised against editing default config files
6 years ago
ddc654d587
update frontend
6 years ago
3326205f95
set_moderator: ensureall applications are started.
6 years ago
958cf5da94
Merge branch 'patch-2' into 'develop'
...
Proposal: Default Avatar Replacement
See merge request pleroma/pleroma!209
6 years ago
9c1cf1befb
formatting
6 years ago
991b8a6b9d
Replace avi.png with the Pleroma logo
6 years ago
f42ffbe9a8
Initial invites support + tests.
6 years ago
3f42806b1b
Merge branch 'develop' into 'develop'
...
Dedupe uploads
See merge request pleroma/pleroma!115
6 years ago
f34232da86
Update sample_config.eex
6 years ago
564c73ab24
Merge branch 'feature/list-streaming' into 'develop'
...
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
6 years ago
a6e0c31518
Merge branch 'feature/locked-accounts-part-1' into 'develop'
...
locked accounts
See merge request pleroma/pleroma!180
6 years ago
01240fd8b6
Merge branch 'patch-2' into 'develop'
...
Nginx Config - Security Upgrades
See merge request pleroma/pleroma!207
6 years ago
9810471237
router: remove stub /domain_blocks entry
6 years ago
93c614bf13
* Removed TLSv1 and TLSv1.1
...
* Added OCSP Stapling
* Added SSL Cache
* Changed ciphers
* Specified ECDH curves
6 years ago
c645a8de2b
Security upgrades:
...
* Removed TLSv1 and TLSv1.1
* Added OCSP Stapling
* Added SSL Cache
* Changed ciphers
* Specified ECDH curves
6 years ago
c773f42ca4
tests: update twitterapi user view tests for new locked variable
6 years ago
f8e0942745
twitter api: add approve/deny endpoints
6 years ago
d116af3bee
tests: add tests for /api/pleroma/friend_requests
6 years ago
e08cf21e5b
twitter api: add friend requests list api
6 years ago
ba8dab7542
twitterapi: user view: return if an account is locked or not
6 years ago
d96377f359
activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it
6 years ago
5eed1ea181
run mix format
6 years ago
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
6 years ago
a0c5b42e29
tests: assert the state prior to mutating it as well as afterward
6 years ago
c99b9b9d92
testsuite: add mastodon api tests
6 years ago
4084889a2d
activitypub transmogrifier: remove debug code
6 years ago
1452b2823f
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
6 years ago
lain