squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,695 Commits 154 Branches 42 Tags 503 MiB
48983e9421
Commit Graph

4083 Commits

Author SHA1 Message Date
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-14 18:56:40 -05:00
Alex Gleason
fab44f6970
Test User with confirmation_pending: true, approval_pending: true 2020-07-14 18:46:57 -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
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
Ivan Tashkinov
9b225db7d8 [#1940] Applied rate limit for requests with bad admin_token. Added doc warnings on admin_token setting. 2020-07-14 11:58:41 +03: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
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
 2020-07-13 15:45:25 +00: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
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
bcfd38c8f3
Make a user unapproved when registering with account_approval_required on 2020-07-12 22:55:37 -05: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
Alex Gleason
a62f17da17
Add approval_pending field to User 2020-07-12 20:27:14 -05:00
href
4347d2de5e Config/Docs: Expand behaviour suggestions at runtime 2020-07-12 17:23:33 +02: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
Mark Felder
6167593881 Support Exiftool for stripping EXIF data 
We really only want to strip location data anyway, and mogrify strips color profiles.
 2020-07-10 16:46:26 -05:00
Mark Felder
3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban 2020-07-10 11:34:53 -05:00
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
 2020-07-10 16:18:28 +00:00
href
a1dace088c ReverseProxy: Streaming and disable encoding if Range 
Fixes #1823
Fixes #1860
 2020-07-10 17:23:11 +02: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
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
 2020-07-10 09:22:14 +00:00
lain
4d809144d8 Merge branch 'cluster-test-ci' into 'develop' 
RE-enable cluster tests on CI

See merge request pleroma/pleroma!2743
 2020-07-10 08:56:12 +00: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
5ea6387572 Merge branch 'user-search-nickname-rank-boost' into 'develop' 
Improved search results for localized nickname match

See merge request pleroma/pleroma!2733
 2020-07-10 08:49:14 +00:00
stwf
08211eff22 Re-enable the federated tests, increase timeout 2020-07-09 13:49:30 -04:00
Haelwenn (lanodan) Monnier
cc7153cd82
user: Add support for custom emojis in profile fields 2020-07-09 19:21:58 +02:00
Mark Felder
2b979cc90c Add AdminFE reports URL to report emails 2020-07-09 11:55:40 -05: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
Haelwenn
68036f5a3b Merge branch 'follow-pipeline' into 'develop' 
Handle `Follow` activities with the pipeline

See merge request pleroma/pleroma!2734
 2020-07-09 10:32:24 +00:00
Maksim Pechnikov
31259cabcc fix test 2020-07-09 07:16:52 +03:00
Ivan Tashkinov
123352ffa1 Removed unused trigram index on users. Fixed users_fts_index usage. 2020-07-08 22:50:15 +03:00
lain
00e54f8fe7 ActivityPub: Remove follow and fix issues. 2020-07-08 17:07:24 +02:00
lain
9dda8b5427 CommonAPI: Switch to pipeline for following. 2020-07-08 15:40:56 +02:00
lain
172f4aff8e Transmogrifier: Move following to the pipeline. 2020-07-08 14:30:53 +02:00
lain
7d0e2b3fdd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline 2020-07-08 13:23:07 +02:00
lain
cdc153db31 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880 2020-07-08 13:21:58 +02:00
lain
6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop' 
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting

Closes #1895

See merge request pleroma/pleroma!2731
 2020-07-08 10:55:03 +00:00
Ivan Tashkinov
704a383055 Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches. 2020-07-08 13:14:18 +03:00