6afc6717d6
copy tmp file if test depends on it
2020-07-21 10:31:58 +03:00
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
204dddcfaa
Pleroma.Formatter can have partial updates
2020-07-20 13:45:05 -05:00
5d263dfdb3
Update linkify to latest release
2020-07-20 09:29:03 -05:00
1b82b7eac9
Merge branch 'patch-1' into 'develop'
...
fix markdown rendering withing <details>; typo parent**s**_visible
See merge request pleroma/pleroma!2781
2020-07-20 13:52:56 +00:00
531c3ab9f3
fix markdown rendering withing <details>; typo parent**s**_visible
2020-07-20 11:41:43 +00:00
ae74c52e22
Test angry face in formatter D:< #1968
2020-07-18 15:26:23 -05:00
f0d13fc3f7
Merge branch 'fix/followredirects-hackney' into 'develop'
...
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
Closes #1966 and #1961
See merge request pleroma/pleroma!2778
2020-07-18 16:49:30 +00:00
4bac25e6f5
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
2020-07-18 13:17:38 +02:00
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
2020-07-18 12:55:04 +02:00
10d46235cf
Merge branch 'fix-1958' into 'develop'
...
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
2020-07-17 18:54:30 +00:00
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
2020-07-17 12:35:28 -05:00
15f8921b11
Test that unapproved users can never log in regardless of admin settings
2020-07-17 12:26:52 -05:00
5756843736
Fully delete users with status :approval_pending
2020-07-17 12:19:41 -05:00
b782739ffe
Merge branch 'feature/expose-post-formats' into 'develop'
...
Expose the post formats in /api/v1/instance
See merge request pleroma/pleroma!2776
2020-07-17 16:52:59 +00:00
20a496d2cb
Expose the post formats in /api/v1/instance
2020-07-17 10:45:41 -05:00
af376cbffb
using atom keys in search params
2020-07-17 18:06:05 +03:00
64b4de4af1
Merge branch 'feature/totp-input-improvements' into 'develop'
...
Improve TOTP token and recovery input fields in OAuth login
See merge request pleroma/pleroma!2769
2020-07-17 14:36:38 +00:00
62438530e2
TOTP length is configurable, so we can't hardcode this here.
2020-07-17 08:19:49 -05:00
a3fdd1446f
Merge branch 'chore/issue-template-remove-tasks' into 'develop'
...
Bug issue template: remove choice in "Installation type"
See merge request pleroma/pleroma!2774
2020-07-17 08:05:16 +00:00
2a3bb23091
Bug issue template: remove choice in "Installation type"
...
It made gitlab display "1 of 2 tasks completed" when one is chosen,
which is totally not what this was used for.
2020-07-17 11:03:47 +03:00
5e74556703
Sanitize `reason` param in POST /api/v1/accounts
2020-07-16 20:25:53 -05:00
613e096389
Migrate :auto_linker --> Pleroma.Formatter in ConfigDB
2020-07-16 16:35:03 -05:00
880301985b
Formatter: Test link with local mention
2020-07-16 16:34:43 -05:00
5701840d30
Use updated Linkify from git
2020-07-16 15:01:13 -05:00
6fdaee7cae
description.exs typofixes
2020-07-16 14:52:48 -05:00
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
3be64556db
Improve TOTP token and recovery input fields in OAuth login
2020-07-16 13:11:03 -05:00
5fcb3e8738
fix docs
2020-07-16 16:35:09 +03:00
16da9f5cfd
Apply 1 suggestion(s) to 1 file(s)
2020-07-16 13:30:28 +00:00
c72676d22f
Apply 1 suggestion(s) to 1 file(s)
2020-07-16 13:30:17 +00:00
6c59fe259d
Merge branch 'develop' into issue/1023
2020-07-16 08:53:21 +03:00
4e0e19a706
update task messages
2020-07-16 08:52:14 +03:00
3a2b2cb6f2
Merge branch 'refactor/gun-pool-registry' into 'develop'
...
Refactor gun pooling and simplify adapter option insertion
Closes #1834 , #1700 , and #1680
See merge request pleroma/pleroma!2479
2020-07-15 23:10:52 +00:00
02cc42e72c
Squash User approval migrations
2020-07-15 17:08:46 -05:00
9ce95fa68f
Use `approval_required` in /api/v1/instance
2020-07-15 17:04:30 -05:00
b2d398b1d0
Merge branch 'develop' into refactor/gun-pool-registry
2020-07-15 13:34:27 -05:00
00f9b53f07
Merge branch 'refactor/notification_settings' into 'develop'
...
Refactor notification settings
See merge request pleroma/pleroma!2602
2020-07-15 15:22:39 +00:00
34d1d3e93e
Update FE bundle
2020-07-15 09:38:56 -05:00
9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
0fe36b311c
Merge branch 'features/mrf-reasons' into 'develop'
...
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
2020-07-15 14:00:22 +00:00
2ce141fb0e
Merge branch 'fix/oban-pruning' into 'develop'
...
Bring back oban job pruning
Closes #1945
See merge request pleroma/pleroma!2768
2020-07-15 13:52:01 +00:00
a2f9bc77b6
Merge branch 'issue/sign-authority' into 'develop'
...
Include port in host for signatures
See merge request pleroma/pleroma!2766
2020-07-15 13:44:52 +00:00
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
2020-07-15 15:25:33 +02:00
c413649a8d
Bring back oban job pruning
...
Closes #1945
2020-07-15 16:20:17 +03:00
7115c5f82e
ConnectionPool.Worker: do not stop with an error when there is a timeout
...
This produced error log messages about GenServer termination
every time the connection was not open due to a timeout.
Instead we stop with `{:shutdown, <gun_error>}` since shutting down
when the connection can't be established is normal behavior.
2020-07-15 15:58:08 +03:00
3f8bff8d6b
Merge branch 'develop' into issue/sign-authority
2020-07-15 15:49:46 +03:00
6d583bcc3b
Set a default timeout for Gun adapter timeout
2020-07-15 15:26:35 +03:00
e499275076
Don't test tls_options in adapter helper test.
2020-07-15 15:26:35 +03:00
afd378f84c
host is now useless
2020-07-15 15:26:35 +03:00
Alexander Strizhakov