itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
3179 commits 3 branches 2 tags 276 MiB
Commit graph

3179 commits

This branch
This branch
All branches
Author SHA1 Message Date
href
ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged. 2018-12-17 17:28:03 +01:00
href
b12a904911
Integration tests for mastodon websocket 2018-12-17 17:09:06 +01:00
href
77b5154c82
Cowboy handler for Mastodon WebSocket 2018-12-17 17:06:18 +01:00
raeno
cc87880488 Support both OAuth token record and token string in UserView 2018-12-17 16:02:26 +01:00
lambda
567359790e Merge branch 'testfix/webfinger-jrd' into 'develop' 
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test

See merge request pleroma/pleroma!554
 2018-12-17 09:19:27 +00:00
vaartis
6e2f64a0a6 minutes->seconds_retained in config.md 2018-12-17 06:41:41 +00:00
Ekaterina Vaartis
ef6829382a Clean captchas up periodically, not schedule it after theyre created 2018-12-16 23:53:44 +03:00
Ekaterina Vaartis
73576ab64e Fix captcha tests 2018-12-16 23:01:44 +03:00
Ekaterina Vaartis
3a31fdaf06 Change minutes_retained config to seconds_retained 2018-12-16 22:40:44 +03:00
Ekaterina Vaartis
1d31fd0722 Make the hosted kocaptcha the default value 2018-12-16 22:37:16 +03:00
Ekaterina Vaartis
6062885df6 Add a configurable auto-cleanup for captchas 2018-12-16 22:08:17 +03:00
href
5dcb7aecea
More put_view. 2018-12-16 17:51:22 +01:00
link0ff
22d483d4f7 Use bindings dbuser and dbname in sample_psql.eex 2018-12-16 18:25:31 +02:00
href
f672555ad3
Upgrade to Phoenix 1.4 2018-12-16 17:15:07 +01:00
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
Maksim Pechnikov
d3ec09bb38 fix tags 2018-12-14 22:09:04 +03: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