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 |
|
William Pitcock
|
76f80ba8c2
|
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
a2c4a5a75b
|
mastodon api: allow setting an account locked or not
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
ad7188fe92
|
user: use Enum.uniq on the follow request query
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
f328de8eb7
|
activitypub transmogrifier: send Rejects in the format Mastodon wants
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
876ad6aa38
|
activitypub transmogrifier: send @context on accept activities
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
760eb72a38
|
add a bunch of stuff
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
6f89d2d583
|
stash api controller
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
9c88933422
|
implement tracking of follow requests
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
6041380774
|
activitypub transmogrifier: learn locked state in Update messages
|
2018-06-11 22:15:27 +00:00 |
|
William Pitcock
|
e5206752e1
|
activitypub: only send accept back automatically if the account is not locked
|
2018-06-11 22:15:27 +00:00 |
|
William Pitcock
|
3208611bfc
|
mix: add task for setting an account as locked or not
|
2018-06-11 22:15:27 +00:00 |
|
squidboi
|
08fc1ba382
|
more rewording (x2)
|
2018-06-11 14:59:04 -07:00 |
|
squidboi
|
0921489809
|
more rewording
|
2018-06-11 14:42:57 -07:00 |
|
squidboi
|
01b2dc19cc
|
super-minor rewording
|
2018-06-11 14:29:50 -07:00 |
|
squidboi
|
837792b015
|
added CONFIGURATION.md containing some details about configuring mrf
|
2018-06-11 14:27:16 -07:00 |
|
eal
|
cdf5a668f2
|
Merge branch 'fix/mix-task-caching' into 'develop'
make_moderator.ex: set cache on update
See merge request pleroma/pleroma!206
|
2018-06-11 19:59:30 +00:00 |
|
eal
|
18837c2fed
|
make_moderator.ex: set cache on update
|
2018-06-11 22:53:38 +03:00 |
|
lambda
|
7f79b467b1
|
Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks
See merge request pleroma/pleroma!190
|
2018-06-11 11:19:45 +00:00 |
|
squidboi
|
07f0cfa53f
|
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
|
2018-06-10 16:40:51 -07:00 |
|
squidboi
|
4f9ecfc77a
|
formatting
|
2018-06-09 04:28:11 +00:00 |
|
squidboi
|
8903f1ad4d
|
more fixes
|
2018-06-08 19:07:14 -07:00 |
|
squidboi
|
16d896f526
|
fixes
|
2018-06-08 19:01:14 -07:00 |
|
squidboi
|
b3580b6971
|
add option to not deny follow if blocked (fixed)
|
2018-06-08 18:29:41 -07:00 |
|
squidboi
|
e99c73aeba
|
add option to not deny follow if blocked
|
2018-06-08 17:47:24 -07:00 |
|
squidboi
|
2847fc8f90
|
add option to not unfollow on block, and option to not federate outgoing blocks
|
2018-06-08 17:12:16 -07:00 |
|
lambda
|
45a935f0bd
|
Merge branch 'users' into 'develop'
Fix users lookup/return type
See merge request pleroma/pleroma!201
|
2018-06-08 11:10:10 +00:00 |
|