summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-17Support both OAuth token record and token string in UserViewraeno
2018-12-17Merge branch 'testfix/webfinger-jrd' into 'develop'lambda
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test See merge request pleroma/pleroma!554
2018-12-17minutes->seconds_retained in config.mdvaartis
2018-12-16Clean captchas up periodically, not schedule it after theyre createdEkaterina Vaartis
2018-12-16Fix captcha testsEkaterina Vaartis
2018-12-16Change minutes_retained config to seconds_retainedEkaterina Vaartis
2018-12-16Make the hosted kocaptcha the default valueEkaterina Vaartis
2018-12-16Add a configurable auto-cleanup for captchasEkaterina Vaartis
2018-12-16More put_view.href
2018-12-16Use bindings dbuser and dbname in sample_psql.eexlink0ff
2018-12-16Upgrade to Phoenix 1.4href
2018-12-16Add more Mix task tests in relay_test.exs and uploads_test.exs.link0ff
Rename test/tasks/user.exs to test/tasks/user_test.exs.
2018-12-16Merge branch 'netbsd-script' into 'develop'scarlett
Add an rc.d script for NetBSD. See merge request pleroma/pleroma!558
2018-12-16Simplify the NetBSD rc script.scarlett
2018-12-16Add an rc.d script for NetBSD.scarlett
2018-12-16Merge branch 'develop' into 'develop'Haelwenn
Added init file for OpenBSD See merge request pleroma/pleroma!549
2018-12-16Merge branch 'fix/masto-put-settings' into 'develop'eal
Mastodon API: Fix PUT /api/web/settings See merge request pleroma/pleroma!557
2018-12-16Mastodon API: Fix PUT /api/web/settingseal
2018-12-16Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'eal
Enable unsecure cookies by default in dev.exs See merge request pleroma/pleroma!556
2018-12-16Enable unsecure cookies by default in dev.exsRin Toshaka
2018-12-16Rename captcha_test.ex to exsvaartis
2018-12-16Add tests for Mix taskslink0ff
2018-12-15Update/add OpenBSD config filesnonlinear
2018-12-15Fix styleEkaterina Vaartis
2018-12-15Add a test for kocaptchaEkaterina Vaartis
2018-12-15Replace HTTPoison with Tesla for kocapthaEkaterina Vaartis
2018-12-15Add a captcha mock for testsEkaterina Vaartis
2018-12-15Add captcha documentation to config.mdEkaterina Vaartis
2018-12-15Formatting fixesEkaterina Vaartis
2018-12-15Separate captcha implementation into a behaviour and use itEkaterina Vaartis
2018-12-15WebFinger: Sends a 400 when resource param is missing, fix XRD typo in testHaelwenn (lanodan) Monnier
2018-12-15Merge branch 'bugfix/webfinger-jrd' into 'develop'lambda
Fix requesting application/jrd+json on webfinger See merge request pleroma/pleroma!553
2018-12-15Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'lambda
TwitterAPI.ActivityView: Ignore unhandled activities See merge request pleroma/pleroma!547
2018-12-15Merge branch 'tests-warning-as-errors' into 'develop'lambda
Enable warnings_as_errors for tests See merge request pleroma/pleroma!548
2018-12-15Merge branch 'feature/mix-task-instance-port-specification' into 'develop'lambda
Allow port specification in `instance.ex` config generator See merge request pleroma/pleroma!552
2018-12-15Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger ↵Haelwenn (lanodan) Monnier
endpoints
2018-12-15config/config.exs: Add application/jrd+json => jrd+json to fix webfingerHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/551
2018-12-15Allow port specification in instance.exRin Toshaka
2018-12-15Add an ability to disabled captchaEkaterina Vaartis
2018-12-15Add base CAPTCHA support (currently only kocaptcha)Ekaterina Vaartis
2018-12-14Added init file for OpenBSDnonlinear
2018-12-14Merge branch 'fix/issue_433' into 'develop'href
[#433] fix markdown formatting See merge request pleroma/pleroma!545
2018-12-14Merge branch '114_email_invites' into 'develop'href
[#114] Email invites See merge request pleroma/pleroma!541
2018-12-14Merge branch 'fix/issue_272' into 'develop'href
[#272] fix tags See merge request pleroma/pleroma!540
2018-12-14fix case when tags is invalidMaksim Pechnikov
2018-12-14Remove domain from sample_config templateraeno
2018-12-14Scrub html from activity.content or user.bio for opengraph metaraeno
2018-12-14Merge branch 'develop' into oembed_providerraeno
2018-12-14Fix testsraeno
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-14fix tagsMaksim Pechnikov