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 |
|
Roger Braun
|
ced0d64d75
|
MastoAPI: Make attachment ids strings.
|
2017-11-15 18:58:39 +01:00 |
|
lambda
|
1cca544e20
|
Merge branch 'twitterapi-bitlbee' into 'develop'
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
|
2017-11-14 16:47:54 +00:00 |
|
eal
|
f9828e578c
|
TwitterAPI: Add /users/show.
|
2017-11-14 17:34:48 +02:00 |
|
eal
|
163c658202
|
TwitterAPI: Add unimplemented /mutes/users/ids.
|
2017-11-14 16:12:52 +02:00 |
|
eal
|
22bbe27115
|
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
|
2017-11-14 16:10:13 +02:00 |
|
eal
|
3533bf7eac
|
TwitterAPI: Add /friends/ids.
|
2017-11-14 16:04:58 +02:00 |
|
eal
|
06c3ee3bac
|
Accept 1 as true.
|
2017-11-14 15:54:50 +02:00 |
|
eal
|
c84723b679
|
MastoAPI: Add media timelines.
|
2017-11-14 15:41:16 +02:00 |
|
Roger Braun
|
083cd169d2
|
MastoAPI: Fix repeat api bug.
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
|
2017-11-13 09:48:56 +01:00 |
|
Roger Braun
|
5fc6e9d467
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2017-11-12 14:25:15 +01:00 |
|
Roger Braun
|
d293ceb1b5
|
Add Mastodon frontend.
|
2017-11-12 14:23:05 +01:00 |
|
lambda
|
08bc316742
|
Merge branch 'mastodon-notification-endpoints' into 'develop'
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
|
2017-11-12 11:08:06 +00:00 |
|
lambda
|
87dee3902a
|
Merge branch 'filetype-recognition' into 'develop'
Use headers for file content type recognition.
See merge request pleroma/pleroma!14
|
2017-11-12 09:27:59 +00:00 |
|
lambda
|
efcf54dc02
|
Merge branch 'mastoapi-update-credentials' into 'develop'
MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15
|
2017-11-12 09:24:32 +00:00 |
|
eal
|
18a95cd375
|
Add common video and audio types.
|
2017-11-12 01:20:50 +02:00 |
|
eal
|
fc7483cb3c
|
MastoAPI: Add update credentials endpoint.
|
2017-11-12 00:27:09 +02:00 |
|
eal
|
260b148b92
|
Use headers for file content type recognition.
|
2017-11-11 23:24:54 +02:00 |
|
Roger Braun
|
414c52509b
|
MastoAPI: Websocket streaming for federated timeline.
|
2017-11-11 20:00:11 +01:00 |
|
Roger Braun
|
bd5bdc4c24
|
MastoAPI: Basic streaming.
|
2017-11-11 14:59:25 +01:00 |
|
Roger Braun
|
a1923d20e8
|
MastoAPI: Fix reblog emojis.
|
2017-11-11 11:18:05 +01:00 |
|
Roger Braun
|
fd12e585c9
|
Handle existing redirect params.
|
2017-11-10 18:24:50 +01:00 |
|
Roger Braun
|
1d3d66a841
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2017-11-10 17:37:54 +01:00 |
|
Roger Braun
|
6e9c22c0af
|
MastoAPI: Use string ids everywhere.
|
2017-11-10 17:18:19 +01:00 |
|
eal
|
e6a78c6ed0
|
MastoAPI: Add notification get, clear and dismiss.
|
2017-11-10 15:24:52 +02:00 |
|
Roger Braun
|
1b8ad9f731
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2017-11-09 16:49:32 +01:00 |
|
Roger Braun
|
266d9c008d
|
MastoAPI: Fetch statuses in search.
|
2017-11-09 16:48:45 +01:00 |
|
lambda
|
2247d7580e
|
Merge branch 'fix-tootdon-image-uploads' into 'develop'
Correct mimetype on bad uploads.
See merge request pleroma/pleroma!12
|
2017-11-09 14:41:44 +00:00 |
|
eal
|
e942e1e552
|
Correct mimetype on bad uploads.
|
2017-11-09 15:01:59 +02:00 |
|
Roger Braun
|
f1d27a5fbb
|
Add actor column to activities.
|
2017-11-09 10:41:19 +01:00 |
|
Roger Braun
|
41b8a76e96
|
Re-fetch user data on salmon decode error.
|
2017-11-09 08:32:54 +01:00 |
|
lambda
|
77e272df2d
|
Merge branch 'following-you-in-user-view' into 'develop'
TwitterAPI user view: add follows_you.
See merge request pleroma/pleroma!11
|
2017-11-08 17:57:13 +00:00 |
|
eal
|
f7fc048aeb
|
TwitterAPI user view: add follows_you.
|
2017-11-08 19:13:03 +02:00 |
|
Roger Braun
|
d2430d5007
|
Look through whole db for user timelines.
They already have an index that's good enough.
|
2017-11-08 17:25:18 +01:00 |
|
eal
|
4656cb9b99
|
TwitterAPI user view: add blocks.
|
2017-11-08 13:02:00 +02:00 |
|
eal
|
6c0758e041
|
TwitterAPI: Add blocks.
|
2017-11-08 00:04:53 +02:00 |
|
lambda
|
be67db5547
|
Merge branch 'mastodon-emoji-endpoint' into 'develop'
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
|
2017-11-07 20:01:15 +00:00 |
|
eal
|
c6210183e1
|
Add mastodon API endpoint for custom emoji.
|
2017-11-07 21:55:01 +02:00 |
|
lambda
|
d761b1543a
|
Merge branch 'authenticated-profile-fetching' into 'develop'
Allow profile fetching for authenticated users only.
Closes #54
See merge request pleroma/pleroma!7
|
2017-11-07 18:58:22 +00:00 |
|
Roger Braun
|
722c4614ad
|
Allow self-rt.
|
2017-11-07 16:45:27 +01:00 |
|
Roger Braun
|
7da978f3f5
|
Linkify fixes.
|
2017-11-07 12:06:37 +01:00 |
|
Roger Braun
|
6dfa62800a
|
Revert "Longer timeouts for user fetching."
Breaks too many tests.
This reverts commit 7de3a65214.
|
2017-11-07 09:41:35 +01:00 |
|
Roger Braun
|
7de3a65214
|
Longer timeouts for user fetching.
|
2017-11-07 09:11:19 +01:00 |
|
eal
|
f85566324e
|
Allow profile fetching for authenticated users only.
|
2017-11-07 00:33:44 +02:00 |
|
lambda
|
ed1eb5deea
|
Merge branch 'fix-tootdon-oauth' into 'develop'
Fix tootdon logins.
See merge request pleroma/pleroma!6
|
2017-11-06 20:27:31 +00:00 |
|
eal
|
b0e27b21dd
|
Fix tootdon logins.
|
2017-11-06 21:51:31 +02:00 |
|
Roger Braun
|
7252f6b054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2017-11-05 12:12:19 +01:00 |
|
Roger Braun
|
046bee34d3
|
Fix bug when no posts are in the db.
|
2017-11-05 12:11:59 +01:00 |
|
lambda
|
fa1f11e8e9
|
Merge branch 'feature/blocks' into 'develop'
Feature/blocks
See merge request pleroma/pleroma!5
|
2017-11-03 08:56:44 +00:00 |
|
Roger Braun
|
c6b9b777da
|
MastoAPI: Add list of blocked users.
|
2017-11-03 08:51:17 +01:00 |
|
Roger Braun
|
5bf92e50be
|
MastoAPI: Add blocking.
|
2017-11-03 08:38:05 +01:00 |
|
Roger Braun
|
33beb51da4
|
MastoAPI: Add blocking to AccountView.
|
2017-11-03 08:23:31 +01:00 |
|
Roger Braun
|
8a1a7191fd
|
MastoAPI: Fix mentions always being for an anonymous user.
|
2017-11-03 08:13:39 +01:00 |
|
Roger Braun
|
9b63647aff
|
MastoApi: Add blocking to fetches.
|
2017-11-02 22:53:34 +01:00 |
|
Roger Braun
|
d89a7a0b34
|
TwitterAPI: Add blocking to fetches.
|
2017-11-02 22:50:42 +01:00 |
|
Roger Braun
|
867ac1e4f5
|
Handle nil cases.
|
2017-11-02 22:47:48 +01:00 |
|
Roger Braun
|
8ef58a266b
|
Don't return blocked users' activities in contexts.
|
2017-11-02 22:44:36 +01:00 |
|
Roger Braun
|
a47727adde
|
Don't return activities from blocked users.
|
2017-11-02 22:37:26 +01:00 |
|