feld
|
03855f9789
|
Merge branch 'improve/instance-gen' into 'develop'
#2159 Support enabling upload filters during instance gen
See merge request pleroma/pleroma!3070
|
2020-10-12 17:24:24 +00:00 |
|
|
feld
|
68d0380633
|
Merge branch 'chore/copyright-headers' into 'develop'
Add missing Copyright headers
See merge request pleroma/pleroma!3071
|
2020-10-12 17:20:09 +00:00 |
|
|
Mark Felder
|
8539e386c3
|
Add missing Copyright headers
|
2020-10-12 12:00:50 -05:00 |
|
|
Mark Felder
|
6c61ef14c3
|
Support enabling upload filters during instance gen
|
2020-10-12 11:19:48 -05:00 |
|
|
feld
|
bc3cf0fee0
|
Merge branch 'feat/deep-link-account-approval' into 'develop'
Deep link to the user account in AdminFE in account confirmation emails
See merge request pleroma/pleroma!3065
|
2020-10-09 22:35:09 +00:00 |
|
|
Mark Felder
|
3ca98878d2
|
Deep link to the user account in AdminFE in account confirmation emails
|
2020-10-09 17:08:05 -05:00 |
|
|
feld
|
1aabc0672e
|
Merge branch 'docs/improve-backup-restore' into 'develop'
Spelling
See merge request pleroma/pleroma!3063
|
2020-10-09 16:30:35 +00:00 |
|
|
Mark Felder
|
ec217ca638
|
Spelling
|
2020-10-09 11:18:48 -05:00 |
|
|
feld
|
d239bd3ca4
|
Merge branch 'docs/improve-backup-restore' into 'develop'
#2219 Improve backup/restore documentation
See merge request pleroma/pleroma!3061
|
2020-10-09 14:25:24 +00:00 |
|
|
Mark Felder
|
1e5fec8d45
|
Ask user to use matching values for database setup
|
2020-10-09 09:14:02 -05:00 |
|
|
Mark Felder
|
e0c5adcc20
|
Syntax error
|
2020-10-08 15:56:37 -05:00 |
|
|
Mark Felder
|
5f38e03c8a
|
Don't always need to drop
|
2020-10-08 15:54:28 -05:00 |
|
|
Mark Felder
|
a02ed3920f
|
Improve backup/restore documentation
|
2020-10-08 15:51:56 -05:00 |
|
|
Haelwenn
|
74be4de3f6
|
Merge branch 'fix/2209-remoteip' into 'develop'
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
|
2020-10-08 17:29:00 +00:00 |
|
|
Mark Felder
|
a702f9fb5b
|
Lint
|
2020-10-07 15:07:03 -05:00 |
|
|
Maksim
|
6ee20eb328
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-07 19:32:42 +00:00 |
|
|
Maksim
|
8bfc5d9a0c
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-07 19:32:09 +00:00 |
|
|
feld
|
d0eca5b125
|
Apply 2 suggestion(s) to 2 file(s)
|
2020-10-07 19:16:53 +00:00 |
|
|
Mark Felder
|
b90eda3d8b
|
Improve description yet again
|
2020-10-06 17:36:29 -05:00 |
|
|
Mark Felder
|
e08eb4aba0
|
Don't leak internal variables in the docs. They're useless to users.
|
2020-10-06 17:29:56 -05:00 |
|
|
Mark Felder
|
7a2ed2fc90
|
Credo
|
2020-10-06 17:26:31 -05:00 |
|
|
Mark Felder
|
b8c05f4876
|
Improve descriptions for reserved and proxies
|
2020-10-06 17:21:27 -05:00 |
|
|
Mark Felder
|
9783e9cd80
|
Add test for an entry without CIDR format
|
2020-10-06 17:08:26 -05:00 |
|
|
Mark Felder
|
d43d05005a
|
Move hardcoded default configuration into config.exs
|
2020-10-06 17:02:46 -05:00 |
|
|
Mark Felder
|
7aff2b47c5
|
Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
|
2020-10-06 15:47:11 -05:00 |
|
|
feld
|
f9ece1a7f6
|
Merge branch 'revert/rich-media-censorship' into 'develop'
#2192 Revert Rich Media censorship for sensitive statuses
See merge request pleroma/pleroma!3044
|
2020-10-06 20:19:39 +00:00 |
|
|
Mark Felder
|
21a73ce9f2
|
Document the NSFW link preview change
|
2020-10-06 14:54:21 -05:00 |
|
|
Mark Felder
|
cddca85c84
|
Merge branch 'develop' into revert/rich-media-censorship
|
2020-10-06 14:25:20 -05:00 |
|
|
rinpatch
|
2698bbc9f6
|
Merge branch 'filtering-following' into 'develop'
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
|
2020-10-06 18:11:34 +00:00 |
|
|
rinpatch
|
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 |
|
|
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 |
|
|
Mark Felder
|
346cc3ac24
|
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
|
2020-10-05 12:40:53 -05:00 |
|
|
Mark Felder
|
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 |
|
|
Haelwenn
|
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 |
|
|
lain
|
8d093a68a6
|
Docs: Modify docs so the postgres config is harder to get wrong.
|
2020-10-05 13:58:12 +02:00 |
|
|
rinpatch
|
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 |
|
|
lain
|
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 |
|
|
Alexander Strizhakov
|
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 |
|
|
Mark Felder
|
b3015db841
|
Syntax error
|
2020-09-30 12:49:51 -05:00 |
|
|
Mark Felder
|
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 |
|
|
rinpatch
|
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 |
|
|
rinpatch
|
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 |
|
|
Mark Felder
|
cee1883b35
|
Update Oban to 2.1.0
|
2020-09-30 07:53:19 -05:00 |
|
|
lain
|
1ae39441e6
|
Migrations: Nullify old unique index on users.uri
|
2020-09-30 14:17:21 +02:00 |
|
|
lain
|
90fee49c52
|
User search: Once again, change uri handling.
They can indeed be non-unique.
|
2020-09-30 14:14:41 +02:00 |
|
|
Angelina Filippova
|
d96b8923f6
|
Fix typo
|
2020-09-30 00:50:53 +03:00 |
|
|
Angelina Filippova
|
fe19750644
|
Fix comma typo
|
2020-09-30 00:49:08 +03:00 |
|
|
Angelina Filippova
|
1b2f7139c8
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-09-29 20:33:04 +00:00 |
|
|
Angelina Filippova
|
0e57f13365
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-09-29 20:32:55 +00:00 |
|