f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
6 years ago
bb9e40968a
Web.OAuth.OAuthControllerTest: Add test against token formatting
6 years ago
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
6 years ago
b91a6dd85e
Merge branch 'hotfix/http-date-header' into 'develop'
...
activitypub: fix date header format
See merge request pleroma/pleroma!879
6 years ago
689b0730f8
activitypub: fix date header format
...
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
6 years ago
1fc1b0d935
Merge branch 'default-tags-for-existing-users' into 'develop'
...
Migration for adding tags to the existing users records
See merge request pleroma/pleroma!878
6 years ago
85734c0d49
Added migration for setting default tags in existing users records
6 years ago
2f00814475
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
...
Bugfix #236 Prefer user look-up by nickname
See merge request pleroma/pleroma!860
6 years ago
b37b26ab87
Merge branch 'feature/cowboy2' into 'develop'
...
upgrade to cowboy 2.6
See merge request pleroma/pleroma!876
6 years ago
6b2a1ad1c8
config: fix chat endpoint path
6 years ago
28b4093233
mastodon websocket: return errors using ok, not stop
6 years ago
388a3f4ca2
mastodon websocket: bring back infinity timeout
6 years ago
f1d37a5e23
mastodon websocket: use pattern match to get query data, robustly handle errors
6 years ago
9aec00d711
config: update config for cowboy 2 endpoints
6 years ago
bc53dff5b6
mastodon api: websocket: update code for cowboy 2.x
6 years ago
e10ca35b3d
mix: update dependencies for cowboy 2.0
6 years ago
a47cc5a2cf
Merge branch 'customizable_auth' into 'develop'
...
Authenticator tweaks
See merge request pleroma/pleroma!875
6 years ago
3281a3f074
Renamed *DatabaseAuthenticator to *Authenticator.
6 years ago
4e77f68414
Added `auth_template/0` to DatabaseAuthenticator.
6 years ago
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
6 years ago
90a24fbf95
Merge branch 'customizable_auth' into 'develop'
...
Auth customization support
See merge request pleroma/pleroma!852
6 years ago
089e2588a3
Merge branch 'speedup-follow-requests' into 'develop'
...
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
6 years ago
3c849d0438
Merge branch 'deactivated-in-user-view' into 'develop'
...
Add activation status to the regular user view
See merge request pleroma/pleroma!874
6 years ago
b6f915313f
Made auth customization be runtime-configurable.
6 years ago
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
6 years ago
6b11011039
Added deactivated to the user view
6 years ago
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
6 years ago
9ade1242c2
Add user muted status info to twitterapi.
6 years ago
c1ae495878
Add user muted status info to MastodonAPI.
6 years ago
c4235f96bd
Add `with_muted` param.
6 years ago
b24cc44e8d
Follower requests: Utilize object index.
...
Closes #677
6 years ago
8d8cb08f94
Add follow request test.
6 years ago
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
6 years ago
14bc6bd40f
Merge branch 'fix/formatter' into 'develop'
...
Bugfix: markdown in formatter
Closes #688
See merge request pleroma/pleroma!869
6 years ago
5d961d536c
fix formatter
6 years ago
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
6 years ago
ed7fd6b47e
Add missing docs and tests
6 years ago
1c265b3b19
Merge branch 'auto_linker' into 'develop'
...
AutoLinker
Closes #609
See merge request pleroma/pleroma!839
6 years ago
c3ac9424d2
AutoLinker
6 years ago
e9703a5326
Merge branch 'feature/more-actions-to-admin-api' into 'develop'
...
Add list/toggle activation endpoints to AdminController
See merge request pleroma/pleroma!867
6 years ago
90d0d055fc
Add more admin actions
6 years ago
b985c91431
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'
...
need to put back ipv4 listen instruct
See merge request pleroma/pleroma!866
6 years ago
e1bdaaa3fe
need to put back ipv4 listen instruct
6 years ago
e98d34e5fb
Added missing copyright headers.
6 years ago
fd46edb473
Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth
6 years ago
e82b70eb53
Database authenticator behaviour / Pleroma implementation refactoring.
6 years ago
03afee3fd1
Merge branch 'nginx-cfg' into 'develop'
...
Add ipv6 handling to pleroma.nginx
See merge request pleroma/pleroma!865
6 years ago
d3a6c065a4
Add ipv6 handling to pleroma.nginx
...
Replaces `listen 80` with `listen [::]:80`, same with 443
6 years ago
2ed7003c26
Merge branch 'trivial/remove-io-inspect-spam' into 'develop'
...
twitter card: remove IO.inspect() spam
See merge request pleroma/pleroma!863
6 years ago
fc9d895ebc
twitter card: remove IO.inspect() spam
6 years ago
rinpatch