Commit graph

3028 commits

Author SHA1 Message Date
link0ff
7c235b8874 Add more Mix task tests in relay_test.exs and uploads_test.exs.
Rename test/tasks/user.exs to test/tasks/user_test.exs.
2018-12-16 18:08:31 +02:00
scarlett
8fadc1b6a2 Merge branch 'netbsd-script' into 'develop'
Add an rc.d script for NetBSD.

See merge request pleroma/pleroma!558
2018-12-16 13:19:27 +00:00
scarlett
4b40e4188c Simplify the NetBSD rc script. 2018-12-16 13:15:37 +00:00
scarlett
9d3eda1959 Add an rc.d script for NetBSD. 2018-12-16 12:33:50 +00:00
Haelwenn
41e3401c5c Merge branch 'develop' into 'develop'
Added init file for OpenBSD

See merge request pleroma/pleroma!549
2018-12-16 12:13:32 +00:00
eal
28478a9c4f Merge branch 'fix/masto-put-settings' into 'develop'
Mastodon API: Fix PUT /api/web/settings

See merge request pleroma/pleroma!557
2018-12-16 11:21:26 +00:00
eal
4c783e35c0 Mastodon API: Fix PUT /api/web/settings 2018-12-16 13:15:34 +02:00
eal
8b279aca5f Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'
Enable unsecure cookies by default in dev.exs

See merge request pleroma/pleroma!556
2018-12-16 11:08:34 +00:00
Rin Toshaka
7c522f38f0 Enable unsecure cookies by default in dev.exs 2018-12-16 08:49:23 +01:00
vaartis
2e72d49e37 Rename captcha_test.ex to exs 2018-12-16 07:35:45 +00:00
link0ff
36f1af232a Add tests for Mix tasks 2018-12-16 02:14:23 +02:00
nonlinear
75f2177d5b Update/add OpenBSD config files 2018-12-15 14:00:00 -08:00
Ekaterina Vaartis
c859cd1d61 Fix style 2018-12-15 23:39:23 +03:00
Ekaterina Vaartis
5f96c2d216 Add a test for kocaptcha 2018-12-15 23:38:19 +03:00
Ekaterina Vaartis
8d55a549e6 Replace HTTPoison with Tesla for kocaptha 2018-12-15 22:43:28 +03:00
Ekaterina Vaartis
e8537208bd Add a captcha mock for tests 2018-12-15 22:38:39 +03:00
Ekaterina Vaartis
98e10c0d4f Add captcha documentation to config.md 2018-12-15 22:12:20 +03:00
Ekaterina Vaartis
23549d3952 Formatting fixes 2018-12-15 22:08:26 +03:00
Ekaterina Vaartis
b5518da904 Separate captcha implementation into a behaviour and use it 2018-12-15 22:07:26 +03:00
Haelwenn (lanodan) Monnier
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test 2018-12-15 17:56:12 +01:00
lambda
8cb9580aec Merge branch 'bugfix/webfinger-jrd' into 'develop'
Fix requesting application/jrd+json on webfinger

See merge request pleroma/pleroma!553
2018-12-15 15:31:30 +00:00
lambda
cc6689cc20 Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
TwitterAPI.ActivityView: Ignore unhandled activities

See merge request pleroma/pleroma!547
2018-12-15 15:23:51 +00:00
lambda
7281ab0b3c Merge branch 'tests-warning-as-errors' into 'develop'
Enable warnings_as_errors for tests

See merge request pleroma/pleroma!548
2018-12-15 15:22:59 +00:00
lambda
9194e84d95 Merge branch 'feature/mix-task-instance-port-specification' into 'develop'
Allow port specification in `instance.ex` config generator

See merge request pleroma/pleroma!552
2018-12-15 15:21:40 +00:00
Haelwenn (lanodan) Monnier
5af91020f8
Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints 2018-12-15 16:17:44 +01:00
Haelwenn (lanodan) Monnier
ff7ce9a9fb
config/config.exs: Add application/jrd+json => jrd+json to fix webfinger
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/551
2018-12-15 15:58:51 +01:00
Rin Toshaka
4a895a46d1 Allow port specification in instance.ex 2018-12-15 11:00:54 +01:00
Ekaterina Vaartis
28c43a417e Add an ability to disabled captcha 2018-12-15 03:12:47 +03:00
Ekaterina Vaartis
a2399c1c7c Add base CAPTCHA support (currently only kocaptcha) 2018-12-15 03:12:44 +03:00
nonlinear
04513a13e0 Added init file for OpenBSD 2018-12-14 13:13:14 -08:00
href
e74f384b68 Merge branch 'fix/issue_433' into 'develop'
[#433] fix markdown formatting

See merge request pleroma/pleroma!545
2018-12-14 20:30:35 +00:00
href
bfe27c1b55 Merge branch '114_email_invites' into 'develop'
[#114] Email invites

See merge request pleroma/pleroma!541
2018-12-14 20:22:24 +00:00
href
acec11626d Merge branch 'fix/issue_272' into 'develop'
[#272] fix tags

See merge request pleroma/pleroma!540
2018-12-14 20:20:30 +00:00
Maksim Pechnikov
ea72ac549b fix case when tags is invalid 2018-12-14 23:16:12 +03:00
raeno
30812f8451 Remove domain from sample_config template 2018-12-14 21:08:25 +01:00
raeno
b0c3211984 Scrub html from activity.content or user.bio for opengraph meta 2018-12-14 21:07:06 +01:00
raeno
90b00701ff Merge branch 'develop' into oembed_provider 2018-12-14 20:28:35 +01:00
raeno
9ff61ed793 Fix tests
Notice test has been failing due to missing placeholder in index.html
I've tried to use fixtures to substitute that file in test environment but it became too much hassle. Fixtures are not copied to _build directory so I'd need to change file fetching logic. IMO it doesn't worth it since pleroma-fe already has this placeholder merged and all future updated of index.html will include it.
2018-12-14 20:23:51 +01:00
Maksim Pechnikov
d3ec09bb38 fix tags 2018-12-14 22:09:04 +03:00
raeno
46486595ff Handle "users/:id" links as well. Fix comments in MR. 2018-12-14 19:55:40 +01:00
href
980131b4db Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
Improve web push

Closes #393, #422, and #452

See merge request pleroma/pleroma!524
2018-12-14 18:50:44 +00:00
Maksim Pechnikov
bc6262d250 fixed typo 2018-12-14 21:21:37 +03:00
href
0ee51992a8
Enable warning_as_errors for tests 2018-12-14 18:14:40 +01:00
href
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities 2018-12-14 18:09:59 +01:00
href
412df2cd38
Warn if push is disabled.. 2018-12-14 16:19:28 +01:00
Haelwenn
ef10e08efe Update config.md 2018-12-14 15:06:04 +00:00
Maksim Pechnikov
baead4ea4b fix markdown formatting 2018-12-14 16:03:58 +03:00
href
91236c60c7 Merge branch 'feature/file-size-checking' into 'develop'
[#36] Add warnings when file upload fails

See merge request pleroma/pleroma!523
2018-12-14 13:00:24 +00:00
href
0b4c61e8d5
Fix warning 2018-12-14 13:56:42 +01:00
href
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1 2018-12-14 13:22:10 +01:00