Commit graph

967 commits

Author SHA1 Message Date
href d1806ec07f
nginx sample config, quickly tested 2017-12-11 02:40:19 +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
eal afd0ea37f3 Add websocket upgrade to example nginx config. 2017-12-07 20:07:51 +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
lambda 08e7e249b1 Merge branch 'feature/chat' into 'develop'
Feature/chat

See merge request pleroma/pleroma!36
2017-12-05 11:27:11 +00:00
Lain Iwakura e7c2472abd Fix tests. 2017-12-05 12:18:04 +01:00
Lain Iwakura 74e92152b7 Update frontend. 2017-12-05 12:11:46 +01:00
Lain Iwakura b652dc5f2e Update frontend. 2017-12-05 11:53:12 +01:00
Roger Braun 1c90bfb4f6 Merge remote-tracking branch 'origin/develop' into feature/chat 2017-12-05 10:20:00 +01:00
lambda 7f336cb8b1 Merge branch 'fix/odd-passwords' into 'develop'
Fix basic auth for passwords with a colon.

See merge request pleroma/pleroma!35
2017-12-05 09:10:37 +00: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 d01243c16e Update frontend. 2017-12-04 19:12:31 +01: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 50dca016f2 Add count index for local users. 2017-11-30 15:00:12 +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
eal 89a8dc7485 Merge branch 'patch-1' into 'develop'
fix mix typo in README.md

See merge request pleroma/pleroma!31
2017-11-25 23:10:43 +00:00
Partial name f86fca682a 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
2017-11-25 02:42:39 +00:00
Roger Braun 44f7154fb9 Update frontend. 2017-11-24 08:37:41 +01:00