|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
Ivan Tashkinov
|
380d0cce6b
|
[#3213] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
|
2021-01-29 00:17:33 +03:00 |
|
|
|
5fcab23aa3
|
Improve error message for ConfigDB
|
2021-01-28 14:59:23 -06:00 |
|
|
|
13d79c281f
|
Make attachment cleanup jobs a noop if the setting is disabled.
|
2021-01-28 14:42:20 -06:00 |
|
|
|
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 |
|
|
|
aaceb042c5
|
fix format
|
2021-01-28 10:20:25 +00:00 |
|
|
|
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 |
|
Alexander Strizhakov
|
6806c03e85
|
added total
to the user statuses adminAPI endpoint
|
2021-01-27 07:45:02 +03:00 |
|
|
|
d7af0294e6
|
Merge branch 'service-worker-allowed-header' into 'develop'
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
|
2021-01-26 18:14:01 +00:00 |
|
|
|
e854c35e65
|
Convert tests to all use clear_config instead of Pleroma.Config.put
|
2021-01-26 11:58:43 -06:00 |
|
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
|
2021-01-26 14:34:50 +00:00 |
|
lain
|
229acae6c3
|
Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
# CHANGELOG.md
|
2021-01-26 14:24:32 +00:00 |
|
Alexander Strizhakov
|
875fbaae35
|
support for expires_in/expires_at in filters
|
2021-01-26 08:27:45 +03:00 |
|
Haelwenn
|
250e202098
|
Merge branch 'fix/missing-own_votes' into 'develop'
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
|
2021-01-26 00:55:05 +00:00 |
|
|
|
1e3832c6bb
|
Merge branch 'docs/apache-config' into 'develop'
Update Apache configuration
See merge request pleroma/pleroma!3271
|
2021-01-26 00:32:53 +00:00 |
|
|
|
2cb5c16723
|
Credo
|
2021-01-25 18:25:53 -06:00 |
|
|
|
01fc7d809d
|
Clarify the state of mediaproxy cache invalidation for Apache
|
2021-01-25 18:23:05 -06:00 |
|
|
|
c6ef87d585
|
Note the requirement for the url_format parameter
|
2021-01-25 18:20:07 -06:00 |
|
|
|
8373cb645b
|
Add sudo rule, remove quoting that breaks the for loop
|
2021-01-25 18:15:04 -06:00 |
|
|
|
0b19534475
|
Merge branch 'develop' into docs/apache-config
|
2021-01-25 17:00:26 -06:00 |
|
Ivan Tashkinov
|
e7864a32d7
|
[#3213] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.
|
2021-01-25 22:31:23 +03:00 |
|
Ivan Tashkinov
|
694d98be55
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
2021-01-25 21:24:07 +03:00 |
|
Ivan Tashkinov
|
ea4785213a
|
[#3213] Switched to using embedded hashtags in Object.hashtags/1
(to avoid extra joins / preload in timeline queries).
|
2021-01-25 20:12:09 +03:00 |
|
|
|
f1c82fbd42
|
Merge branch 'refactor/deactivated_user_field' into 'develop'
Change user.deactivated field to user.is_active
See merge request pleroma/pleroma!3073
|
2021-01-25 16:54:57 +00:00 |
|
|
|
f868dcf3ac
|
Ensure consistent behavior between pleroma.user activate/deactivate mix tasks
|
2021-01-25 10:48:28 -06:00 |
|
Alexander Strizhakov
|
3f3d64acbf
|
little refactor and tests
for voted & own_votes fields in polls
|
2021-01-25 19:46:36 +03:00 |
|
|
|
6e51d7264b
|
Document pleroma.user activate mix task
|
2021-01-25 10:38:08 -06:00 |
|
|
|
5e8da27e14
|
Provide pleroma.user mix task for both activate and deactivate
|
2021-01-25 10:36:51 -06:00 |
|
|
|
fe63b48c8f
|
Document removal of toggle_activated
|
2021-01-25 10:05:38 -06:00 |
|
|
|
c3dd06b540
|
Update PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eae
|
2021-01-25 09:50:26 -06:00 |
|
|
|
9e3fcb4b29
|
Update AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71f
|
2021-01-25 09:45:58 -06:00 |
|
|
|
537ba1c5e0
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-25 09:45:06 -06:00 |
|
Ivan Tashkinov
|
f264d930cc
|
[#3213] Speedup of HashtagsTableMigrator (query optimization). State handling fix.
|
2021-01-24 23:27:02 +03:00 |
|
rinpatch
|
0a6f5f4793
|
Merge branch 'fix/minor-doc-fix' into 'develop'
add missing sudo prefix in some install doc
See merge request pleroma/pleroma!3276
|
2021-01-23 19:06:42 +00:00 |
|
