feld
|
fd2477dfba
|
Merge branch 'a1batross-develop-patch-62810' into 'develop'
mix: instance: ensure all needed folders are created before generating config
See merge request pleroma/pleroma!3284
|
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 |
|
Mark Felder
|
d0b4a49f16
|
Merge branch 'develop' into a1batross-develop-patch-62810
|
4 years ago |
|
Mark Felder
|
c118bdb8f0
|
Merge branch 'develop' into a1batross-develop-patch-62810
|
4 years ago |
|
Mark Felder
|
d0c2159b77
|
Mix pleroma.instance creates parent directories now
|
4 years ago |
|
feld
|
d37d4106c6
|
Merge branch 'fix/majic-nits' into 'develop'
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
|
4 years ago |
|
Mark Felder
|
92efdf9adc
|
Document OAuth 2.0 provider fqn field addition
|
4 years ago |
|
feld
|
0888815000
|
Merge branch 'fix/2411-mutes-api' into 'develop'
Support for with_relationships parameter
Closes #2411
See merge request pleroma/pleroma!3290
|
4 years ago |
|
Mark Felder
|
f852e8d2d2
|
Document we are disabling the extension fixup in Majic
|
4 years ago |
|
Mark Felder
|
28d2917c3a
|
Merge branch 'develop' into fix/majic-nits
|
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
|
6a2d3fb9a3
|
Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'
fix and delete purge activities duplicates
Closes #2473
See merge request pleroma/pleroma!3285
|
4 years ago |
|
feld
|
b36891d1e6
|
Merge branch 'feature/2164-unify-api-arguments' into 'develop'
Unifying timelines api arguments
Closes #2164
See merge request pleroma/pleroma!3281
|
4 years ago |
|
Mark Felder
|
22486fb4af
|
Improve changelog description
|
4 years ago |
|
feld
|
cd5ff7a943
|
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
feld
|
2012800ed1
|
Merge branch 'fix/attachment-cleanup' into 'develop'
Only run attachment cleanup if enabled
See merge request pleroma/pleroma!3288
|
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
|
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
|
e21af1cfe4
|
only_media & only_remote docs and changelog
|
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 |
|
rinpatch
|
08a2cb750d
|
Merge branch 'update-frontend-2021-02-01' into 'develop'
Update frontend
Closes #2493
See merge request pleroma/pleroma!3293
|
4 years ago |
|
Lain Soykaf
|
93e3b89350
|
Update frontend
|
4 years ago |
|
feld
|
7ac0a81981
|
Merge branch 'emoji-cache' into 'develop'
Emoji cache
Closes #2468
See merge request pleroma/pleroma!3291
|
4 years ago |
|
feld
|
4e050e51ee
|
Merge branch 'fix/configdb-missing-s3-region' into 'develop'
ConfigDB descriptions: Add missing :ex_aws, :s3, :region setting
See merge request pleroma/pleroma!3292
|
4 years ago |
|
Mark Felder
|
2048b93929
|
Add missing :ex_aws, :s3, :region setting
|
4 years ago |
|
Ivan Tashkinov
|
239057155f
|
[#3286] Documentation on configuring Pleroma as OAuth 2.0 provider.
|
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
|
13d79c281f
|
Make attachment cleanup jobs a noop if the setting is disabled.
|
4 years ago |
|
Mark Felder
|
9272cef500
|
Switch to a build of Majic that does not try to fix extensions by default
|
4 years ago |
|
Egor Kislitsyn
|
a51d903e0c
|
Make sure active_user_count/1 counts only local users
|
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
|
dd1be13f75
|
changelog entry
|
4 years ago |
|
Alexander Strizhakov
|
6c987c7670
|
fix and delete purge activities duplicates
|
4 years ago |
|
Alibek Omarov
|
aaceb042c5
|
fix format
|
4 years ago |
|
Alibek Omarov
|
1547a2fda4
|
mix: instance: ensure all needed folders are created before generating config
|
4 years ago |
|
Alexander Strizhakov
|
35cad9793d
|
cache headers for emoji and images
|
4 years ago |
|
Egor Kislitsyn
|
13a2ae8ce0
|
Update CHANGELOG
|
4 years ago |
|
Egor Kislitsyn
|
bddb01bded
|
Add tests
|
4 years ago |
|
Egor Kislitsyn
|
793fc77b16
|
Add active user count
|
4 years ago |
|
lain
|
7f07871639
|
Merge branch 'chore/tests-use-clear_config' into 'develop'
Convert tests to all use clear_config instead of Pleroma.Config.put
See merge request pleroma/pleroma!3282
|
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 |
|
Mark Felder
|
e854c35e65
|
Convert tests to all use clear_config instead of Pleroma.Config.put
|
4 years ago |
|
Haelwenn
|
e1eac4faac
|
Merge branch '2435-list-multiple-users' into 'develop'
Resolve "Add/Remove several accounts from List don't work"
Closes #2435
See merge request pleroma/pleroma!3260
|
4 years ago |
|
lain
|
229acae6c3
|
Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
# CHANGELOG.md
|
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 |
