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
|
2021-02-02 18:37:20 +00:00 |
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
|
2021-02-02 18:35:08 +00:00 |
Mark Felder
|
d0b4a49f16
|
Merge branch 'develop' into a1batross-develop-patch-62810
|
2021-02-02 12:18:03 -06:00 |
Mark Felder
|
c118bdb8f0
|
Merge branch 'develop' into a1batross-develop-patch-62810
|
2021-02-02 12:16:49 -06:00 |
Mark Felder
|
d0c2159b77
|
Mix pleroma.instance creates parent directories now
|
2021-02-02 12:16:01 -06:00 |
feld
|
d37d4106c6
|
Merge branch 'fix/majic-nits' into 'develop'
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
|
2021-02-02 18:15:00 +00:00 |
Mark Felder
|
92efdf9adc
|
Document OAuth 2.0 provider fqn field addition
|
2021-02-02 12:12:37 -06:00 |
feld
|
0888815000
|
Merge branch 'fix/2411-mutes-api' into 'develop'
Support for with_relationships parameter
Closes #2411
See merge request pleroma/pleroma!3290
|
2021-02-02 18:08:46 +00:00 |
Mark Felder
|
f852e8d2d2
|
Document we are disabling the extension fixup in Majic
|
2021-02-02 12:03:20 -06:00 |
Mark Felder
|
28d2917c3a
|
Merge branch 'develop' into fix/majic-nits
|
2021-02-02 12:01:48 -06:00 |
feld
|
d289ad8579
|
Merge branch 'develop' into 'fix/2411-mutes-api'
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
|
2021-02-02 17:57:58 +00:00 |
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
|
2021-02-02 17:22:23 +00:00 |
feld
|
b36891d1e6
|
Merge branch 'feature/2164-unify-api-arguments' into 'develop'
Unifying timelines api arguments
Closes #2164
See merge request pleroma/pleroma!3281
|
2021-02-02 17:18:07 +00:00 |
Mark Felder
|
22486fb4af
|
Improve changelog description
|
2021-02-02 11:15:47 -06:00 |
feld
|
cd5ff7a943
|
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
# CHANGELOG.md
|
2021-02-02 17:11:38 +00:00 |
feld
|
2012800ed1
|
Merge branch 'fix/attachment-cleanup' into 'develop'
Only run attachment cleanup if enabled
See merge request pleroma/pleroma!3288
|
2021-02-02 17:08:33 +00:00 |
feld
|
69c560cfba
|
Merge branch 'active-user-count' into 'develop'
Monthly Active Users
Closes #2332
See merge request pleroma/pleroma!3283
|
2021-02-02 17:07:57 +00:00 |
Alexander Strizhakov
|
aacd1c90b7
|
fix for test warnings
|
2021-02-01 19:33:40 +03:00 |
Alexander Strizhakov
|
0dc68c157f
|
fix for scheduled post with poll
|
2021-02-01 18:22:26 +03:00 |
Alexander Strizhakov
|
fdf1dfed56
|
only_remote -> remote renaming
|
2021-02-01 14:11:12 +03:00 |
Alexander Strizhakov
|
ba512cbea4
|
`/api/v1/accounts/:id/statuses` docs update
|
2021-02-01 14:11:12 +03:00 |
Alexander Strizhakov
|
77f0a0af7d
|
more tests and update for docs and changelog
|
2021-02-01 14:11:12 +03:00 |
Alexander Strizhakov
|
2cb6dc5a3a
|
list timeline filtration by params
|
2021-02-01 14:11:12 +03:00 |
Alexander Strizhakov
|
e21af1cfe4
|
only_media & only_remote docs and changelog
|
2021-02-01 14:11:11 +03:00 |
Alexander Strizhakov
|
b6a72680e2
|
added only_media flag to home timeline
|
2021-02-01 14:11:11 +03:00 |
Alexander Strizhakov
|
c3110c46f3
|
expanding filtration for home timeline
added local & remote statuses filtration for home timeline
|
2021-02-01 14:11:11 +03:00 |
rinpatch
|
08a2cb750d
|
Merge branch 'update-frontend-2021-02-01' into 'develop'
Update frontend
Closes #2493
See merge request pleroma/pleroma!3293
|
2021-02-01 10:32:14 +00:00 |
Lain Soykaf
|
93e3b89350
|
Update frontend
|
2021-02-01 10:12:05 +01:00 |
feld
|
7ac0a81981
|
Merge branch 'emoji-cache' into 'develop'
Emoji cache
Closes #2468
See merge request pleroma/pleroma!3291
|
2021-01-30 17:41:08 +00:00 |
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
|
2021-01-29 17:44:46 +00:00 |
Mark Felder
|
2048b93929
|
Add missing :ex_aws, :s3, :region setting
|
2021-01-29 11:31:15 -06:00 |
Ivan Tashkinov
|
239057155f
|
[#3286] Documentation on configuring Pleroma as OAuth 2.0 provider.
|
2021-01-29 16:36:25 +03:00 |
Alexander Strizhakov
|
b794dae98a
|
like this
|
2021-01-29 15:55:00 +03:00 |
Alexander Strizhakov
|
c369d2b930
|
support for with_relationships parameter
in /api/v1/mutes and /api/v1/accounts/:id endpoints
|
2021-01-29 08:41:21 +03:00 |
Mark Felder
|
5fcab23aa3
|
Improve error message for ConfigDB
|
2021-01-28 14:59:23 -06:00 |
Mark Felder
|
13d79c281f
|
Make attachment cleanup jobs a noop if the setting is disabled.
|
2021-01-28 14:42:20 -06:00 |
Mark Felder
|
9272cef500
|
Switch to a build of Majic that does not try to fix extensions by default
|
2021-01-28 14:03:29 -06:00 |
Egor Kislitsyn
|
a51d903e0c
|
Make sure active_user_count/1 counts only local users
|
2021-01-28 22:23:10 +04:00 |
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.
|
2021-01-28 19:49:43 +03:00 |
Alexander Strizhakov
|
dd1be13f75
|
changelog entry
|
2021-01-28 17:01:31 +03:00 |
Alexander Strizhakov
|
6c987c7670
|
fix and delete purge activities duplicates
|
2021-01-28 16:57:41 +03:00 |
Alexander Strizhakov
|
39335d4251
|
fix for unique oban worker option
|
2021-01-28 16:57:03 +03:00 |
Alibek Omarov
|
aaceb042c5
|
fix format
|
2021-01-28 10:20:25 +00:00 |
Alibek Omarov
|
1547a2fda4
|
mix: instance: ensure all needed folders are created before generating config
|
2021-01-28 09:39:53 +00:00 |
Alexander Strizhakov
|
35cad9793d
|
cache headers for emoji and images
|
2021-01-27 18:49:08 +03:00 |
Egor Kislitsyn
|
13a2ae8ce0
|
Update CHANGELOG
|
2021-01-27 18:23:46 +04:00 |
Egor Kislitsyn
|
bddb01bded
|
Add tests
|
2021-01-27 18:20:07 +04:00 |
Egor Kislitsyn
|
793fc77b16
|
Add active user count
|
2021-01-27 18:20:06 +04:00 |
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
|
2021-01-27 11:33:27 +00:00 |
Alexander Strizhakov
|
d4158e8bf0
|
added total
to the instance adminAPI endpoint
|
2021-01-27 07:45:06 +03:00 |