squidboi
|
2e294ee44a
|
Merge branch 'develop' into feature/configurable-blocks
|
2018-06-16 15:37:16 -07: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
|
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 |
|
William Pitcock
|
09604182d0
|
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
|
2018-06-07 14:38:09 +00:00 |
|
William Pitcock
|
1c926c7b60
|
activitypub: allow mastodon S2S block extension support to be disabled
|
2018-05-26 08:30:41 +00:00 |
|
Thog
|
e55c6f311b
|
Migrate to comeonin 4 and Cachex 3
Also fix some warning in the code and add a missing alias
|
2018-05-20 20:08:40 +02:00 |
|
Mark Felder
|
737c42920a
|
Speling
|
2018-05-04 22:05:01 +00:00 |
|
Mark Felder
|
d30907e573
|
Make it possible to use custom database connection parameters
|
2018-05-04 21:00:18 +00:00 |
|
lain
|
a7eb148d61
|
Optionally deactivate public timelines.
|
2018-04-25 16:11:07 +02:00 |
|
William Pitcock
|
d24ddd9fb9
|
ActivityPub MRF: implement the SimplePolicy policy
|
2018-04-14 06:32:45 -05:00 |
|
William Pitcock
|
4a178b3d65
|
ActivityPub: implement MRF core hook and baseline noop policy object
|
2018-04-14 06:32:44 -05:00 |
|
lain
|
cd543d58a1
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2018-04-02 13:15:38 +02:00 |
|
lain
|
468e41d50c
|
Respond to proper ActivityPub type.
|
2018-04-01 14:58:01 +02:00 |
|
William Pitcock
|
4bf86d4cf5
|
config: make the upload limit configurable
|
2018-03-31 19:53:23 -05:00 |
|
lain
|
4e5aa3b3a0
|
Add gopher server.
|
2018-03-31 18:12:20 +02:00 |
|
lain
|
4afbef39f4
|
Format the code.
|
2018-03-30 15:01:53 +02:00 |
|
lain
|
6dc98aaf89
|
Clean up prod.exs a bit.
|
2018-03-28 16:03:42 +02:00 |
|
lain
|
86058c9a88
|
Return version in instance endpoint, set version to 0.9.0.
|
2018-03-27 20:09:01 +02:00 |
|
lain
|
fbc187ac15
|
Switch to Jason for json handling.
It's twice as fast and will be the standard in the coming ecto.
|
2018-03-27 16:09:08 +02:00 |
|
lain
|
611ca385de
|
Merge branch 'develop' into feature/activitypub
|
2018-03-08 12:37:06 +01:00 |
|
lain
|
0e20d5529a
|
Add way to disable federation.
|
2018-03-05 09:26:24 +01:00 |
|
lain
|
13ea3eafe5
|
Longer header lenght.
|
2018-02-24 18:33:44 +01:00 |
|
Roger Braun
|
52200998c9
|
Merge branch 'develop' into feature/activitypub
|
2018-02-11 09:50:55 +01:00 |
|
eal
|
f0745148a3
|
Add config option for enabling/disabling chat.
|
2018-02-03 13:42:37 +02:00 |
|
eal
|
15cb3f2b01
|
Revert renaming emoji.txt
|
2018-01-31 23:47:42 +02:00 |
|
eal
|
ab8b9ababa
|
Split emoji to default and custom.
|
2018-01-31 16:29:22 +02:00 |
|
lambda
|
2f23ae5b68
|
Merge branch 'pr-upstream-http-proxy' into 'develop'
Pr upstream http proxy
See merge request pleroma/pleroma!43
|
2018-01-30 08:16:31 +00:00 |
|
Jeff Becker
|
066fe1a697
|
use nil instead of empty string
|
2018-01-29 10:06:16 -05:00 |
|
lambda
|
8db83c3dc0
|
Merge branch 'feature/longfox' into 'develop'
add longfox emojis
See merge request pleroma/pleroma!53
|
2018-01-27 11:57:34 +00:00 |
|
Hakaba Hitoyo
|
7e1d4819ca
|
add longfox emojis
|
2018-01-27 08:38:48 +09:00 |
|
Jeff Becker
|
dffde6631d
|
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
|
2018-01-24 13:15:54 -05:00 |
|
Hakaba Hitoyo
|
048f61d7f8
|
#95 Correct prod.exs
|
2018-01-14 08:54:28 +00:00 |
|
Jeff Becker
|
658c4754ff
|
docs
|
2017-12-30 13:08:43 -05:00 |
|
Jeff Becker
|
5ddd15d794
|
make httppoison use configurable http proxy
|
2017-12-30 13:08:36 -05:00 |
|
Roger Braun
|
5599c5920c
|
Basic incoming AP support.
|
2017-12-11 10:37:22 +01:00 |
|
href
|
1cb5cbdc6c
|
Improve error handling, add configuration
|
2017-11-28 21:44:25 +01:00 |
|
Lain Iwakura
|
44dc694882
|
Add configuration generation tool, update readme.
|
2017-11-23 16:22:20 +01:00 |
|
Roger Braun
|
5794558077
|
Read variable for testing db.
|
2017-11-02 17:45:33 +01:00 |
|
Roger Braun
|
7c82b82197
|
Make emoji configurable in files.
|
2017-09-16 16:49:46 +02:00 |
|
Roger Braun
|
c20530e708
|
Add configuration option for registrations.
|
2017-09-15 14:39:32 +02:00 |
|
Roger Braun
|
50409326a8
|
Refactor posting and make character limit configurable.
|
2017-09-15 14:17:36 +02:00 |
|
Roger Braun
|
ac2893a945
|
Add instance config options.
|
2017-09-15 10:26:28 +02:00 |
|
Roger Braun
|
d982f04a65
|
Mock HTTPoison in testing.
|
2017-05-05 14:16:54 +02:00 |
|
Roger Braun
|
1422e7aa84
|
Handle incoming websub subscriptions.
|
2017-04-28 15:45:10 +02:00 |
|
Roger Braun
|
8fb73c28bb
|
Only have one subscription per callback.
|
2017-04-22 13:44:21 +02:00 |
|
Roger Braun
|
ce6cc84a4a
|
Add basic webfinger.
|
2017-04-17 13:44:41 +02:00 |
|
Roger Braun
|
e7dc39e40c
|
Basic file uploading via TwAPI.
|
2017-03-29 02:07:56 +02:00 |
|