b37b26ab87
Merge branch 'feature/cowboy2' into 'develop'
...
upgrade to cowboy 2.6
See merge request pleroma/pleroma!876
2019-03-01 09:42:34 +00:00
6b2a1ad1c8
config: fix chat endpoint path
2019-02-28 17:00:54 +00:00
28b4093233
mastodon websocket: return errors using ok, not stop
2019-02-28 16:23:55 +00:00
388a3f4ca2
mastodon websocket: bring back infinity timeout
2019-02-28 16:23:24 +00:00
f1d37a5e23
mastodon websocket: use pattern match to get query data, robustly handle errors
2019-02-28 16:02:48 +00:00
9aec00d711
config: update config for cowboy 2 endpoints
2019-02-28 15:44:12 +00:00
bc53dff5b6
mastodon api: websocket: update code for cowboy 2.x
2019-02-28 15:44:12 +00:00
e10ca35b3d
mix: update dependencies for cowboy 2.0
2019-02-28 15:44:07 +00:00
a47cc5a2cf
Merge branch 'customizable_auth' into 'develop'
...
Authenticator tweaks
See merge request pleroma/pleroma!875
2019-02-28 11:18:01 +00:00
3281a3f074
Renamed *DatabaseAuthenticator to *Authenticator.
2019-02-28 14:12:41 +03:00
4e77f68414
Added `auth_template/0` to DatabaseAuthenticator.
2019-02-28 13:58:58 +03:00
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
2019-02-28 10:22:19 +00:00
90a24fbf95
Merge branch 'customizable_auth' into 'develop'
...
Auth customization support
See merge request pleroma/pleroma!852
2019-02-28 10:12:26 +00:00
089e2588a3
Merge branch 'speedup-follow-requests' into 'develop'
...
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
2019-02-28 10:10:03 +00:00
3c849d0438
Merge branch 'deactivated-in-user-view' into 'develop'
...
Add activation status to the regular user view
See merge request pleroma/pleroma!874
2019-02-28 10:08:31 +00:00
b6f915313f
Made auth customization be runtime-configurable.
2019-02-28 13:00:54 +03:00
9cc98b496e
Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'
...
mastodon api: embed relationship card under account card for Pleroma FE convenience
See merge request pleroma/pleroma!870
2019-02-28 07:35:26 +00:00
6b11011039
Added deactivated to the user view
2019-02-28 09:08:34 +03:00
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
2019-02-27 17:24:51 +01:00
9ade1242c2
Add user muted status info to twitterapi.
2019-02-27 16:52:03 +01:00
c1ae495878
Add user muted status info to MastodonAPI.
2019-02-27 16:46:47 +01:00
c4235f96bd
Add `with_muted` param.
2019-02-27 16:37:42 +01:00
b24cc44e8d
Follower requests: Utilize object index.
...
Closes #677
2019-02-27 15:01:54 +01:00
8d8cb08f94
Add follow request test.
2019-02-27 14:51:07 +01:00
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
2019-02-27 13:01:10 +00:00
14bc6bd40f
Merge branch 'fix/formatter' into 'develop'
...
Bugfix: markdown in formatter
Closes #688
See merge request pleroma/pleroma!869
2019-02-27 08:45:43 +00:00
5d961d536c
fix formatter
2019-02-27 15:40:30 +07:00
a50a47a011
Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'
...
Add missing docs and tests to Admin API
See merge request pleroma/pleroma!868
2019-02-27 07:28:10 +00:00
ed7fd6b47e
Add missing docs and tests
2019-02-27 03:08:03 +03:00
1c265b3b19
Merge branch 'auto_linker' into 'develop'
...
AutoLinker
Closes #609
See merge request pleroma/pleroma!839
2019-02-26 23:32:26 +00:00
c3ac9424d2
AutoLinker
2019-02-26 23:32:26 +00:00
e9703a5326
Merge branch 'feature/more-actions-to-admin-api' into 'develop'
...
Add list/toggle activation endpoints to AdminController
See merge request pleroma/pleroma!867
2019-02-26 23:31:53 +00:00
90d0d055fc
Add more admin actions
2019-02-27 00:13:38 +03:00
b985c91431
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'
...
need to put back ipv4 listen instruct
See merge request pleroma/pleroma!866
2019-02-26 16:47:18 +00:00
e1bdaaa3fe
need to put back ipv4 listen instruct
2019-02-26 08:41:37 -08:00
e98d34e5fb
Added missing copyright headers.
2019-02-26 16:26:54 +03:00
fd46edb473
Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth
2019-02-26 15:29:43 +03:00
e82b70eb53
Database authenticator behaviour / Pleroma implementation refactoring.
2019-02-26 15:27:01 +03:00
03afee3fd1
Merge branch 'nginx-cfg' into 'develop'
...
Add ipv6 handling to pleroma.nginx
See merge request pleroma/pleroma!865
2019-02-26 06:56:29 +00:00
d3a6c065a4
Add ipv6 handling to pleroma.nginx
...
Replaces `listen 80` with `listen [::]:80`, same with 443
2019-02-25 23:37:46 -05:00
2ed7003c26
Merge branch 'trivial/remove-io-inspect-spam' into 'develop'
...
twitter card: remove IO.inspect() spam
See merge request pleroma/pleroma!863
2019-02-24 19:03:58 +00:00
fc9d895ebc
twitter card: remove IO.inspect() spam
2019-02-24 18:56:44 +00:00
7daa9a8c42
Merge branch 'add-apache-cache-config' into 'develop'
...
apache config: add instructions for mediaproxy.
See merge request pleroma/pleroma!856
2019-02-23 04:01:21 +00:00
101c20f8d9
Merge branch 'card-handling' into 'develop'
...
Private card handling
Closes #652
See merge request pleroma/pleroma!854
2019-02-23 03:59:23 +00:00
ab2d2dfa7b
Merge branch 'fix/meck' into 'develop'
...
Update meck to fix tests on MacOS
Closes #662
See merge request pleroma/pleroma!855
2019-02-23 03:56:31 +00:00
c75e643a72
apache config: add instructions for mediaproxy.
2019-02-23 00:18:03 +05:00
bf562a6ecc
Upate meck to fix tests on MacOS
2019-02-22 17:26:47 +00:00
9e0686efa6
Move visibility into own module.
2019-02-22 13:29:52 +01:00
34646c6923
Merge branch 'oauth2_scopes_migration_hotfix' into 'develop'
...
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`
Closes #660
See merge request pleroma/pleroma!853
2019-02-22 11:16:10 +00:00
62296f5a25
Fix private post card handling.
2019-02-22 12:02:51 +01:00
lambda
William Pitcock
href
Ivan Tashkinov
kaniini
eugenijm
lain
Egor Kislitsyn
Maxim Filippov
Kenneth Zhao
Haelwenn
PEA
faried nawaz
Mark Felder