72f7baa654
Merge remote-tracking branch 'upstream/develop' into media-proxy
2017-12-05 14:12:15 +01:00
08e7e249b1
Merge branch 'feature/chat' into 'develop'
...
Feature/chat
See merge request pleroma/pleroma!36
2017-12-05 11:27:11 +00:00
e7c2472abd
Fix tests.
2017-12-05 12:18:04 +01:00
74e92152b7
Update frontend.
2017-12-05 12:11:46 +01:00
b652dc5f2e
Update frontend.
2017-12-05 11:53:12 +01:00
1c90bfb4f6
Merge remote-tracking branch 'origin/develop' into feature/chat
2017-12-05 10:20:00 +01:00
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
5945ec84e9
Don't save user in socket, just save the name.
2017-12-05 10:01:36 +01:00
69f1024bb0
Add basic channel state.
2017-12-05 09:36:26 +01:00
c1fa1e8844
Fix basic auth for passwords with a colon.
2017-12-04 22:45:16 +02:00
d01243c16e
Update frontend.
2017-12-04 19:12:31 +01:00
5c40986120
Basic backend chat.
2017-12-04 19:10:15 +01:00
964e2dd2f0
unfuck
2017-12-04 04:06:52 +03:00
6b60f5f64a
made psql script compatible with migrations or generate_config reruns
2017-12-04 03:56:54 +03:00
071f518028
reverts config gen
2017-12-04 03:56:54 +03:00
a884e08271
fix
2017-12-04 03:56:54 +03:00
4071403117
fixes
2017-12-04 03:56:54 +03:00
0673511d39
first version of safe DB setup
2017-12-04 03:56:54 +03:00
d08a34e88b
OStatus: Add user bio as summary field
...
Fixes problem with bio federation.
2017-12-03 13:34:17 +01:00
50dca016f2
Add count index for local users.
2017-11-30 15:00:12 +01:00
5637d163e6
MastodonAPI: Add proper user count.
2017-11-30 14:59:44 +01:00
1cb5cbdc6c
Improve error handling, add configuration
2017-11-28 21:44:25 +01:00
e28c110eba
mandatory typo fix...
2017-11-28 20:50:42 +01:00
5f35fdcf5d
media proxy: good enough wip
2017-11-28 20:50:34 +01:00
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
4524721fba
Salmon: generate private key with native crypto if available.
2017-11-28 16:50:12 +01:00
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01:00
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
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
44f7154fb9
Update frontend.
2017-11-24 08:37:41 +01:00
386c130769
More readme updates.
2017-11-23 16:41:09 +01:00
ecf109a0fe
Add mix deps.get back to readme.
2017-11-23 16:35:03 +01:00
44dc694882
Add configuration generation tool, update readme.
2017-11-23 16:22:20 +01:00
d16b613929
MastodonUI login: Show error message on error.
2017-11-23 12:06:14 +01:00
ad90da07f5
untoot.
2017-11-22 16:10:03 +01:00
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
d7b6fa79cb
Fixed in-reply CSS, also included full column width (to have timelines take the whole screen size.)
2017-11-22 14:12:04 +00:00
bcc4e73e51
Update README.md
2017-11-22 13:42:27 +00:00
0716f8e626
Update frontend.
2017-11-22 12:19:13 +01:00
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
e9037ffc8d
Do not include user in their own follower count.
2017-11-21 15:33:09 +02:00
9b35a4e850
Merge branch 'fix/mastoapi-attachment-count' into 'develop'
...
MastoAPI: no more than 4 attachments.
See merge request pleroma/pleroma!28
2017-11-20 20:55:27 +00:00
fa19de97ba
MastoAPI: no more than 4 attachments.
2017-11-20 22:49:20 +02:00
dae2949bcc
Fix a links... Retweet button still broken.
2017-11-20 17:19:22 +00:00
3d29fc5462
Make /api/friends/ids test deterministic.
2017-11-20 19:16:43 +02:00
0c68e75b93
Update pl-dark-masto-fe.css
2017-11-20 17:09:14 +00:00
cb071745b5
Update pl-dark-masto-fe.css, fix notification_message and retweet
2017-11-20 16:54:32 +00:00
747a68a075
Treat internal emoji like external.
2017-11-20 17:53:21 +01:00
cf0bbf320d
MastoAPI: Add max_toot_chars.
2017-11-20 08:54:47 +01:00
6900851581
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
2017-11-20 07:27:10 +00:00
href