Commit graph

698 commits

Author SHA1 Message Date
Roger Braun 5e37adedfb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-01-30 12:21:05 +01:00
Roger Braun ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop 2018-01-30 12:20:39 +01:00
Hakaba Hitoyo cefb6cfea1 provide logo at feed.atom (debug) 2018-01-30 19:37:04 +09:00
Hakaba Hitoyo b713b28dfd provide logo at feed.atom 2018-01-30 19:26:07 +09: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
Roger Braun 64e51c2cfa Fix incoming Pleroma CWs. Closes #96. 2018-01-29 17:44:35 +01:00
Jeff Becker 066fe1a697
use nil instead of empty string 2018-01-29 10:06:16 -05:00
Jeff Becker dffde6631d
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy 2018-01-24 13:15:54 -05:00
Roger Braun 0f722a8c22 Stats: Make less crashy and improve query. 2018-01-20 18:38:30 +01:00
eal beb13bf3a9 Revert "Revert "Add remote follow pages.""
This reverts commit b259b4e4d1.
2018-01-18 18:42:44 +02:00
eal 57d413e655 Revert "Revert "Add remote follow path to webfinger.""
This reverts commit fb5aa34092.
2018-01-18 18:42:32 +02:00
eal b259b4e4d1 Revert "Add remote follow pages."
This reverts commit 47e8c8db05.
2018-01-18 03:42:18 +02:00
eal fb5aa34092 Revert "Add remote follow path to webfinger."
This reverts commit bc689740f0.
2018-01-18 03:42:09 +02:00
eal 47e8c8db05 Add remote follow pages. 2018-01-18 03:11:03 +02:00
eal bc689740f0 Add remote follow path to webfinger. 2018-01-18 02:38:02 +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 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 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 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
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
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
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
href 9093b2cf49
Merge remote-tracking branch 'upstream/develop' into media-proxy 2017-12-11 02:45:28 +01:00
href 077faaed8c
Limit body size to 25MB 2017-12-11 02:31:37 +01:00
Roger Braun d5a13c10ac Merge branch 'feature/user_deletion' into develop 2017-12-09 10:10:45 +01:00
Lain Iwakura ef2322bdb7 Delete notifications on activity deletion. 2017-12-08 18:17:30 +01:00
Lain Iwakura bad499b3fd Basic user deletion. 2017-12-08 17:50:11 +01:00
lambda 35cfbf43a0 Merge branch 'fix/linkify' into 'develop'
Fix links with HTML elements and/or parentheses.

See merge request pleroma/pleroma!38
2017-12-08 12:34:03 +00:00
lambda 40c30ab895 Merge branch 'fix/mastoapi-attachment-linking' into 'develop'
MastoAPI: don't add attachment links.

Closes #92

See merge request pleroma/pleroma!37
2017-12-08 12:32:33 +00:00
lambda d7da3ca05d Merge branch 'postgresetup' into 'develop'
first version of safe DB setup

See merge request pleroma/pleroma!32
2017-12-08 12:31:14 +00:00
eal a3e68f0233 Allow parentheses in links. 2017-12-07 21:38:31 +02:00