feld
8f9ee694ed
Merge branch 'features/profile-fields-emojo' into 'develop'
...
user: Add support for custom emojis in profile fields
See merge request pleroma/pleroma!2741
4 years ago
feld
63fef0c0fb
Merge branch 'chore/improve-database-config-docs' into 'develop'
...
Improve database config migration and add documentation
See merge request pleroma/pleroma!2756
4 years ago
feld
db529d454e
Merge branch 'fix/mediaproxy-cache-settings-types' into 'develop'
...
Update types for :headers and :options settings in Pleroma.Web.MediaProxy.Invalidation.Http
See merge request pleroma/pleroma!2735
4 years ago
Mark Felder
d1cd3f4ec0
Lint
4 years ago
Mark Felder
442fe3cd45
Show examples for both OTP and source
4 years ago
Mark Felder
e1908a5270
Pick up env for both source and OTP installs
4 years ago
Haelwenn (lanodan) Monnier
ce243b107f
Use Logger.info for {:reject, reason}
4 years ago
Haelwenn (lanodan) Monnier
2aac92e9e0
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post
4 years ago
Haelwenn
f918b6f86d
Merge branch '1937-renaming' into 'develop'
...
ActivityPub: Don't rename a clashing nickname with the same ap id.
Closes #1937
See merge request pleroma/pleroma!2748
4 years ago
Alex Gleason
bcfd38c8f3
Make a user unapproved when registering with `account_approval_required` on
4 years ago
Alex Gleason
e4e5577818
Prevent unapproved users from logging in
4 years ago
Alex Gleason
51ab8d0128
Add `account_approval_required` instance setting
4 years ago
Alex Gleason
a62f17da17
Add `approval_pending` field to User
4 years ago
Mark Felder
46b123cded
Still allow passing the arg, but fallback to MIX_ENV
4 years ago
Mark Felder
0871e8b8fe
Make the query more precise
4 years ago
Mark Felder
133004e22d
Improve database config migration and add documentation
4 years ago
href
4347d2de5e
Config/Docs: Expand behaviour suggestions at runtime
4 years ago
Alexander Strizhakov
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
4 years ago
Angelina Filippova
0eeeaa37e8
Update types in MRF Keyword group
4 years ago
Roman Chvanikov
3116a75e80
Check if mogrify available before calling it
4 years ago
Roman Chvanikov
523f1b93a4
Remove Logger requirement
4 years ago
Roman Chvanikov
45bd64e2a7
Error in Filter.Exiftool if exiftool not found
4 years ago
Roman Chvanikov
05187d497d
One can not simply call application modules from mix.exs
4 years ago
Roman Chvanikov
aedbbec88a
Add Pleroma.Utils.command_available?/1 and use where appropriate
4 years ago
lain
11dd29ef3f
Merge branch 'feature/upload-filter-exiftool' into 'develop'
...
Add Pleroma.Upload.Filter.Exiftool
Closes #1935
See merge request pleroma/pleroma!2744
4 years ago
lain
c409a064ba
Merge branch 'patch-3' into 'develop'
...
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths
See merge request pleroma/pleroma!2752
4 years ago
Alibek Omarov
d885540590
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths
4 years ago
Maksim Pechnikov
62fc8eab0d
fix reset confirmation email in admin section
4 years ago
Angelina Filippova
98c56ff477
Remove :regex from types
4 years ago
Angelina Filippova
02b2747d42
Update types for :params, :match_actor and :replace settings
4 years ago
Mark Felder
b329f05ed6
Remove unused @types
4 years ago
Mark Felder
9e45672674
Add a moduledoc
4 years ago
Mark Felder
6167593881
Support Exiftool for stripping EXIF data
...
We really only want to strip location data anyway, and mogrify strips color profiles.
4 years ago
feld
d6f67fa91b
Merge branch 'issue/1790-updated-oban' into 'develop'
...
[#1790 ] updated oban to 2.0.0
See merge request pleroma/pleroma!2674
4 years ago
feld
167a619432
Merge branch 'fix/1924-s3-descriptions' into 'develop'
...
docs and descriptions for s3 settings
Closes #1924
See merge request pleroma/pleroma!2745
4 years ago
feld
76f5f61713
Merge branch 'chore/should-document-that' into 'develop'
...
Probably worth documenting the MediaProxy fix
See merge request pleroma/pleroma!2750
4 years ago
Mark Felder
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
4 years ago
Mark Felder
d7a37fddd1
Switch to the official Oban 2.0.0 release
4 years ago
Mark Felder
0517d3252e
Probably worth documenting the MediaProxy fix
4 years ago
feld
ce9514000d
Merge branch 'proxy-range-and-chunk' into 'develop'
...
ReverseProxy: Streaming and disable encoding if Range
Closes #1860 and #1823
See merge request pleroma/pleroma!2749
4 years ago
Mark Felder
72b3dbf4d1
Credo line length complaint
4 years ago
href
a1dace088c
ReverseProxy: Streaming and disable encoding if Range
...
Fixes #1823
Fixes #1860
4 years ago
lain
93e494ec21
ActivityPub: Don't rename a clashing nickname with the same ap id.
4 years ago
lain
fba1ee7d7b
Merge branch 'chat-federation-information' into 'develop'
...
Add an `accepts_chat_messages` to user, expose in api and federation
See merge request pleroma/pleroma!2716
4 years ago
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
lain
8aa7143f46
Merge branch 'bump-fe-2020-07-10' into 'develop'
...
Update frontend
See merge request pleroma/pleroma!2747
4 years ago
lain
328062308a
Update frontend
4 years ago
Haelwenn
31a0ed5d01
Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'
...
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
Closes admin-fe#107 and #1788
See merge request pleroma/pleroma!2554
4 years ago
lain
48f98a2748
Merge branch 'mix-tasks-improvement' into 'develop'
...
Mix tasks improvement
See merge request pleroma/pleroma!2723
4 years ago
lain
4d809144d8
Merge branch 'cluster-test-ci' into 'develop'
...
RE-enable cluster tests on CI
See merge request pleroma/pleroma!2743
4 years ago