Mark Felder
|
109836306c
|
Test that Emoji Packs can be listed when instance is not public
|
2020-07-21 17:27:13 -05:00 |
|
Egor Kislitsyn
|
bdb3375933
|
Allow unblocking a domain via query params
|
2020-07-21 16:06:46 +04:00 |
|
Alex Gleason
|
48f8b26c92
|
OpenAPI: Add :id to follower/following endpoints, fixes #1958
|
2020-07-17 12:35:28 -05:00 |
|
Alex Gleason
|
15f8921b11
|
Test that unapproved users can never log in regardless of admin settings
|
2020-07-17 12:26:52 -05:00 |
|
Alex Gleason
|
9ce95fa68f
|
Use approval_required in /api/v1/instance
|
2020-07-15 17:04:30 -05:00 |
|
Mark Felder
|
9d30bacace
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-15 09:30:23 -05:00 |
|
rinpatch
|
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 |
|
Haelwenn (lanodan) Monnier
|
d29b8997f4
|
MastoAPI: fix & test giving MRF reject reasons
|
2020-07-15 15:25:33 +02:00 |
|
Maksim Pechnikov
|
3f8bff8d6b
|
Merge branch 'develop' into issue/sign-authority
|
2020-07-15 15:49:46 +03:00 |
|
Haelwenn (lanodan) Monnier
|
e4beff90f5
|
Create Question: Add context field to create
|
2020-07-15 12:32:43 +02:00 |
|
Haelwenn (lanodan) Monnier
|
922ca23298
|
Question: Add tests on HTML tags in options
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1362
|
2020-07-15 12:32:43 +02:00 |
|
Haelwenn (lanodan) Monnier
|
c19bdc811e
|
Fix attachments in polls
|
2020-07-15 12:32:42 +02:00 |
|
lain
|
040524c09f
|
Merge branch 'tests/apc2s-update_outbox' into 'develop'
AP C2S tests: Make sure you can't use another user's AP id
See merge request pleroma/pleroma!2767
|
2020-07-15 10:12:44 +00:00 |
|
Haelwenn (lanodan) Monnier
|
39870d99b8
|
transmogrifier tests: Move & enhance in specialised modules
|
2020-07-15 11:40:24 +02:00 |
|
Haelwenn (lanodan) Monnier
|
82895a4012
|
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
|
2020-07-15 11:40:23 +02:00 |
|
Haelwenn (lanodan) Monnier
|
10bd08ef07
|
transmogrifier_test: test date, anyOf and oneOf completely
|
2020-07-15 11:39:54 +02:00 |
|
Haelwenn (lanodan) Monnier
|
7bcd7a9595
|
QuestionValidator: Create
|
2020-07-15 11:39:53 +02:00 |
|
Haelwenn (lanodan) Monnier
|
6d8427cca2
|
AP C2S tests: Make sure you can't use another user's AP id
|
2020-07-15 09:59:24 +02:00 |
|
Alex Gleason
|
0d004a9d04
|
Email admins when a new unapproved account is up for review
|
2020-07-14 20:31:20 -05:00 |
|
Alex Gleason
|
48983e9421
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
2020-07-14 18:56:40 -05:00 |
|
Alex Gleason
|
20d24741af
|
AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint
|
2020-07-14 18:02:44 -05:00 |
|
Alex Gleason
|
33f1b29b2c
|
AdminAPI: Filter users by need_approval
|
2020-07-14 14:29:03 -05:00 |
|
Alex Gleason
|
b750129da1
|
AdminAPI: Return approval_pending with users
|
2020-07-14 13:47:05 -05:00 |
|
Maksim Pechnikov
|
1dd767b8c7
|
Include port in host for signatures
|
2020-07-14 21:44:08 +03:00 |
|
Alex Gleason
|
a1570ba6ad
|
AdminAPI: Return registration_reason with users
|
2020-07-14 13:08:39 -05:00 |
|
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
|
2020-07-14 18:07:44 +00:00 |
|
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
|
2020-07-14 16:48:26 +00:00 |
|
Ivan Tashkinov
|
124b4709dc
|
[#1940] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations.
|
2020-07-14 19:31:05 +03:00 |
|
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
|
2020-07-14 15:17:25 +00:00 |
|
Haelwenn (lanodan) Monnier
|
858d9fc7e8
|
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
|
2020-07-14 11:04:16 +02:00 |
|
Ivan Tashkinov
|
cf3f8cb72a
|
[#1940] Reinstated OAuth-less admin_token authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
|
2020-07-19 21:35:57 +03:00 |
|
Alex Gleason
|
5ddf0415c4
|
Accept reason in POST /api/v1/accounts and store in DB
|
2020-07-14 00:22:12 -05:00 |
|
=
|
b221b640a2
|
Transmogrifier: filtering weirdness in address fields
|
2020-07-13 22:43:21 +03:00 |
|
Mark Felder
|
80c21100db
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-13 13:32:21 -05:00 |
|
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
|
2020-07-13 15:43:46 +00:00 |
|
Haelwenn (lanodan) Monnier
|
2aac92e9e0
|
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post
|
2020-07-13 15:26:30 +02:00 |
|
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
|
2020-07-13 12:06:43 +00:00 |
|
Alex Gleason
|
e4e5577818
|
Prevent unapproved users from logging in
|
2020-07-12 22:55:26 -05:00 |
|
Alex Gleason
|
51ab8d0128
|
Add account_approval_required instance setting
|
2020-07-12 20:27:58 -05:00 |
|
Alexander Strizhakov
|
b376442325
|
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
|
2020-07-12 12:41:40 +03:00 |
|
Maksim Pechnikov
|
62fc8eab0d
|
fix reset confirmation email in admin section
|
2020-07-11 07:20:35 +03:00 |
|
Mark Felder
|
3c0c1fd2ef
|
Merge branch 'develop' into issue/1790-updated-oban
|
2020-07-10 11:34:53 -05:00 |
|
lain
|
93e494ec21
|
ActivityPub: Don't rename a clashing nickname with the same ap id.
|
2020-07-10 14:10:44 +02:00 |
|
lain
|
b39eb6ecc5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-10 12:26:53 +02:00 |
|
Haelwenn
|
4ac6e6283f
|
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
|
2020-07-10 08:55:15 +00:00 |
|
Haelwenn (lanodan) Monnier
|
cc7153cd82
|
user: Add support for custom emojis in profile fields
|
2020-07-09 19:21:58 +02:00 |
|
lain
|
8ca1f3e8c6
|
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
|
2020-07-09 13:10:05 +00:00 |
|
lain
|
f4469dc741
|
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
|
2020-07-09 13:09:31 +00:00 |
|
Haelwenn
|
bdc7b60610
|
Merge branch '1925-muting-reblogs' into 'develop'
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
|
2020-07-09 12:10:26 +00:00 |
|
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
|
2020-07-09 14:57:40 +03:00 |
|