Ivan Tashkinov a799418573 [#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit ... # Conflicts: # CHANGELOG.md		2019-06-30 16:05:00 +03:00
..
bbs	…
config	support for config groups	2019-06-23 08:16:16 +03:00
conversation	Conversations: Fetch users in one query.	2019-06-07 17:51:47 +02:00
fixtures	Rich Media Parser: Do not return just a title if nothing else is there.	2019-06-22 16:22:59 +02:00
integration	[#570] add user:notification stream	2019-06-16 10:33:25 +00:00
object	salmon fix	2019-06-16 20:10:12 +08:00
plugs	Polish IdempotencyPlug	2019-06-27 01:53:58 +07:00
support	add ignore hosts and TLDs for rich_media	2019-06-25 22:25:37 +03:00
tasks	don't delete config settings on admin update	2019-06-27 04:19:44 +00:00
upload/filter	[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text	2019-06-30 07:28:35 +00:00
web	[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit	2019-06-30 16:05:00 +03:00
activity_test.exs	Add option to restrict all users to local content	2019-06-11 21:25:53 +07:00
bookmark_test.exs	…
captcha_test.exs	…
config_test.exs	…
conversation_test.exs	Merge remote-tracking branch 'origin/develop' into conversations-import	2019-05-15 17:47:29 +02:00
emoji_test.exs	…
filter_test.exs	…
flake_id_test.exs	…
formatter_test.exs	Mention all people in the beginning of DM	2019-05-24 20:34:23 +00:00
healthcheck_test.exs	…
html_test.exs	Rich Media: Skip Microformats hashtags	2019-06-19 00:46:30 +03:00
http_test.exs	…
keys_test.exs	move key generation functions into Pleroma.Keys module	2019-05-22 03:58:15 +00:00
list_test.exs	…
media_proxy_test.exs	Add more tests for using media_proxy and whitelists	2019-06-10 11:34:11 +00:00
notification_test.exs	[#570] add user:notification stream	2019-06-16 10:33:25 +00:00
object_test.exs	…
registration_test.exs	…
repo_test.exs	Fix/902 random compile failing	2019-05-17 07:25:20 +00:00
scheduled_activity_test.exs	…
scheduled_activity_worker_test.exs	…
test_helper.exs	…
upload_test.exs	…
user_invite_token_test.exs	…
user_test.exs	Rework user deletion	2019-06-24 18:59:12 +00:00
xml_builder_test.exs	…