Haelwenn
|
4ac6e6283f
|
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
|
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
|
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 |
|
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 |
|
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 |
