Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md		2019-12-10 08:55:14 +03:00
..
activity/ir
bbs
config
conversation
daemons
emails
emoji
federation	update tests and Oban	2019-11-26 15:24:34 -05:00
fixtures	Merge branch 'feature/move-activity' into 'develop'	2019-12-02 16:26:19 +00:00
http	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
instance_static/emoji
integration
object
plugs	[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.	2019-12-07 17:49:53 +03:00
support	Merge branch 'develop' into issue/1342	2019-12-08 21:25:26 +03:00
tasks	fix loads config variable with large value from db	2019-12-09 22:29:44 +03:00
upload
uploaders
user	added privacy option to push notifications	2019-11-28 22:13:11 +03:00
web	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes	2019-12-10 08:55:14 +03:00
activity_expiration_test.exs
activity_test.exs
bookmark_test.exs
captcha_test.exs
config_test.exs
conversation_test.exs
emoji_test.exs
filter_test.exs
following_relationship_test.exs
formatter_test.exs
healthcheck_test.exs
html_test.exs	Fix Pleroma.HTML.extract_first_external_url/2	2019-11-29 15:49:35 +07:00
http_test.exs
job_queue_monitor_test.exs
keys_test.exs
list_test.exs
marker_test.exs
moderation_log_test.exs
notification_test.exs	Merge branch 'develop' into issue/1342	2019-12-08 21:25:26 +03:00
object_test.exs
pagination_test.exs
registration_test.exs
repo_test.exs
reverse_proxy_test.exs
safe_jsonb_set_test.exs
scheduled_activity_test.exs
signature_test.exs
test_helper.exs	update tests and Oban	2019-11-26 15:24:34 -05:00
upload_test.exs
user_invite_token_test.exs
user_relationship_test.exs
user_search_test.exs	added User.NotificationSetting struct	2019-11-28 22:08:30 +03:00
user_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
xml_builder_test.exs