href
daaa8cd66a
SetUserSessionIdPlugTest: try to fix random ci failures
6 years ago
lambda
b6ae412fcd
Merge branch 'runtime-static-plug' into 'develop'
...
Instance/Runtime static plug
See merge request pleroma/pleroma!567
6 years ago
href
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
6 years ago
lambda
3879500c87
Merge branch '2018-12-17-update-frontend' into 'develop'
...
2018 12 17 update frontend
See merge request pleroma/pleroma!565
6 years ago
lambda
7d9254fb4a
Merge branch 'fix-test' into 'develop'
...
Fix uploads test.
See merge request pleroma/pleroma!564
6 years ago
lain
eb2d34eb6c
Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
6 years ago
lambda
3d980daa49
Merge branch '459_fix_user_profile_crash' into 'develop'
...
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
6 years ago
lain
3e1816fcd5
update frontend
6 years ago
lambda
ebbe11f33b
Merge branch 'support/issue_449' into 'develop'
...
[#449 ] fix text field
See merge request pleroma/pleroma!563
6 years ago
lain
52bda3b456
Fix uploads test.
6 years ago
Maksim Pechnikov
92a5133c42
fix text field
6 years ago
lambda
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
lambda
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
6 years ago
lambda
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
6 years ago
lambda
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
lain
0f67c1d487
don't re-use build
6 years ago
lain
e4763cd459
Fix tagging problems for existing instances.
6 years ago
Ekaterina Vaartis
de981ac5a2
Alias Kocaptcha in the test
6 years ago
vaartis
35522fef09
Use :ets.match_delete to delete old captchas
6 years ago
href
ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged.
6 years ago
href
b12a904911
Integration tests for mastodon websocket
6 years ago
href
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
raeno
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
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
6 years ago
vaartis
6e2f64a0a6
minutes->seconds_retained in config.md
6 years ago
Ekaterina Vaartis
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
Ekaterina Vaartis
73576ab64e
Fix captcha tests
6 years ago
Ekaterina Vaartis
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
Ekaterina Vaartis
1d31fd0722
Make the hosted kocaptcha the default value
6 years ago
Ekaterina Vaartis
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
href
5dcb7aecea
More put_view.
6 years ago
link0ff
22d483d4f7
Use bindings dbuser and dbname in sample_psql.eex
6 years ago
href
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
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.
6 years ago
scarlett
8fadc1b6a2
Merge branch 'netbsd-script' into 'develop'
...
Add an rc.d script for NetBSD.
See merge request pleroma/pleroma!558
6 years ago
scarlett
4b40e4188c
Simplify the NetBSD rc script.
6 years ago
scarlett
9d3eda1959
Add an rc.d script for NetBSD.
6 years ago
Haelwenn
41e3401c5c
Merge branch 'develop' into 'develop'
...
Added init file for OpenBSD
See merge request pleroma/pleroma!549
6 years ago
eal
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
6 years ago
eal
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
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
6 years ago
Rin Toshaka
7c522f38f0
Enable unsecure cookies by default in dev.exs
6 years ago
vaartis
2e72d49e37
Rename captcha_test.ex to exs
6 years ago
link0ff
36f1af232a
Add tests for Mix tasks
6 years ago
nonlinear
75f2177d5b
Update/add OpenBSD config files
6 years ago
Ekaterina Vaartis
c859cd1d61
Fix style
6 years ago
Ekaterina Vaartis
5f96c2d216
Add a test for kocaptcha
6 years ago
Ekaterina Vaartis
8d55a549e6
Replace HTTPoison with Tesla for kocaptha
6 years ago
Ekaterina Vaartis
e8537208bd
Add a captcha mock for tests
6 years ago
Ekaterina Vaartis
98e10c0d4f
Add captcha documentation to config.md
6 years ago