Alex Gleason
|
48983e9421
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
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
|
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 |
|
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 |
|
Alex Gleason
|
e4e5577818
|
Prevent unapproved users from logging in
|
4 years ago |
|
Alex Gleason
|
51ab8d0128
|
Add `account_approval_required` instance setting
|
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 |
|
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
|
4ac6e6283f
|
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
d23804f191
|
Use the Pleroma.Config alias
|
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 |
|
lain
|
00e54f8fe7
|
ActivityPub: Remove `follow` and fix issues.
|
4 years ago |
|
lain
|
9dda8b5427
|
CommonAPI: Switch to pipeline for following.
|
4 years ago |
|
lain
|
172f4aff8e
|
Transmogrifier: Move following to the pipeline.
|
4 years ago |
|
lain
|
7d0e2b3fdd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
|
4 years ago |
|
lain
|
cdc153db31
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
|
4 years ago |
|
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
|
4 years ago |
|
Ivan Tashkinov
|
a6495f4a68
|
[#1895] credo fix.
|
4 years ago |
|
lain
|
c0385cf47a
|
AccountController: Fix muting / unmuting reblogs.
|
4 years ago |
|
Ivan Tashkinov
|
3f8370a285
|
[#1895] Applied code review suggestion.
|
4 years ago |
|
Maksim Pechnikov
|
e341f81785
|
fixed delete `Like` activity in remove user
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
31fef95e35
|
Add changelog and documentation
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
312fc55f14
|
Add [:instances_favicons, :enabled] setting, defaults to false
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
013e2c5057
|
Use instances table instead of Cachex
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
6a679d80c9
|
Move get_favicon to Pleroma.Instances, use /
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
f6d09fafee
|
Add support for remote favicons
|
4 years ago |
|
Haelwenn
|
a8447c3803
|
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
|
4 years ago |
|
Haelwenn
|
db13acf242
|
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
|
4 years ago |
|
lain
|
8939ff39e4
|
Merge branch 'remove-twitter-api' into 'develop'
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
|
4 years ago |
|
Ivan Tashkinov
|
3e08e77151
|
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
|
4 years ago |
|
Mark Felder
|
18438a9bf0
|
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
|
4 years ago |
|
lain
|
c8dd973af5
|
AccountController: Remove unused `update_?` routes.
These were not documented and are also not used anymore.
|
4 years ago |
|
lain
|
59cf78e412
|
AccountController: Allow removal / reset of user images.
|
4 years ago |
|
lain
|
9ad305209a
|
Merge branch 'bugfix/peertube-videos' into 'develop'
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
|
4 years ago |
|
Haelwenn
|
fa0fa4552f
|
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
|
4 years ago |
