Henry Jameson ae07bb4779 Merge remote-tracking branch 'origin/develop' into shigusegubu ... * origin/develop: (208 commits) Web.OAuth.OAuthControllerTest: Add test against token formatting Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response activitypub: fix date header format Added migration for setting default tags in existing users records config: fix chat endpoint path mastodon websocket: return errors using ok, not stop mastodon websocket: bring back infinity timeout mastodon websocket: use pattern match to get query data, robustly handle errors config: update config for cowboy 2 endpoints mastodon api: websocket: update code for cowboy 2.x mix: update dependencies for cowboy 2.0 Renamed *DatabaseAuthenticator to *Authenticator. Added `auth_template/0` to DatabaseAuthenticator. Made auth customization be runtime-configurable. Added deactivated to the user view Remove parts of the old activity view. Add user muted status info to twitterapi. Add user muted status info to MastodonAPI. Add `with_muted` param. Follower requests: Utilize object index. ...		2019-03-02 20:20:45 +02:00
..
config.exs	Merge remote-tracking branch 'origin/develop' into shigusegubu	2019-03-02 20:20:45 +02:00
custom_emoji.txt	customs	2018-08-04 18:23:11 +02:00
dev.exs	config/dev.exs: Don’t put secure cookies on dev	2019-02-12 21:50:47 +01:00
emoji.txt	customs	2018-08-04 18:23:11 +02:00
prod.exs	[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.	2018-12-12 17:02:41 +03:00
test.exs	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-04 20:50:28 +07:00