alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,507 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

8507 Commits

Author SHA1 Message Date
lain 00d7d109ef Fix typo 2018-06-15 22:01:17 +02:00
lambda 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
 2018-06-14 19:11:30 +00:00
Francis Dinh 0a95b5594b Add missing file extension if file does not have one 2018-06-14 12:16:34 -04:00
lambda 1c676b7573 Merge branch 'fix/mp3-recognition' into 'develop' 
upload.ex: add MPEG Layer 3 file header.

See merge request pleroma/pleroma!221
 2018-06-14 13:55:50 +00:00
eal 12c7a023de upload.ex: add MPEG Layer 3 file header. 2018-06-14 16:41:08 +03:00
lambda 678df59d22 Merge branch 'patch-2' into 'develop' 
* fix nginx 1.15 warning:

See merge request pleroma/pleroma!213
 2018-06-14 07:23:14 +00:00
lambda 2723fb5150 Merge branch 'bugfix/mrf-orphaning' into 'develop' 
activitypub transmogrifier: handle activity lookup failure

Closes #156

See merge request pleroma/pleroma!216
 2018-06-14 07:20:54 +00:00
lambda 8c7fdcb31b Merge branch 'feature/twitterapi-unrepeat' into 'develop' 
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce

See merge request pleroma/pleroma!218
 2018-06-14 07:19:36 +00:00
lambda 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
 2018-06-14 07:14:18 +00:00
lambda 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
 2018-06-14 07:13:05 +00:00
lambda 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
 2018-06-14 07:12:21 +00:00
William Pitcock 5442466569 oauth: fix password-based login when username is email address 
closes #199
 2018-06-14 02:32:30 +00:00
William Pitcock 4894b88b1b oauth: support either name or username parameter with grant_type=password 
closes #180
 2018-06-14 02:07:43 +00:00
Francis Dinh fc15f30a3c fixup test 2018-06-13 21:45:27 -04:00
Francis Dinh 1555c66650 Add unretweet TwAPI endpoint and cleanup AP.unannounce 2018-06-13 21:33:36 -04:00
William Pitcock 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
 2018-06-13 22:19:38 +00:00
William Pitcock b5bc08fac3 streamer: don't relay boosts of messages which would otherwise be blocked 2018-06-13 21:59:56 +00:00
dex 750cfbf38d * fix nginx 1.15 warning: 
nginx: [warn] the "ssl" directive is deprecated, use the "listen ... ssl" directive instead
 2018-06-13 09:54:23 +00:00
lambda ea42ba603f Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop' 
webfinger: send JRD by default instead of XRD

See merge request pleroma/pleroma!211
 2018-06-13 07:18:03 +00:00
William Pitcock 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.
 2018-06-13 07:03:14 +00:00
lambda c02d03a4c2 Merge branch 'bugfix/webfinger-refactoring' into 'develop' 
webfinger: refactor webfinger() functions

Closes #212

See merge request pleroma/pleroma!210
 2018-06-13 07:02:12 +00:00
William Pitcock 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
 2018-06-13 06:42:27 +00:00
squidboi 2586426fa0
newlines 2018-06-12 21:40:22 -07:00
squidboi a2f7c02108 split lines, explicitly advised against editing default config files 2018-06-12 21:38:28 -07:00
lain ddc654d587 update frontend 2018-06-12 19:38:25 +02:00
eal 3326205f95 set_moderator: ensureall applications are started. 2018-06-12 15:42:40 +03:00
lambda 958cf5da94 Merge branch 'patch-2' into 'develop' 
Proposal: Default Avatar Replacement

See merge request pleroma/pleroma!209
 2018-06-12 12:11:04 +00:00
Henry Jameson 9c1cf1befb formatting 2018-06-12 15:01:40 +03:00
Artik Banana 991b8a6b9d Replace avi.png with the Pleroma logo 2018-06-12 11:55:38 +00:00
Henry Jameson f42ffbe9a8 Initial invites support + tests. 2018-06-12 14:55:16 +03:00
lambda 3f42806b1b Merge branch 'develop' into 'develop' 
Dedupe uploads

See merge request pleroma/pleroma!115
 2018-06-12 08:26:26 +00:00
lambda f34232da86 Update sample_config.eex 2018-06-12 07:23:45 +00:00
lambda 564c73ab24 Merge branch 'feature/list-streaming' into 'develop' 
MastoAPI: Add streaming for lists.

See merge request pleroma/pleroma!183
 2018-06-12 07:19:45 +00:00
lambda a6e0c31518 Merge branch 'feature/locked-accounts-part-1' into 'develop' 
locked accounts

See merge request pleroma/pleroma!180
 2018-06-12 07:18:19 +00:00
lambda 01240fd8b6 Merge branch 'patch-2' into 'develop' 
Nginx Config - Security Upgrades

See merge request pleroma/pleroma!207
 2018-06-12 07:12:39 +00:00
William Pitcock 9810471237 router: remove stub /domain_blocks entry 2018-06-11 23:40:19 +00:00
Artik Banana 93c614bf13 * Removed TLSv1 and TLSv1.1 
* Added OCSP Stapling
* Added SSL Cache
* Changed ciphers
* Specified ECDH curves
 2018-06-11 23:01:14 +00:00
Artik Banana c645a8de2b Security upgrades: 
* Removed TLSv1 and TLSv1.1
* Added OCSP Stapling
* Added SSL Cache
* Changed ciphers
* Specified ECDH curves
 2018-06-11 22:56:54 +00:00
William Pitcock c773f42ca4 tests: update twitterapi user view tests for new locked variable 2018-06-11 22:15:53 +00:00
William Pitcock f8e0942745 twitter api: add approve/deny endpoints 2018-06-11 22:15:53 +00:00
William Pitcock d116af3bee tests: add tests for /api/pleroma/friend_requests 2018-06-11 22:15:53 +00:00
William Pitcock e08cf21e5b twitter api: add friend requests list api 2018-06-11 22:15:53 +00:00
William Pitcock ba8dab7542 twitterapi: user view: return if an account is locked or not 2018-06-11 22:15:53 +00:00
William Pitcock d96377f359 activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it 2018-06-11 22:15:53 +00:00
William Pitcock 5eed1ea181 run mix format 2018-06-11 22:15:53 +00:00
William Pitcock 993312cdb3 twitterapi: add profile setting for locked/unlocked accounts 2018-06-11 22:15:53 +00:00
William Pitcock a0c5b42e29 tests: assert the state prior to mutating it as well as afterward 2018-06-11 22:15:53 +00:00
William Pitcock c99b9b9d92 testsuite: add mastodon api tests 2018-06-11 22:15:53 +00:00
William Pitcock 4084889a2d activitypub transmogrifier: remove debug code 2018-06-11 22:15:53 +00:00
William Pitcock 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
 2018-06-11 22:15:53 +00:00