lain
|
ef0300889d
|
Transmogrifier: Handle basic notice creation.
|
2018-02-15 20:00:06 +01:00 |
|
lain
|
ae26604378
|
ActivityPub: Refactor create function.
|
2018-02-15 19:59:35 +01:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
25118aeef7
|
Add link to AP address in webfinger.
|
2017-12-09 15:34:43 +01:00 |
|
Roger Braun
|
30e9b22f96
|
Merge branch 'develop' into feature/activitypub
|
2017-12-09 11:00:56 +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 |
|
eal
|
bf91e5659f
|
Fix HTML escape breaking some links.
|
2017-12-07 21:36:06 +02:00 |
|
eal
|
5436dbaeaf
|
MastoAPI: don't add attachment links.
|
2017-12-07 20:44:09 +02:00 |
|
Lain Iwakura
|
6df6ad0b42
|
User deletion: Remove relationships.
|
2017-12-07 18:13:05 +01:00 |
|
Lain Iwakura
|
a78ae2a685
|
Don't follow deactivated users.
|
2017-12-07 17:51:55 +01:00 |
|
Lain Iwakura
|
b727ecc5e7
|
Add function to deactivate users.
|
2017-12-07 17:47:23 +01:00 |
|
Lain Iwakura
|
0ec5aeb8a7
|
Don't log in deactivated users.
|
2017-12-07 17:41:34 +01:00 |
|
Lain Iwakura
|
e31a5ff4af
|
Priority queue fixes.
|
2017-12-06 16:51:11 +01:00 |
|
Lain Iwakura
|
66c3813ea6
|
Add basic queue prioritization.
|
2017-12-05 18:21:30 +01:00 |
|
href
|
72f7baa654
|
Merge remote-tracking branch 'upstream/develop' into media-proxy
|
2017-12-05 14:12:15 +01:00 |
|
Roger Braun
|
1c90bfb4f6
|
Merge remote-tracking branch 'origin/develop' into feature/chat
|
2017-12-05 10:20:00 +01:00 |
|
Roger Braun
|
5945ec84e9
|
Don't save user in socket, just save the name.
|
2017-12-05 10:01:36 +01:00 |
|
Roger Braun
|
69f1024bb0
|
Add basic channel state.
|
2017-12-05 09:36:26 +01:00 |
|
eal
|
c1fa1e8844
|
Fix basic auth for passwords with a colon.
|
2017-12-04 22:45:16 +02:00 |
|
Lain Iwakura
|
5c40986120
|
Basic backend chat.
|
2017-12-04 19:10:15 +01:00 |
|
Henry Jameson
|
964e2dd2f0
|
unfuck
|
2017-12-04 04:06:52 +03:00 |
|
Henry Jameson
|
6b60f5f64a
|
made psql script compatible with migrations or generate_config reruns
|
2017-12-04 03:56:54 +03:00 |
|
Henry Jameson
|
071f518028
|
reverts config gen
|
2017-12-04 03:56:54 +03:00 |
|
Henry Jameson
|
a884e08271
|
fix
|
2017-12-04 03:56:54 +03:00 |
|
Henry Jameson
|
4071403117
|
fixes
|
2017-12-04 03:56:54 +03:00 |
|
Henry Jameson
|
0673511d39
|
first version of safe DB setup
|
2017-12-04 03:56:54 +03:00 |
|
Roger Braun
|
d08a34e88b
|
OStatus: Add user bio as summary field
Fixes problem with bio federation.
|
2017-12-03 13:34:17 +01:00 |
|
Lain Iwakura
|
5637d163e6
|
MastodonAPI: Add proper user count.
|
2017-11-30 14:59:44 +01:00 |
|
href
|
1cb5cbdc6c
|
Improve error handling, add configuration
|
2017-11-28 21:44:25 +01:00 |
|
href
|
e28c110eba
|
mandatory typo fix...
|
2017-11-28 20:50:42 +01:00 |
|
href
|
5f35fdcf5d
|
media proxy: good enough wip
|
2017-11-28 20:50:34 +01:00 |
|
lambda
|
9d1c0ec18d
|
Merge branch 'salmon-native-keys' into 'develop'
Salmon: generate private key with native crypto if available.
See merge request pleroma/pleroma!33
|
2017-11-28 16:46:01 +00:00 |
|
href
|
4524721fba
|
Salmon: generate private key with native crypto if available.
|
2017-11-28 16:50:12 +01:00 |
|
Lain Iwakura
|
c680ae581d
|
Return xml notice at /notice path.
|
2017-11-27 17:24:52 +01:00 |
|
Lain Iwakura
|
44dc694882
|
Add configuration generation tool, update readme.
|
2017-11-23 16:22:20 +01:00 |
|
Roger Braun
|
d16b613929
|
MastodonUI login: Show error message on error.
|
2017-11-23 12:06:14 +01:00 |
|
lambda
|
698a75cb39
|
Merge branch 'develop' into 'develop'
Pleroma-Dark default theme for the Mastodon Frontend
See merge request pleroma/pleroma!27
|
2017-11-22 14:19:27 +00:00 |
|
eal
|
1625021a9c
|
Merge branch 'fix/self-follow' into 'develop'
Dont include the user in their own follower count.
See merge request pleroma/pleroma!29
|
2017-11-21 23:09:59 +00:00 |
|
eal
|
e9037ffc8d
|
Do not include user in their own follower count.
|
2017-11-21 15:33:09 +02:00 |
|
eal
|
fa19de97ba
|
MastoAPI: no more than 4 attachments.
|
2017-11-20 22:49:20 +02:00 |
|
Roger Braun
|
747a68a075
|
Treat internal emoji like external.
|
2017-11-20 17:53:21 +01:00 |
|
Roger Braun
|
cf0bbf320d
|
MastoAPI: Add max_toot_chars.
|
2017-11-20 08:54:47 +01:00 |
|
eal
|
bd921ca5d7
|
Fix posts being streamed to non-local websocket channels.
|
2017-11-20 07:58:43 +02:00 |
|
eal
|
4db5954786
|
Don't let the user unfollow their own account.
|
2017-11-20 07:50:56 +02:00 |
|
eal
|
aadf54e0df
|
Don't show the user in their own following count.
|
2017-11-20 00:31:39 +02:00 |
|
Hyper! (Stitch)
|
36011fee4e
|
Add Custom Pleroma-dark theme
|
2017-11-19 19:07:19 +00:00 |
|
Roger Braun
|
52aa65fe6e
|
Federator Queue: Add seperate in/out queues.
|
2017-11-19 15:10:51 +01:00 |
|
Roger Braun
|
5ff5d583b6
|
MastodonAPI: Streaming fixes.
Now shows repeats in the home tl.
|
2017-11-19 13:47:50 +01:00 |
|
Roger Braun
|
0f099dac67
|
MastodonAPI: Add sign out.
Close #79
|
2017-11-19 13:23:16 +01:00 |
|
Roger Braun
|
c336a13d2c
|
MastoAPI: Only return create activties in contexts.
|
2017-11-19 12:59:23 +01:00 |
|
Thog
|
59770c3f5c
|
Fix all compilation warnings
|
2017-11-19 02:22:07 +01:00 |
|
lambda
|
ed3403ad8b
|
Merge branch 'formatting-fixes' into 'develop'
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
|
2017-11-18 15:58:44 +00:00 |
|
eal
|
146ec80285
|
Merge branch 'fix/mastofe-login-redirect' into 'develop'
Redirect to Getting Started on login.
See merge request pleroma/pleroma!21
|
2017-11-18 14:38:05 +00:00 |
|
eal
|
f53cdabcdf
|
Add #nsfw tag if sensitive content bit is set
|
2017-11-18 16:30:18 +02:00 |
|
eal
|
31e4277ba5
|
Don't add summary if empty.
|
2017-11-18 15:25:22 +02:00 |
|
eal
|
fb118b2978
|
Don't insert newlines to generated HTML.
MastoFE doesn't like them.
|
2017-11-18 14:46:54 +02:00 |
|
eal
|
66e78c3ec4
|
Escape HTML instead of discarding it.
|
2017-11-18 14:43:41 +02:00 |
|
Roger Braun
|
4647bcd6e6
|
Don't start streamer during tests.
|
2017-11-18 12:22:07 +01:00 |
|
eal
|
9c60cc88df
|
Redirect to Getting Started on login.
|
2017-11-16 20:47:44 +02:00 |
|
Roger Braun
|
a743940463
|
MastoAPI: Implement all streaming functions.
|
2017-11-16 16:49:51 +01:00 |
|
Roger Braun
|
5719f69ae3
|
MastodonAPI: Stream fixes.
|
2017-11-16 13:48:58 +01:00 |
|
Roger Braun
|
43499848d0
|
Small css fix.
|
2017-11-16 12:58:33 +01:00 |
|
Shpuld Shpuldson
|
189513e4ff
|
Add styles to make login page resemble mastodon's
|
2017-11-16 13:26:56 +02:00 |
|
Roger Braun
|
8de890a0d9
|
Add custom emoji to Mastodon UI initial state.
|
2017-11-16 09:40:06 +01:00 |