Commit graph

740 commits

Author SHA1 Message Date
lain
38b61fddfe HttpSignature Plug: Skip if already valid. 2018-02-15 19:58:26 +01:00
lain
b331cb449a Merge branch 'develop' into feature/activitypub 2018-02-12 10:24:15 +01:00
lain
26ccb768d3 Make test output easier to read. 2018-02-12 10:14:11 +01:00
lain
91928b06ab Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop 2018-02-12 08:15:37 +01:00
lain
8cf97ee8e1 ActivityPub: Basic note federation with Mastodon. 2018-02-11 20:43:33 +01:00
lain
ce31f3a922 Twitter Representers: Handle Mastodon attachments. 2018-02-11 17:21:06 +01:00
Roger Braun
ae1ec858f4 Basic AP user building. 2018-02-11 17:20:43 +01:00
Roger Braun
52200998c9 Merge branch 'develop' into feature/activitypub 2018-02-11 09:50:55 +01:00
hakabahitoyo
a61f21ff4f print <link rel="next"> element in atom.feed 2018-02-09 23:10:32 +09:00
Hakaba Hitoyo
7124f12a94 introduce max_id parameter in feed.atom (debug) 2018-02-09 21:46:05 +09:00
Roger Braun
08f458e6df UtilController: Fix statusnet config api compatibility. 2018-02-09 13:43:12 +01:00
Hakaba Hitoyo
9c61f60558 introduce max_id parameter in feed.atom 2018-02-09 21:41:30 +09:00
lambda
af854f7e01 Merge branch 'develop' into 'develop'
action_fallback for OAuth Controller

See merge request pleroma/pleroma!63
2018-02-09 08:57:54 +00:00
lambda
f0cde24f71 Merge branch 'fix/config-disable-chat' into 'develop'
Add config option for enabling/disabling chat.

See merge request pleroma/pleroma!58
2018-02-08 18:18:28 +00:00
Calv Collins
73249fa5ff Changed fallback controller to handle all cases from OAuthController 2018-02-08 18:15:59 +00:00
Calv Collins
314f4775c5 Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop 2018-02-08 16:58:31 +00:00
Calv Collins
bdb5dd2194 Create action_fallback for username/password incorrect input 2018-02-08 16:57:30 +00:00
Roger Braun
2f291576e4 Fix compile errors on 1.4.5 2018-02-08 16:03:30 +01:00
eal
286f6698ee Detect file type if none given. 2018-02-04 15:22:30 +02:00
lambda
61c16193de Merge branch 'move-backend-images' into 'develop'
Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60
2018-02-03 13:05:20 +00:00
Hakaba Hitoyo
c8a2931549 add backend endpoint /images 2018-02-03 20:52:01 +09:00
Hakaba Hitoyo
ea6d1b2b17 move avi.png & banner.png from /priv/static/static to /priv/static/images 2018-02-03 20:43:14 +09:00
eal
f0745148a3 Add config option for enabling/disabling chat. 2018-02-03 13:42:37 +02:00
eal
29be70c008 Add remote following of local profiles. 2018-02-02 00:14:05 +02:00
eal
ab83e0de6d TwitterAPI: Add is_local to user view. 2018-02-01 21:41:19 +02:00
eal
0f194dc56b Merge branch 'feature/instance-thumbnail-api' into 'develop'
Provide instance thumbnail in /api/v1/instance

See merge request pleroma/pleroma!55
2018-01-31 18:34:52 +00:00
eal
ab8b9ababa Split emoji to default and custom. 2018-01-31 16:29:22 +02:00
Hakaba Hitoyo
03c15a54f5 provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 23:09:47 +09:00
Hakaba Hitoyo
e47f60c053 provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 23:04:34 +09:00
Hakaba Hitoyo
a4335e391f provide instance thumbnail at /api/v1/instance 2018-01-31 22:51:25 +09:00
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