Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason
df3d1bf5e5
Add :approval_pending to User @type account_status
4 years ago
Alex Gleason
20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
4 years ago
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by `need_approval`
4 years ago
Alex Gleason
b750129da1
AdminAPI: Return `approval_pending` with users
4 years ago
Alex Gleason
a1570ba6ad
AdminAPI: Return `registration_reason` with users
4 years ago
feld
3f65f2ea79
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
...
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
4 years ago
feld
63798e89de
Merge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'
...
Fix in-db configuration in dev environment
See merge request pleroma/pleroma!2764
4 years ago
feld
2909dc873b
Merge branch '1940-admin-token-oauthless-auth' into 'develop'
...
[#1940 ] Reinstated OAuth-less `admin_token` authentication
Closes #1940
See merge request pleroma/pleroma!2760
4 years ago
Ivan Tashkinov
124b4709dc
[ #1940 ] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.
4 years ago
feld
246f49d685
Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
...
Transmogrifier: filtering weirdness in address fields
Closes #1916
See merge request pleroma/pleroma!2762
4 years ago
rinpatch
e6ccc25565
Fix in-db configuration in dev environment
...
Previously, in-db configuration only worked when `warnings_as_errors`
was disabled because re-compiling scrubbers on application restart
created a warning about module conflicts. This patch fixes that
by enabling `ignore_module_conflict` option of the compiler at runtime,
and enables `warnings_as_errors` in prod since there is no reason
to keep it disabled anymore.
4 years ago
Ivan Tashkinov
9b225db7d8
[ #1940 ] Applied rate limit for requests with bad `admin_token`. Added doc warnings on `admin_token` setting.
4 years ago
Ivan Tashkinov
cf3f8cb72a
[ #1940 ] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
4 years ago
Alex Gleason
5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
4 years ago
=
b221b640a2
Transmogrifier: filtering weirdness in address fields
4 years ago
feld
5d215fd81f
Merge branch 'config-behaviours-runtime' into 'develop'
...
Config/Docs: Expand behaviour suggestions modules at runtime
Closes #1941
See merge request pleroma/pleroma!2755
4 years ago
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
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
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
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
Mark Felder
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
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
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
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
Haelwenn
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn
5ea6387572
Merge branch 'user-search-nickname-rank-boost' into 'develop'
...
Improved search results for localized nickname match
See merge request pleroma/pleroma!2733
4 years ago
Haelwenn (lanodan) Monnier
cc7153cd82
user: Add support for custom emojis in profile fields
4 years ago
Mark Felder
2b979cc90c
Add AdminFE reports URL to report emails
4 years ago
Mark Felder
d23804f191
Use the Pleroma.Config alias
4 years ago
Mark Felder
49c4e24953
Merge branch 'develop' into fix/csp-for-captcha
4 years ago
lain
8ca1f3e8c6
Merge branch '1723-token-fixes' into 'develop'
...
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
4 years ago
lain
f4469dc741
Merge branch 'features/favicons' into 'develop'
...
Add support for remote favicons
See merge request pleroma/pleroma!2261
4 years ago
Haelwenn
bdc7b60610
Merge branch '1925-muting-reblogs' into 'develop'
...
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
4 years ago
eugenijm
c2be0da79f
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`
4 years ago
Haelwenn
68036f5a3b
Merge branch 'follow-pipeline' into 'develop'
...
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
4 years ago
lain
6d688f14fa
Merge branch 'bugfix/status-deletion' into 'develop'
...
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
4 years ago
Ivan Tashkinov
123352ffa1
Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
4 years ago
lain
00e54f8fe7
ActivityPub: Remove `follow` and fix issues.
4 years ago