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
|
e4e5577818
|
Prevent unapproved users from logging in
|
4 years ago |
|
Alex Gleason
|
51ab8d0128
|
Add `account_approval_required` instance setting
|
4 years ago |
|
Alexander Strizhakov
|
b376442325
|
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
|
4 years ago |
|
Maksim Pechnikov
|
62fc8eab0d
|
fix reset confirmation email in admin section
|
4 years ago |
|
Mark Felder
|
3c0c1fd2ef
|
Merge branch 'develop' into issue/1790-updated-oban
|
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 |
|
Haelwenn (lanodan) Monnier
|
cc7153cd82
|
user: Add support for custom emojis in profile fields
|
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 |
|
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
|
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 |
|
lain
|
c0385cf47a
|
AccountController: Fix muting / unmuting reblogs.
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
312fc55f14
|
Add [:instances_favicons, :enabled] setting, defaults to false
|
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 |
|
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 |
|
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 |
|
Haelwenn (lanodan) Monnier
|
fbb9743a70
|
Fix getting videos from peertube
|
4 years ago |
|
Haelwenn
|
d81acb5f62
|
Merge branch 'description-limits' into 'develop'
Add limits to image descriptions
See merge request pleroma/pleroma!2724
|
4 years ago |
|
lain
|
a6a12b241f
|
FollowValidator: Add basic validation.
|
4 years ago |
|
lain
|
4e3b3998ad
|
BlockValidation test: Rename.
|
4 years ago |
|
lain
|
eb87430803
|
ObjectValidator tests: Extract block validation tests.
|
4 years ago |
|
lain
|
410c1fab31
|
ObjectValidator tests: Extract update validation tests.
|
4 years ago |
|
lain
|
b2e1ea9226
|
ObjectValidation tests: Extract announce validation tests.
|
4 years ago |
|
lain
|
bbaf108aee
|
ObjectValidator tests: Extract undo validation tests.
|
4 years ago |
|
lain
|
168256dce9
|
ObjectValidation tests: Extract like validation tests.
|
4 years ago |
|
lain
|
e6a13d97d0
|
ObjectValidation tests: Extract delete validation tests.
|
4 years ago |
|
lain
|
60d4c6c91d
|
ObjectValidator tests: Extract emoji react testing
|
4 years ago |
|
lain
|
e0baaa967c
|
ObjectValidator tests: Extract chat tests
|
4 years ago |
|
lain
|
0aa4c20d78
|
ObjectValidator Test: Extract attachments.
|
4 years ago |
|
lain
|
28feba8af4
|
Preloaders: Remove status_net preloader
|
4 years ago |
|
lain
|
1963e143c5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
|
4 years ago |
|
lain
|
ed4f9f6a29
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
|
4 years ago |
|
lain
|
208baf157a
|
ActivityPub: Add new 'capabilities' to user.
|
4 years ago |
|
lain
|
74b88c0a8b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
4 years ago |
|
lain
|
cc8b4e48d9
|
InstanceView: Add chat limit, description limit
|
4 years ago |
|
Alexander Strizhakov
|
818f3c2393
|
test fixes
|
4 years ago |
|
Sergey Suprunenko
|
8277b29790
|
Restrict thread statuses that contain user's irreversible filters
|
4 years ago |
|
Sergey Suprunenko
|
4a8c26654e
|
Restrict statuses that contain user's irreversible filters
|
4 years ago |
|
lain
|
cf56655614
|
Streamer: Don't filter out announce notifications.
|
4 years ago |
|
Mark Felder
|
4695bdd81b
|
Merge branch 'develop' into issue/1790-updated-oban
|
4 years ago |
|
lain
|
c2a052a346
|
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
|
4 years ago |
|
lain
|
d3efb50262
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
|
4 years ago |
|
lain
|
945e75c8e8
|
SearchController: Trim query.
|
4 years ago |
|
lain
|
e3b5559780
|
AccountController: Make setting accepts_chat_messages possible.
|
4 years ago |
|
lain
|
4a7b89e372
|
ChatMessageValidator: Additional validation.
|
4 years ago |
|
lain
|
5c0bf4c472
|
ActivityPub: Ingest information about chat acceptance.
|
4 years ago |
|
lain
|
26a7cc3f00
|
UserView: Add acceptsChatMessages field
|
4 years ago |
|
lain
|
db76c26469
|
AccountViewTest: Fix test.
|
4 years ago |
|
lain
|
3250228be9
|
AccountView: Add 'accepts_chat_messages' to view.
|
4 years ago |
|
Mark Felder
|
8121e46f25
|
Merge branch 'develop' into activation-meta
|
4 years ago |
|
lain
|
311b7c19d0
|
Streamer: Align announce streaming with polling.
|
4 years ago |
|
lain
|
61fe94d698
|
SideEffects: Refactor.
|
4 years ago |
|
lain
|
691742e62d
|
Revert "Merge branch 'avatar-removing' into 'develop'"
This reverts merge request !2701
|
4 years ago |
|
Mark Felder
|
5a8e0208b1
|
Add fields limits to instance metadata, add tests
|
4 years ago |
|
Mark Felder
|
d69af7f742
|
Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
|
4 years ago |
|
lain
|
0176b7bca2
|
Merge branch 'preload-fixups-2' into preloadfixups
|
4 years ago |
|
lain
|
2382a2a151
|
Preload: Load the correct instance panel
|
4 years ago |
|
Egor Kislitsyn
|
3aa04b81c4
|
Test default "content-type" for CastAndValidate
|
4 years ago |
|
Egor Kislitsyn
|
4a306720e8
|
Merge branch 'develop' into remove-twitter-api
|
4 years ago |
|
lain
|
651f269568
|
Merge branch 'avatar-removing' into 'develop'
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
|
4 years ago |
|
lain
|
e64d08439e
|
UpdateCredentialsTest: Add test for removing profile images.
|
4 years ago |
|
lain
|
8630a6c7f5
|
Preloaders: Use strings as keys.
|
4 years ago |
|
lain
|
a19f8778af
|
User preloader: Put user info at correct key
|
4 years ago |
|
lain
|
577da132da
|
Merge branch '1031-parent-visible' into 'develop'
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
|
4 years ago |
|
Mark Felder
|
ce85db41a3
|
Lint
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
244655e884
|
MastoAPI: Show source field when deleting
|
4 years ago |
|
Mark Felder
|
69848d5c97
|
Rename notification "privacy_option" setting
|
4 years ago |
|
Haelwenn
|
bf1c5e255a
|
Merge branch 'block-handling' into 'develop'
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
|
4 years ago |
|
Haelwenn
|
09478c9cf7
|
Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
|
4 years ago |
|
Mark Felder
|
fd5e797379
|
Simplify notification filtering settings further
|
4 years ago |
|
Mark Felder
|
b950fb01db
|
Merge branch 'develop' into refactor/notification_settings
|
4 years ago |
|
lain
|
a5bbfa21a1
|
StaticFE: Prioritize json in requests.
|
4 years ago |
|
lain
|
f378e93bf4
|
AccountController: Return scope in proper format.
|
4 years ago |
|
lain
|
a2002ebb63
|
Preloading: Fix nodeinfo url.
|
4 years ago |
|
lain
|
4a7a34ae8c
|
Preloading: Return correct data for statusnet stuff.
|
4 years ago |
|
lain
|
7ed2296416
|
Nodeinfo: Add chat information back in.
|
4 years ago |
|
lain
|
15a8b70318
|
User: Don't unfollow on block when the relevant setting is set.
|
4 years ago |
|
lain
|
c3383d4fab
|
BlockValidator: Restore old behavior for incoming blocks.
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
27c33f216a
|
activity_draft: Add source field
|
4 years ago |
|
feld
|
8288419686
|
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
|
4 years ago |
|
Mark Felder
|
433c01b370
|
Merge branch 'develop' into refactor/notification_settings
|
4 years ago |
|
lain
|
04abee782b
|
AntiSpamLinkPolicy: Exempt local users.
|
4 years ago |
|
lain
|
84f9ca1956
|
Blocking: Don't federate if the options is set.
|
4 years ago |
|
lain
|
44bb7cfccd
|
ActivityPub: Remove `block`.
|
4 years ago |
|
lain
|
e38293c8f1
|
Transmogrifier: Switch to pipeline for Blocks.
|
4 years ago |
|
lain
|
89e5b2046b
|
ObjectValidator: Basic `Block` support.
|
4 years ago |
