0a69dbc97c
Merge branch 'feature/update-description-for-frontends-setting' into 'develop'
...
Remove extra nesting and add labels in `:frontends` setting
See merge request pleroma/pleroma!3043
2020-10-06 18:05:03 +00:00
6c2264af24
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-05 23:50:08 +03:00
094edde7c4
[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
2020-10-05 23:48:00 +03:00
f497eb034d
activity_pub_controller.ex: Remove unused @doc block
...
[ci skip]
2020-10-05 21:11:00 +02:00
feld
4d852f3e78
Merge branch 'feature/1893-remote-emoji-packs-pagination' into 'develop'
...
Feature/1893 remote emoji packs pagination
Closes #1893
See merge request pleroma/pleroma!2698
2020-10-05 17:52:02 +00:00
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
35ee759e74
Add helper function to convert single IPs into CIDR format if they were not provided that way
2020-10-05 11:49:56 -05:00
4c229d7fcc
docs/ap_extensions.md: Add JSON-LD full names
2020-10-05 17:36:12 +02:00
ac6e0f6684
docs/ap_extensions.md: document oauthRegistrationEndpoint
2020-10-05 17:19:21 +02:00
858dbe4360
docs/ap_extensions.md: document uploadMedia
2020-10-05 17:14:22 +02:00
4b05eb9a32
Merge branch '2211-smol-documentation-fix' into 'develop'
...
Docs: Modify docs so the postgres config is harder to get wrong.
Closes #2211
See merge request pleroma/pleroma!3055
2020-10-05 14:53:30 +00:00
8d093a68a6
Docs: Modify docs so the postgres config is harder to get wrong.
2020-10-05 13:58:12 +02:00
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
2020-10-03 12:35:49 +00:00
f6024252ae
[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
2020-10-02 22:18:02 +03:00
0d575735bf
No auth check in UserController.feed_redirect/2, even on non-federating instances.
2020-10-01 21:41:22 +03:00
7efadc3cbd
No auth check in OStatusController, even on non-federating instances.
2020-10-01 21:34:45 +03:00
241f7cb1ed
Merge branch 'web-push-fix' into 'develop'
...
web push http_client fix
Closes #2202
See merge request pleroma/pleroma!3052
2020-10-01 11:15:13 +00:00
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
feld
34029ffb90
Merge branch 'chore/pleroma-vcl' into 'develop'
...
Make it possible for Varnish logs to contain the true scheme used by clients
See merge request pleroma/pleroma!3051
2020-09-30 18:13:34 +00:00
b3015db841
Syntax error
2020-09-30 12:49:51 -05:00
49229107e8
Make it possible for Varnish logs to contain the true scheme used by clients
...
instead of always reporting http://
2020-09-30 12:32:54 -05:00
6debdaaef2
Merge branch 'update/oban' into 'develop'
...
Update Oban to 2.1.0
See merge request pleroma/pleroma!3050
2020-09-30 13:41:48 +00:00
2566467782
Merge branch '2201-i-hate-this' into 'develop'
...
User search: Once again, change uri handling.
Closes #2201
See merge request pleroma/pleroma!3048
2020-09-30 13:37:46 +00:00
cee1883b35
Update Oban to 2.1.0
2020-09-30 07:53:19 -05:00
1ae39441e6
Migrations: Nullify old unique index on users.uri
2020-09-30 14:17:21 +02:00
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
d96b8923f6
Fix typo
2020-09-30 00:50:53 +03:00
fe19750644
Fix comma typo
2020-09-30 00:49:08 +03:00
1b2f7139c8
Apply 1 suggestion(s) to 1 file(s)
2020-09-29 20:33:04 +00:00
0e57f13365
Apply 1 suggestion(s) to 1 file(s)
2020-09-29 20:32:55 +00:00
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
2020-09-29 21:52:16 +03:00
7f83b35a9d
Merge branch 'fix/2189-unpin-activity' into 'develop'
...
#2189 More robust expires_at timestamp processing
See merge request pleroma/pleroma!3046
2020-09-29 17:42:08 +00:00
b3a9ba09ec
More robust expires_at timestamp processing
2020-09-29 12:27:47 -05:00
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
aa170caa76
Merge branch 'issue/2170' into 'develop'
...
[#2170 ] Can't remove dead relay
See merge request pleroma/pleroma!3041
2020-09-29 14:37:49 +00:00
ae26284638
[ #3031 ] Adjusted changelog entry.
2020-09-29 17:34:49 +03:00
a24f80badf
Apply 1 suggestion(s) to 1 file(s)
2020-09-29 14:30:18 +00:00
9a56ec25cb
Changelog: Add info about relay unfollowing
2020-09-29 16:24:02 +02:00
7d5c3883ac
[ #3031 ] Refactoring: moved system commands checks to ApplicationRequirements.
2020-09-29 16:28:06 +03:00
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
2020-09-28 18:22:59 -05:00
30b79b0eb3
Merge branch 'fix/revert-citext-uri' into 'develop'
...
Revert citext user URI migration
Closes #2188
See merge request pleroma/pleroma!3042
2020-09-28 15:44:20 +00:00
7bc561127d
Revert citext user URI migration
...
URI paths are not actually case-insesitive, which caused migration issues
on a number of databases.
Closes #2188
2020-09-28 18:34:03 +03:00
7ac4d1e7ee
Remove extra nesting and add labels in `:frontends` setting
2020-09-28 18:13:45 +03:00
ec2f70cd23
CI: Add ffmpeg
2020-09-28 14:14:32 +02:00
de993b856b
added `force` option to the unfollow operation
2020-09-28 09:16:42 +03:00
4e4f771082
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
...
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
2020-09-26 19:32:16 +03:00
feld
35157f5dc8
Merge branch 'fix/deprecation-warning-welcome-message' into 'develop'
...
Fix deprecation warnings for old config settings
Closes #2153
See merge request pleroma/pleroma!3021
2020-09-25 18:40:00 +00:00
d1c724ef34
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 13:08:33 -05:00
feld
88bae1559f
Merge branch 'fix/noop-policy-describe' into 'develop'
...
Fix test failures for NoOpPolicy describe/0
See merge request pleroma/pleroma!3035
2020-09-25 18:02:59 +00:00
93b674b66d
Fix test failures for NoOpPolicy describe/0
2020-09-25 12:46:49 -05:00
rinpatch
feld