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
|
2018-12-17 20:16:15 +00:00 |
|
lain
|
3e1816fcd5
|
update frontend
|
2018-12-17 21:13:04 +01:00 |
|
lambda
|
ebbe11f33b
|
Merge branch 'support/issue_449' into 'develop'
[#449] fix text field
See merge request pleroma/pleroma!563
|
2018-12-17 20:11:46 +00:00 |
|
lain
|
52bda3b456
|
Fix uploads test.
|
2018-12-17 20:55:24 +01:00 |
|
Maksim Pechnikov
|
92a5133c42
|
fix text field
|
2018-12-17 22:53:16 +03:00 |
|
lambda
|
52ac7dce5c
|
Merge branch 'captcha' into 'develop'
Captcha
See merge request pleroma/pleroma!550
|
2018-12-17 19:45:14 +00:00 |
|
lambda
|
c6d5f189d9
|
Merge branch 'fix-tags' into 'develop'
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
|
2018-12-17 19:38:24 +00:00 |
|
lambda
|
98c31deaa9
|
Merge branch 'test-mix-tasks' into 'develop'
Add tests for Mix tasks
See merge request pleroma/pleroma!555
|
2018-12-17 19:37:05 +00:00 |
|
lambda
|
078b8b6d22
|
Merge branch 'phoenix14' into 'develop'
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
|
2018-12-17 19:30:05 +00:00 |
|
lain
|
0f67c1d487
|
don't re-use build
|
2018-12-17 20:26:48 +01:00 |
|
lain
|
e4763cd459
|
Fix tagging problems for existing instances.
|
2018-12-17 20:12:01 +01:00 |
|
Ekaterina Vaartis
|
de981ac5a2
|
Alias Kocaptcha in the test
|
2018-12-17 20:53:42 +03:00 |
|
vaartis
|
35522fef09
|
Use :ets.match_delete to delete old captchas
|
2018-12-17 20:35:21 +03:00 |
|
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 |
|