akkoma
6 years agoRemove a useless URI.encode call in MediaProxy
href [Thu, 21 Dec 2017 19:59:10 +0000 (20:59 +0100)]
Remove a useless URI.encode call in MediaProxy

6 years agoMerge branch 'media-proxy' into 'develop'
lambda [Wed, 20 Dec 2017 14:22:24 +0000 (14:22 +0000)]
Merge branch 'media-proxy' into 'develop'

Media proxy

See merge request pleroma/pleroma!34

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Lain Iwakura [Tue, 19 Dec 2017 15:15:45 +0000 (16:15 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoFix timelines in subway tooter.
Lain Iwakura [Tue, 19 Dec 2017 15:15:07 +0000 (16:15 +0100)]
Fix timelines in subway tooter.

6 years agoMerge branch 'fix/twitterapi-follow-lists' into 'develop'
lambda [Mon, 18 Dec 2017 22:44:15 +0000 (22:44 +0000)]
Merge branch 'fix/twitterapi-follow-lists' into 'develop'

Fix follower/following lists.

Closes #29

See merge request pleroma/pleroma!41

6 years agoMastoAPI: Fix always-sensitive bugs.
Lain Iwakura [Mon, 18 Dec 2017 15:56:03 +0000 (16:56 +0100)]
MastoAPI: Fix always-sensitive bugs.

6 years agoSend out salmons before websub.
Lain Iwakura [Mon, 18 Dec 2017 15:16:22 +0000 (16:16 +0100)]
Send out salmons before websub.

6 years agoFix follower/following lists.
eal [Mon, 18 Dec 2017 14:23:04 +0000 (16:23 +0200)]
Fix follower/following lists.

Add tests.

6 years agoMerge branch 'feature/follow-import' into 'develop'
lambda [Mon, 18 Dec 2017 10:59:57 +0000 (10:59 +0000)]
Merge branch 'feature/follow-import' into 'develop'

Add follow import.

See merge request pleroma/pleroma!40

6 years agoRun follow import in the background.
eal [Tue, 12 Dec 2017 19:04:41 +0000 (21:04 +0200)]
Run follow import in the background.

6 years agoAllow uploading a file for follow import.
eal [Tue, 12 Dec 2017 19:03:28 +0000 (21:03 +0200)]
Allow uploading a file for follow import.

6 years agoAdd follow import.
eal [Tue, 12 Dec 2017 16:35:23 +0000 (18:35 +0200)]
Add follow import.

6 years agoproxy emojis
href [Tue, 12 Dec 2017 11:30:24 +0000 (12:30 +0100)]
proxy emojis

(i fix emojos better than gargon but sshhhhh)

6 years agofix content-type and fallback to image/jpeg
href [Tue, 12 Dec 2017 10:45:55 +0000 (11:45 +0100)]
fix content-type and fallback to image/jpeg

6 years agoFix some more tests.
eal [Mon, 11 Dec 2017 19:01:36 +0000 (21:01 +0200)]
Fix some more tests.

6 years agoFix tests.
eal [Mon, 11 Dec 2017 16:41:03 +0000 (18:41 +0200)]
Fix tests.

6 years agoMerge branch 'fix/tootdon-mentions' into 'develop'
lambda [Mon, 11 Dec 2017 16:21:43 +0000 (16:21 +0000)]
Merge branch 'fix/tootdon-mentions' into 'develop'

Fix Tootdon linking the whole status when mentioning someone.

See merge request pleroma/pleroma!39

6 years agoAdd a bunch of useless HTML to mentions.
eal [Mon, 11 Dec 2017 16:14:33 +0000 (18:14 +0200)]
Add a bunch of useless HTML to mentions.

6 years agoMerge remote-tracking branch 'upstream/develop' into media-proxy
href [Mon, 11 Dec 2017 01:45:28 +0000 (02:45 +0100)]
Merge remote-tracking branch 'upstream/develop' into media-proxy

6 years agonginx sample config, quickly tested
href [Mon, 11 Dec 2017 01:40:19 +0000 (02:40 +0100)]
nginx sample config, quickly tested

6 years agoLimit body size to 25MB
href [Mon, 11 Dec 2017 01:31:37 +0000 (02:31 +0100)]
Limit body size to 25MB

6 years agoMerge branch 'feature/user_deletion' into develop
Roger Braun [Sat, 9 Dec 2017 09:10:45 +0000 (10:10 +0100)]
Merge branch 'feature/user_deletion' into develop

6 years agoDelete notifications on activity deletion.
Lain Iwakura [Fri, 8 Dec 2017 17:17:30 +0000 (18:17 +0100)]
Delete notifications on activity deletion.

6 years agoBasic user deletion.
Lain Iwakura [Fri, 8 Dec 2017 16:50:11 +0000 (17:50 +0100)]
Basic user deletion.

6 years agoMerge branch 'fix/linkify' into 'develop'
lambda [Fri, 8 Dec 2017 12:34:03 +0000 (12:34 +0000)]
Merge branch 'fix/linkify' into 'develop'

Fix links with HTML elements and/or parentheses.

See merge request pleroma/pleroma!38

6 years agoMerge branch 'fix/mastoapi-attachment-linking' into 'develop'
lambda [Fri, 8 Dec 2017 12:32:33 +0000 (12:32 +0000)]
Merge branch 'fix/mastoapi-attachment-linking' into 'develop'

MastoAPI: don't add attachment links.

Closes #92

See merge request pleroma/pleroma!37

6 years agoMerge branch 'postgresetup' into 'develop'
lambda [Fri, 8 Dec 2017 12:31:14 +0000 (12:31 +0000)]
Merge branch 'postgresetup' into 'develop'

first version of safe DB setup

See merge request pleroma/pleroma!32

6 years agoAllow parentheses in links.
eal [Thu, 7 Dec 2017 19:38:31 +0000 (21:38 +0200)]
Allow parentheses in links.

6 years agoFix HTML escape breaking some links.
eal [Thu, 7 Dec 2017 19:34:25 +0000 (21:34 +0200)]
Fix HTML escape breaking some links.

6 years agoMastoAPI: don't add attachment links.
eal [Thu, 7 Dec 2017 18:44:09 +0000 (20:44 +0200)]
MastoAPI: don't add attachment links.

6 years agoAdd websocket upgrade to example nginx config.
eal [Thu, 7 Dec 2017 18:07:51 +0000 (20:07 +0200)]
Add websocket upgrade to example nginx config.

6 years agoUser deletion: Remove relationships.
Lain Iwakura [Thu, 7 Dec 2017 17:13:05 +0000 (18:13 +0100)]
User deletion: Remove relationships.

6 years agoDon't follow deactivated users.
Lain Iwakura [Thu, 7 Dec 2017 16:51:55 +0000 (17:51 +0100)]
Don't follow deactivated users.

6 years agoAdd function to deactivate users.
Lain Iwakura [Thu, 7 Dec 2017 16:47:23 +0000 (17:47 +0100)]
Add function to deactivate users.

6 years agoDon't log in deactivated users.
Lain Iwakura [Thu, 7 Dec 2017 16:41:34 +0000 (17:41 +0100)]
Don't log in deactivated users.

6 years agoPriority queue fixes.
Lain Iwakura [Wed, 6 Dec 2017 15:51:11 +0000 (16:51 +0100)]
Priority queue fixes.

6 years agoAdd basic queue prioritization.
Lain Iwakura [Tue, 5 Dec 2017 17:21:30 +0000 (18:21 +0100)]
Add basic queue prioritization.

6 years agoMerge remote-tracking branch 'upstream/develop' into media-proxy
href [Tue, 5 Dec 2017 13:12:15 +0000 (14:12 +0100)]
Merge remote-tracking branch 'upstream/develop' into media-proxy

6 years agoMerge branch 'feature/chat' into 'develop'
lambda [Tue, 5 Dec 2017 11:27:11 +0000 (11:27 +0000)]
Merge branch 'feature/chat' into 'develop'

Feature/chat

See merge request pleroma/pleroma!36

6 years agoFix tests.
Lain Iwakura [Tue, 5 Dec 2017 11:18:04 +0000 (12:18 +0100)]
Fix tests.

6 years agoUpdate frontend.
Lain Iwakura [Tue, 5 Dec 2017 11:11:46 +0000 (12:11 +0100)]
Update frontend.

6 years agoUpdate frontend.
Lain Iwakura [Tue, 5 Dec 2017 10:53:12 +0000 (11:53 +0100)]
Update frontend.

6 years agoMerge remote-tracking branch 'origin/develop' into feature/chat
Roger Braun [Tue, 5 Dec 2017 09:20:00 +0000 (10:20 +0100)]
Merge remote-tracking branch 'origin/develop' into feature/chat

6 years agoMerge branch 'fix/odd-passwords' into 'develop'
lambda [Tue, 5 Dec 2017 09:10:37 +0000 (09:10 +0000)]
Merge branch 'fix/odd-passwords' into 'develop'

Fix basic auth for passwords with a colon.

See merge request pleroma/pleroma!35

6 years agoDon't save user in socket, just save the name.
Roger Braun [Tue, 5 Dec 2017 09:01:36 +0000 (10:01 +0100)]
Don't save user in socket, just save the name.

6 years agoAdd basic channel state.
Roger Braun [Tue, 5 Dec 2017 08:36:26 +0000 (09:36 +0100)]
Add basic channel state.

6 years agoFix basic auth for passwords with a colon.
eal [Mon, 4 Dec 2017 20:45:16 +0000 (22:45 +0200)]
Fix basic auth for passwords with a colon.

6 years agoUpdate frontend.
Lain Iwakura [Mon, 4 Dec 2017 18:12:31 +0000 (19:12 +0100)]
Update frontend.

6 years agoBasic backend chat.
Lain Iwakura [Mon, 4 Dec 2017 18:10:15 +0000 (19:10 +0100)]
Basic backend chat.

6 years agounfuck
Henry Jameson [Mon, 4 Dec 2017 01:06:52 +0000 (04:06 +0300)]
unfuck

6 years agomade psql script compatible with migrations or generate_config reruns
Henry Jameson [Sun, 3 Dec 2017 23:06:05 +0000 (02:06 +0300)]
made psql script compatible with migrations or generate_config reruns

6 years agoreverts config gen
Henry Jameson [Sun, 3 Dec 2017 23:01:45 +0000 (02:01 +0300)]
reverts config gen

6 years agofix
Henry Jameson [Mon, 27 Nov 2017 21:44:14 +0000 (00:44 +0300)]
fix

6 years agofixes
Henry Jameson [Mon, 27 Nov 2017 21:42:03 +0000 (00:42 +0300)]
fixes

6 years agofirst version of safe DB setup
Henry Jameson [Sun, 26 Nov 2017 17:57:49 +0000 (20:57 +0300)]
first version of safe DB setup

6 years agoOStatus: Add user bio as summary field
Roger Braun [Sun, 3 Dec 2017 12:34:17 +0000 (13:34 +0100)]
OStatus: Add user bio as summary field

Fixes problem with bio federation.

6 years agoAdd count index for local users.
Lain Iwakura [Thu, 30 Nov 2017 14:00:12 +0000 (15:00 +0100)]
Add count index for local users.

6 years agoMastodonAPI: Add proper user count.
Lain Iwakura [Thu, 30 Nov 2017 13:59:44 +0000 (14:59 +0100)]
MastodonAPI: Add proper user count.

6 years agoImprove error handling, add configuration
href [Tue, 28 Nov 2017 20:44:25 +0000 (21:44 +0100)]
Improve error handling, add configuration

6 years agomandatory typo fix...
href [Wed, 22 Nov 2017 18:14:03 +0000 (19:14 +0100)]
mandatory typo fix...

6 years agomedia proxy: good enough wip
href [Wed, 22 Nov 2017 18:06:07 +0000 (19:06 +0100)]
media proxy: good enough wip

6 years agoMerge branch 'salmon-native-keys' into 'develop'
lambda [Tue, 28 Nov 2017 16:46:01 +0000 (16:46 +0000)]
Merge branch 'salmon-native-keys' into 'develop'

Salmon: generate private key with native crypto if available.

See merge request pleroma/pleroma!33

6 years agoSalmon: generate private key with native crypto if available.
href [Tue, 28 Nov 2017 15:50:12 +0000 (16:50 +0100)]
Salmon: generate private key with native crypto if available.

7 years agoReturn xml notice at /notice path.
Lain Iwakura [Mon, 27 Nov 2017 16:24:52 +0000 (17:24 +0100)]
Return xml notice at /notice path.

7 years agoMerge branch 'patch-1' into 'develop'
eal [Sat, 25 Nov 2017 23:10:43 +0000 (23:10 +0000)]
Merge branch 'patch-1' into 'develop'

fix mix typo in README.md

See merge request pleroma/pleroma!31

7 years agofix mix typo in README.md
Partial name [Sat, 25 Nov 2017 02:42:39 +0000 (02:42 +0000)]
fix mix typo in README.md

$ mix phx.serve
** (Mix) The task "phx.serve" could not be found. Did you mean "phx.server"?

$ mix phx.server
[info] Running Pleroma.Web.Endpoint with Cowboy using http://0.0.0.0:4000

7 years agoUpdate frontend.
Roger Braun [Fri, 24 Nov 2017 07:37:41 +0000 (08:37 +0100)]
Update frontend.

7 years agoMore readme updates.
Lain Iwakura [Thu, 23 Nov 2017 15:41:09 +0000 (16:41 +0100)]
More readme updates.

7 years agoAdd mix deps.get back to readme.
Lain Iwakura [Thu, 23 Nov 2017 15:35:03 +0000 (16:35 +0100)]
Add mix deps.get back to readme.

7 years agoAdd configuration generation tool, update readme.
Lain Iwakura [Thu, 23 Nov 2017 15:22:20 +0000 (16:22 +0100)]
Add configuration generation tool, update readme.

7 years agoMastodonUI login: Show error message on error.
Roger Braun [Thu, 23 Nov 2017 11:06:14 +0000 (12:06 +0100)]
MastodonUI login: Show error message on error.

7 years agountoot.
Roger Braun [Wed, 22 Nov 2017 15:10:03 +0000 (16:10 +0100)]
untoot.

7 years agoMerge branch 'develop' into 'develop'
lambda [Wed, 22 Nov 2017 14:19:27 +0000 (14:19 +0000)]
Merge branch 'develop' into 'develop'

Pleroma-Dark default theme for the Mastodon Frontend

See merge request pleroma/pleroma!27

7 years agoFixed in-reply CSS, also included full column width (to have timelines take the whole...
Hyper! (Stitch) [Wed, 22 Nov 2017 14:12:04 +0000 (14:12 +0000)]
Fixed in-reply CSS, also included full column width (to have timelines take the whole screen size.)

7 years agoUpdate README.md
lambda [Wed, 22 Nov 2017 13:42:27 +0000 (13:42 +0000)]
Update README.md

7 years agoUpdate frontend.
Roger Braun [Wed, 22 Nov 2017 11:19:13 +0000 (12:19 +0100)]
Update frontend.

7 years agoMerge branch 'fix/self-follow' into 'develop'
eal [Tue, 21 Nov 2017 23:09:59 +0000 (23:09 +0000)]
Merge branch 'fix/self-follow' into 'develop'

Dont include the user in their own follower count.

See merge request pleroma/pleroma!29

7 years agoDo not include user in their own follower count.
eal [Tue, 21 Nov 2017 13:33:09 +0000 (15:33 +0200)]
Do not include user in their own follower count.

7 years agoMerge branch 'fix/mastoapi-attachment-count' into 'develop'
eal [Mon, 20 Nov 2017 20:55:27 +0000 (20:55 +0000)]
Merge branch 'fix/mastoapi-attachment-count' into 'develop'

MastoAPI: no more than 4 attachments.

See merge request pleroma/pleroma!28

7 years agoMastoAPI: no more than 4 attachments.
eal [Mon, 20 Nov 2017 20:49:20 +0000 (22:49 +0200)]
MastoAPI: no more than 4 attachments.

7 years agoFix a links... Retweet button still broken.
Hyper! (Stitch) [Mon, 20 Nov 2017 17:19:22 +0000 (17:19 +0000)]
Fix a links... Retweet button still broken.

7 years agoMake /api/friends/ids test deterministic.
eal [Mon, 20 Nov 2017 17:16:43 +0000 (19:16 +0200)]
Make /api/friends/ids test deterministic.

7 years agoUpdate pl-dark-masto-fe.css
Hyper! (Stitch) [Mon, 20 Nov 2017 17:09:14 +0000 (17:09 +0000)]
Update pl-dark-masto-fe.css

7 years agoUpdate pl-dark-masto-fe.css, fix notification_message and retweet
Hyper! (Stitch) [Mon, 20 Nov 2017 16:54:32 +0000 (16:54 +0000)]
Update pl-dark-masto-fe.css, fix notification_message and retweet

7 years agoTreat internal emoji like external.
Roger Braun [Mon, 20 Nov 2017 16:53:21 +0000 (17:53 +0100)]
Treat internal emoji like external.

7 years agoMastoAPI: Add max_toot_chars.
Roger Braun [Mon, 20 Nov 2017 07:54:47 +0000 (08:54 +0100)]
MastoAPI: Add max_toot_chars.

7 years agoMerge branch 'fix/self-follow' into 'develop'
lambda [Mon, 20 Nov 2017 07:27:10 +0000 (07:27 +0000)]
Merge branch 'fix/self-follow' into 'develop'

Fix self follows to be more intuitive, fix minor websocket channel issue

See merge request pleroma/pleroma!26

7 years agoEnsure correct state in self-unfollow.
eal [Mon, 20 Nov 2017 07:26:31 +0000 (09:26 +0200)]
Ensure correct state in self-unfollow.

7 years agoFix posts being streamed to non-local websocket channels.
eal [Mon, 20 Nov 2017 05:58:43 +0000 (07:58 +0200)]
Fix posts being streamed to non-local websocket channels.

7 years agoMake users in tests follow themselves by default.
eal [Mon, 20 Nov 2017 05:52:02 +0000 (07:52 +0200)]
Make users in tests follow themselves by default.

Also fix the semantics of all tests to match.

7 years agoDon't let the user unfollow their own account.
eal [Sun, 19 Nov 2017 23:21:53 +0000 (01:21 +0200)]
Don't let the user unfollow their own account.

7 years agoDon't show the user in their own following count.
eal [Sun, 19 Nov 2017 22:31:39 +0000 (00:31 +0200)]
Don't show the user in their own following count.

7 years agoAdd Custom Pleroma-dark theme
Hyper! (Stitch) [Sun, 19 Nov 2017 19:07:19 +0000 (19:07 +0000)]
Add Custom Pleroma-dark theme

7 years agoUpdate pl-dark-masto-fe.css
Hyper! (Stitch) [Sun, 19 Nov 2017 19:04:51 +0000 (19:04 +0000)]
Update pl-dark-masto-fe.css

7 years agoAdd new file
Hyper! (Stitch) [Sun, 19 Nov 2017 19:04:21 +0000 (19:04 +0000)]
Add new file

7 years agoFederator Queue: Add seperate in/out queues.
Roger Braun [Sun, 19 Nov 2017 14:10:51 +0000 (15:10 +0100)]
Federator Queue: Add seperate in/out queues.

7 years agoMastodonAPI: Streaming fixes.
Roger Braun [Sun, 19 Nov 2017 12:47:50 +0000 (13:47 +0100)]
MastodonAPI: Streaming fixes.

Now shows repeats in the home tl.

7 years agoUpdate frontend.
Roger Braun [Sun, 19 Nov 2017 12:31:09 +0000 (13:31 +0100)]
Update frontend.

7 years agoMastodonAPI: Add sign out.
Roger Braun [Sun, 19 Nov 2017 12:23:16 +0000 (13:23 +0100)]
MastodonAPI: Add sign out.

Close #79

7 years agoFix flakey test.
Roger Braun [Sun, 19 Nov 2017 12:07:29 +0000 (13:07 +0100)]
Fix flakey test.