Alex S c349573791 Merge develop to 788-separate-email-addresses ... Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs		2019-04-13 12:24:38 +07:00
..
fixtures	twitter api registration	2019-04-06 17:18:59 +07:00
integration
plugs	Mock :crypt.crypt/2 because otherwise the test fails on Mac OS	2019-04-05 22:48:11 +02:00
support	Merge branch 'feature/767-multiple-use-invite-token' into 'develop'	2019-04-10 10:10:08 +00:00
tasks	Merge branch 'develop' into feature/788-separate-email-addresses	2019-04-10 18:06:54 +07:00
web	Merge develop to 788-separate-email-addresses	2019-04-13 12:24:38 +07:00
activity_test.exs
captcha_test.exs
config_test.exs
emoji_test.exs	refactoring of emoji tags config to use groups	2019-04-02 15:44:56 +07:00
filter_test.exs
flake_id_test.exs
formatter_test.exs	test fix	2019-04-02 16:26:40 +07:00
html_test.exs	Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).	2019-03-17 11:03:19 -04:00
http_test.exs
list_test.exs
media_proxy_test.exs
notification_test.exs	Merge branch 'develop' into feature/user-status-subscriptions	2019-04-10 10:44:54 +01:00
object_test.exs
registration_test.exs	[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.	2019-04-05 15:12:02 +03:00
scheduled_activity_test.exs	Add scheduler for sending scheduled activities to the queue	2019-04-06 23:56:29 +03:00
scheduled_activity_worker_test.exs	Add scheduler for sending scheduled activities to the queue	2019-04-06 23:56:29 +03:00
test_helper.exs
upload_test.exs	fix UploadTest to use new image_tmp.jpg	2019-03-19 10:10:48 +01:00
user_invite_token_test.exs	test for valid_invite?	2019-04-08 17:06:04 +07:00
user_test.exs	Merge branch 'develop' into feature/user-status-subscriptions	2019-04-10 10:44:54 +01:00
xml_builder_test.exs