feld
c3dd860a02
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
...
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
4 years ago
feld
8d2ea95402
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
...
Feature/2438 users/instances posts total count
Closes #2438
See merge request pleroma/pleroma!3270
4 years ago
rinpatch
e2d7c4fd57
Merge branch 'feat/openapi-spec-export' into 'develop'
...
Improve OpenAPI spec and deploy it to api.pleroma.social
See merge request pleroma/pleroma!3296
4 years ago
rinpatch
9fcff7851f
Improve OpenAPI spec and deploy it to api.pleroma.social
...
Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information.
4 years ago
feld
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
4 years ago
feld
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
4 years ago
feld
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
4 years ago
feld
69c560cfba
Merge branch 'active-user-count' into 'develop'
...
Monthly Active Users
Closes #2332
See merge request pleroma/pleroma!3283
4 years ago
Alexander Strizhakov
0dc68c157f
fix for scheduled post with poll
4 years ago
Alexander Strizhakov
fdf1dfed56
only_remote -> remote renaming
4 years ago
Alexander Strizhakov
ba512cbea4
`/api/v1/accounts/:id/statuses` docs update
4 years ago
Alexander Strizhakov
77f0a0af7d
more tests and update for docs and changelog
4 years ago
Alexander Strizhakov
2cb6dc5a3a
list timeline filtration by params
4 years ago
Alexander Strizhakov
b6a72680e2
added only_media flag to home timeline
4 years ago
Alexander Strizhakov
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
4 years ago
Alexander Strizhakov
b794dae98a
like this
4 years ago
Alexander Strizhakov
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
4 years ago
Mark Felder
5fcab23aa3
Improve error message for ConfigDB
4 years ago
Ivan Tashkinov
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
4 years ago
Alexander Strizhakov
35cad9793d
cache headers for emoji and images
4 years ago
Egor Kislitsyn
793fc77b16
Add active user count
4 years ago
Alexander Strizhakov
d4158e8bf0
added total
...
to the instance adminAPI endpoint
4 years ago
Alexander Strizhakov
6806c03e85
added total
...
to the user statuses adminAPI endpoint
4 years ago
feld
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
4 years ago
Alexander Strizhakov
875fbaae35
support for expires_in/expires_at in filters
4 years ago
Haelwenn
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
4 years ago
Mark Felder
2cb5c16723
Credo
4 years ago
Mark Felder
0b19534475
Merge branch 'develop' into docs/apache-config
4 years ago
Alexander Strizhakov
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
4 years ago
Mark Felder
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder
6bfd497f4a
Include own_votes in the poll data
4 years ago
Mark Felder
80ccdb56f6
Make tag urls absolute
4 years ago
Mark Felder
e5b32aab92
rename function
4 years ago
Mark Felder
003402df40
Add ability to invalidate cache entries for Apache
4 years ago
eugenijm
7fcaa188a0
Allow to define custom HTTP headers per each frontend
4 years ago
eugenijm
133644dfa2
Ability to set the Service-Worker-Allowed header
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
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
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
ebd7d1365b
Make setting user activation status explicit
4 years ago
Mark Felder
860b5c7804
Change user.deactivated field to user.is_active
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
Alexander Strizhakov
aafd7b44ce
check dir existence in policy
4 years ago
lain
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
4 years ago
Haelwenn (lanodan) Monnier
87b13c5430
Create Object.hashtags/1 wrapper
4 years ago
Haelwenn (lanodan) Monnier
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
4 years ago
lain
ab633e51ab
Linting
4 years ago
lain
5db1e6c8d3
Pipeline test: Switch from Mock to Mox.
...
Speeds up the test and makes it possible to run async.
4 years ago
lain
c9d73af74d
Cachex: Unify arity of callback function
4 years ago
Kaizhe Huang
fb02241580
Fix trailing whitespaces in lib/pleroma/web/web_finger.ex
4 years ago
lain
95a9bdfc37
Tests: Use NullCache for async tests.
...
Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test.
4 years ago
lain
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
4 years ago
FiveYellowMice
83cd7f2b5f
WebFinger: add subscribe_address in return data of JSON responses
4 years ago
Alex Gleason
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
lain
8b8c317c0f
Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
...
Fix mastoapi ws posts dropping
Closes #2336
See merge request pleroma/pleroma!3198
4 years ago