Alexander Strizhakov
|
3f3d64acbf
|
little refactor and tests
for voted & own_votes fields in polls
|
4 years ago |
|
Mark Felder
|
6bfd497f4a
|
Include own_votes in the poll data
|
4 years ago |
|
Alexander Strizhakov
|
6d48144a9d
|
use proper naming
for MediaProxyWarmingPolicy in ConcurrentLimiter
|
4 years ago |
|
feld
|
958a7f6ed0
|
Merge branch 'fix/reblog-api' into 'develop'
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
|
4 years ago |
|
Mark Felder
|
44a86951a3
|
Merge branch 'develop' into refactor/approval_pending_user_field
|
4 years ago |
|
Egor Kislitsyn
|
1b79dce7bc
|
Fix Reblog API
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
|
4 years ago |
|
Mark Felder
|
2c0fe2ea9e
|
Remove toggle_confirmation; require explicit state change
Also cosmetic changes to make the code clearer
|
4 years ago |
|
Mark Felder
|
d36182c088
|
Change user.confirmation_pending field to user.is_confirmed
|
4 years ago |
|
Mark Felder
|
f7e59c28ed
|
Change user.approval_pending field to user.is_approved
|
4 years ago |
|
Lain Soykaf
|
39f3683a06
|
Pbkdf2: Use it everywhere.
|
4 years ago |
|
lain
|
9106048c61
|
Password: Replace Pbkdf2 with Password.
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
c4439c630f
|
Bump Copyright to 2021
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
|
4 years ago |
|
feld
|
5453038ce9
|
Merge branch 'fix/backup-url-on-s3' into 'develop'
Standardize base url for uploads
See merge request pleroma/pleroma!3246
|
4 years ago |
|
lain
|
7a1cb752dd
|
Pagination: Don't be dos'd by random parameters.
|
4 years ago |
|
Mark Felder
|
ef59d99833
|
Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
|
4 years ago |
|
Mark Felder
|
1040881047
|
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
|
4 years ago |
|
lain
|
e1a547d7d3
|
ChatMessages: Fix pagination headers.
They used to contain the path parameter `id` as query param,
which would break the link.
|
4 years ago |
|
Mark Felder
|
9887cdf9be
|
Formatting
|
4 years ago |
|
feld
|
fa63f1b55b
|
Apply 4 suggestion(s) to 2 file(s)
|
4 years ago |
|
Mark Felder
|
86dcfb4eb9
|
More places we should be using Upload.base_url
|
4 years ago |
|
Mark Felder
|
ad79983614
|
Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
|
4 years ago |
|
lain
|
80167e62dd
|
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
|
4 years ago |
|
Alex Gleason
|
3342f6a7ef
|
Backups: render ID in API
|
4 years ago |
|
lain
|
ac1298fce8
|
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236
|
4 years ago |
|
lain
|
cf0eb0c1c5
|
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
|
4 years ago |
|
Alex Gleason
|
20af025c65
|
AdminAPI: return user email
|
4 years ago |
|
Mark Felder
|
d69c78ceb9
|
Remove configurability of upload proxy opts, simplify
|
4 years ago |
|
Mark Felder
|
64116f63d9
|
URI.encode custom emojis
|
4 years ago |
|
lain
|
20a269ed69
|
Merge branch 'fix/pagination-regression' into 'develop'
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
|
4 years ago |
|
lain
|
f0e6cff583
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
|
4 years ago |
|
lain
|
bea69853a2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
|
4 years ago |
|
lain
|
d44850d7a5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
|
4 years ago |
|
lain
|
8e5904daa5
|
SideEffects.DeleteTest: asyncify.
Replace Mock with Mox, mock out Logger.
|
4 years ago |
|
Mark Felder
|
83f27282ba
|
Do not try to guess which pagination we need by the existence of an :offset param.
Require explicit request to get offset pagination.
|
4 years ago |
|
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
4 years ago |
|
Alex Gleason
|
0ec7e9b8e9
|
AdminAPI: return id for moderation log entries
|
4 years ago |
|
feld
|
afe9c152ab
|
Merge branch 'fix/reports-ordering' into 'develop'
Do not reverse order of reports. We want newest ones sorted to the top.
Closes #2364
See merge request pleroma/pleroma!3225
|
4 years ago |
|
Alex Gleason
|
0d6b9ce8ca
|
Apply 2 suggestion(s) to 1 file(s)
|
4 years ago |
|
feld
|
2aa60e7592
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Alex Gleason
|
11d40e92b7
|
Render AKAs in Actor endpoints
|
4 years ago |
|
Alex Gleason
|
cbce880076
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
4 years ago |
|
Mark Felder
|
2597b028f7
|
Make pagination type conditional
|
4 years ago |
|
Mark Felder
|
085d4e6cfc
|
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
|
4 years ago |
|
Mark Felder
|
4c5f75f4e9
|
Support pagination in AdminAPI for user statuses
|
4 years ago |
|
Mark Felder
|
744b34709d
|
Do not reverse order of reports. We want newest ones sorted to the top.
|
4 years ago |
|
Haelwenn
|
3966add048
|
Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
|
4 years ago |
|
Haelwenn
|
b122b6ffa3
|
Merge branch 'features/hashtag-column' into 'develop'
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
18b536c176
|
Pleroma.Object/1: take %Object{} as argument instead
|
4 years ago |
|
Alexander Strizhakov
|
2e859794ee
|
non condition dir creation
|
4 years ago |
|
Alexander Strizhakov
|
7bfb041658
|
insreasing test coverage for StealEmojiPolicy
|
4 years ago |
