EpicKitty/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Pull requests Activity
1168 commits 21 branches 89 tags 302 MiB
Commit graph

1168 commits

This branch
This branch
All branches
Author SHA1 Message Date
eal
bc689740f0 Add remote follow path to webfinger. 2018-01-18 02:38:02 +02:00
lambda
ac7580df78 Merge branch 'fix/background-profile-fetch' into 'develop' 
Fetch external profile in the background.

See merge request pleroma/pleroma!49
 2018-01-16 14:18:07 +00:00
eal
6678fe3217 Add a Caddyfile. 2018-01-16 15:48:27 +02:00
eal
b3e7d7ae6d Fetch external profile in the background. 2018-01-16 15:31:03 +02:00
eal
80f6ac412a Merge branch 'default-pictures' into 'develop' 
Add a default profile picture and banner.

See merge request pleroma/pleroma!48
 2018-01-15 20:26:49 +00:00
eal
14b086eec2 Add a default profile picture and banner. 
This removes the placehold.it dependency.
 2018-01-15 22:18:17 +02:00
eal
baf66caefd Merge branch 'prod.exs' into 'develop' 
Correct prod.exs

See merge request pleroma/pleroma!47
 2018-01-15 17:44:49 +00:00
eal
db5dfd1b3e Merge branch 'fix/pleroma.nginx' into 'develop' 
Correct pleroma.nginx

See merge request pleroma/pleroma!46
 2018-01-15 17:26:41 +00:00
lambda
5a6f54b336 Merge branch 'stats-daemon' into 'develop' 
Add a stats agent for storing data from expensive queries.

See merge request pleroma/pleroma!45
 2018-01-15 08:04:54 +00:00
Hakaba Hitoyo
aceef36e56 Correct pleroma.nginx 2018-01-14 10:57:25 +00:00
Hakaba Hitoyo
048f61d7f8 #95 Correct prod.exs 2018-01-14 08:54:28 +00:00
eal
6e1cb86166 Fix instance test. 2018-01-14 08:28:35 +02:00
eal
d8db39564e Move user count to stats agent. 2018-01-14 08:15:11 +02:00
eal
9717166d10 Add a stats agent for storing data from expensive queries. 2018-01-13 18:24:16 +02:00
eal
d49109ca17 Merge branch 'add-mediaproxy-question-to-configgen' into 'develop' 
added question about activating mediaproxy to config generator

See merge request pleroma/pleroma!44
 2018-01-12 20:57:31 +00:00
eal
d56ab43609 Ask for proxy URL if proxy enabled. 
Also change the true/false question to y/n
 2018-01-12 22:38:14 +02:00
Sebastian Huebner
29b7e822fb
added question about activating mediaproxy to config generator 2018-01-09 12:31:11 +01:00
Jeff Becker
1e185b9301
apply proxy settings to media_proxy 2017-12-31 09:25:00 -05:00
Jeff Becker
39854d6c11
clarify 2017-12-30 13:08:53 -05: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
eal
5c09d8d3f1 Unlink follow import process from the one processing request. 
Mistakes were made.
 2017-12-23 16:40:43 +02:00
lambda
ad180ad6dd Merge branch 'media-proxy-fix-encoding' into 'develop' 
Remove a useless URI.encode call in MediaProxy

See merge request pleroma/pleroma!42
 2017-12-22 12:07:10 +00:00
href
0ccd0e5cc9
Remove a useless URI.encode call in MediaProxy 2017-12-21 20:59:10 +01:00
lambda
35ac549a99 Merge branch 'media-proxy' into 'develop' 
Media proxy

See merge request pleroma/pleroma!34
 2017-12-20 14:22:24 +00:00
Lain Iwakura
2a744cdff8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-12-19 16:15:45 +01:00
Lain Iwakura
f1f79c0dca Fix timelines in subway tooter. 2017-12-19 16:15:07 +01:00
lambda
29c9812789 Merge branch 'fix/twitterapi-follow-lists' into 'develop' 
Fix follower/following lists.

Closes #29

See merge request pleroma/pleroma!41
 2017-12-18 22:44:15 +00:00
Lain Iwakura
47887ac848 MastoAPI: Fix always-sensitive bugs. 2017-12-18 16:56:03 +01:00
Lain Iwakura
846d59a536 Send out salmons before websub. 2017-12-18 16:16:22 +01:00
eal
1969773fb4 Fix follower/following lists. 
Add tests.
 2017-12-18 16:37:26 +02:00
lambda
6b48489237 Merge branch 'feature/follow-import' into 'develop' 
Add follow import.

See merge request pleroma/pleroma!40
 2017-12-18 10:59:57 +00:00
eal
fdfb508259 Run follow import in the background. 2017-12-12 21:04:41 +02:00
eal
d89193a8d7 Allow uploading a file for follow import. 2017-12-12 21:03:28 +02:00
Lain Iwakura
4a13b84887 Add recipients field to activities. 
Also do some very basic checks for AP message insertion.
 2017-12-12 18:07:14 +01:00
eal
39ccfdc084 Add follow import. 2017-12-12 18:35:23 +02:00
href
f909aec050
proxy emojis 
(i fix emojos better than gargon but sshhhhh)
 2017-12-12 12:30:24 +01:00
href
8e82547179
fix content-type and fallback to image/jpeg 2017-12-12 11:45:55 +01:00
Roger Braun
888ec9e579 ActivityPub: Check inbox requests for valid signature. 2017-12-12 10:17:50 +01:00
Roger Braun
a9c23e1c32 Add plug to validate signed http requests. 2017-12-12 10:17:21 +01:00
eal
9223038319 Fix some more tests. 2017-12-11 21:01:36 +02:00
Lain Iwakura
e2e6365035 ActivityPub: Add controller tests. 2017-12-11 18:22:48 +01:00
Lain Iwakura
64330d9455 ActivityPub: Add object routes / controller. 2017-12-11 18:21:33 +01:00
Lain Iwakura
a89a613e4e ActivityPub: Use only string keys in views. 2017-12-11 18:20:41 +01:00
Lain Iwakura
da005d3332 ActivityPub: Add Objects View. 2017-12-11 18:19:46 +01:00
eal
79b3397c17 Fix tests. 2017-12-11 18:41:03 +02:00
lambda
4b06e46a3a Merge branch 'fix/tootdon-mentions' into 'develop' 
Fix Tootdon linking the whole status when mentioning someone.

See merge request pleroma/pleroma!39
 2017-12-11 16:21:43 +00:00
eal
b00e230760 Add a bunch of useless HTML to mentions. 2017-12-11 18:14:33 +02:00
Roger Braun
c3bcafc51b HTTPSig: Add method to validate conn 2017-12-11 10:37:40 +01:00
Roger Braun
5599c5920c Basic incoming AP support. 2017-12-11 10:37:22 +01:00