Mark Felder
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
4 years ago
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
4 years ago
Mark Felder
72b3dbf4d1
Credo line length complaint
4 years ago
href
a1dace088c
ReverseProxy: Streaming and disable encoding if Range
...
Fixes #1823
Fixes #1860
4 years ago
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
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
4 years ago
lain
48f98a2748
Merge branch 'mix-tasks-improvement' into 'develop'
...
Mix tasks improvement
See merge request pleroma/pleroma!2723
4 years ago
Haelwenn
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn
5ea6387572
Merge branch 'user-search-nickname-rank-boost' into 'develop'
...
Improved search results for localized nickname match
See merge request pleroma/pleroma!2733
4 years ago
Mark Felder
2b979cc90c
Add AdminFE reports URL to report emails
4 years ago
Mark Felder
d23804f191
Use the Pleroma.Config alias
4 years ago
Mark Felder
49c4e24953
Merge branch 'develop' into fix/csp-for-captcha
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
Ivan Tashkinov
123352ffa1
Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
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
Alexander Strizhakov
b28cc15459
don't restart pleroma in mix tasks
4 years ago
Alexander Strizhakov
72ad3a66f4
don't fully start pleroma in mix tasks
4 years ago
lain
172f4aff8e
Transmogrifier: Move following to the pipeline.
4 years ago
lain
29fa75d00d
Notification: For follows, notify the followed.
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
704a383055
Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.
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
8c9df2d2e6
instance: Prevent loop of updates
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
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