Egor Kislitsyn
|
793fc77b16
|
Add active user count
|
2021-01-27 18:20:06 +04: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 |
|
lain
|
229acae6c3
|
Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
# CHANGELOG.md
|
2021-01-26 14:24:32 +00: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 |
|
|
|
2cb5c16723
|
Credo
|
2021-01-25 18:25:53 -06:00 |
|
|
|
0b19534475
|
Merge branch 'develop' into docs/apache-config
|
2021-01-25 17:00:26 -06:00 |
|
Alexander Strizhakov
|
3f3d64acbf
|
little refactor and tests
for voted & own_votes fields in polls
|
2021-01-25 19:46:36 +03:00 |
|
|
|
537ba1c5e0
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-25 09:45:06 -06:00 |
|
|
|
6bfd497f4a
|
Include own_votes in the poll data
|
2021-01-22 09:47:59 -06:00 |
|
|
|
80ccdb56f6
|
Make tag urls absolute
|
2021-01-21 16:49:19 -06:00 |
|
|
|
e5b32aab92
|
rename function
|
2021-01-21 14:41:28 -06:00 |
|
|
|
003402df40
|
Add ability to invalidate cache entries for Apache
|
2021-01-21 14:20:13 -06:00 |
|
eugenijm
|
7fcaa188a0
|
Allow to define custom HTTP headers per each frontend
|
2021-01-21 21:55:23 +03:00 |
|
eugenijm
|
133644dfa2
|
Ability to set the Service-Worker-Allowed header
|
2021-01-21 21:55:11 +03:00 |
|
Alexander Strizhakov
|
6d48144a9d
|
use proper naming
for MediaProxyWarmingPolicy in ConcurrentLimiter
|
2021-01-21 09:50:18 +03:00 |
|
Alexander Strizhakov
|
b4ff63d020
|
configurable limits for ConcurrentLimiter
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
|
2021-01-21 09:47:21 +03:00 |
|
|
|
2926713fe5
|
Merge branch 'deprecate-public_endpoint' into 'develop'
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
|
2021-01-20 22:48:48 +00:00 |
|
|
|
704eef3c2d
|
Special handling for unconfirmed users based on instance config no longer needed.
|
2021-01-20 11:14:15 -06:00 |
|
|
|
e759579f97
|
Active users must be confirmed
|
2021-01-19 16:39:55 -06:00 |
|
|
|
958a7f6ed0
|
Merge branch 'fix/reblog-api' into 'develop'
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
|
2021-01-18 21:19:14 +00:00 |
|
|
|
28581e03ad
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-18 14:58:21 -06:00 |
|
|
|
44a86951a3
|
Merge branch 'develop' into refactor/approval_pending_user_field
|
2021-01-18 12:05:05 -06:00 |
|
Egor Kislitsyn
|
1b79dce7bc
|
Fix Reblog API
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
|
2021-01-18 20:15:57 +04:00 |
|
Lain Soykaf
|
bdfd72630f
|
ListController: Fix being unable to add / remove users.
|
2021-01-18 16:28:36 +01:00 |
|
Ivan Tashkinov
|
3f88e33a71
|
[#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to clear_config/_ to minimize such issues in future.
|
2021-01-16 23:05:31 +03:00 |
|
Mark Felder
|
2c0fe2ea9e
|
Remove toggle_confirmation; require explicit state change
Also cosmetic changes to make the code clearer
|
2021-01-15 13:11:51 -06:00 |
|
Mark Felder
|
d36182c088
|
Change user.confirmation_pending field to user.is_confirmed
|
2021-01-15 12:44:41 -06:00 |
|
Mark Felder
|
6c50ac1d3f
|
Readability
|
2021-01-15 11:37:17 -06:00 |
|
Mark Felder
|
ebd7d1365b
|
Make setting user activation status explicit
|
2021-01-15 11:37:17 -06:00 |
|
Mark Felder
|
cd1e5d76ab
|
Remove User.restrict_deactivated/1
Everything else is in User.Query, no need for this odd kludge.
|
2021-01-15 11:24:46 -06:00 |
|
Mark Felder
|
860b5c7804
|
Change user.deactivated field to user.is_active
|
2021-01-15 11:24:46 -06:00 |
|
|
|
63923df0a5
|
Further simplify changeset logic
|
2021-01-15 10:42:02 -06:00 |
|
|
|
f7e59c28ed
|
Change user.approval_pending field to user.is_approved
|
2021-01-15 10:42:02 -06:00 |
|
Haelwenn
|
cf367fdbd5
|
Merge branch 'optimize-command_available' into 'develop'
Optimize Pleroma.Utils.command_available?/1
See merge request pleroma/pleroma!3254
|
2021-01-15 04:44:58 +00:00 |
|
|
|
d0e0396528
|
Hack to fix tests not passing. Unclear why the filters are being set to nil.
Both of these changes are needed or it doesn't work.
|
2021-01-14 17:49:37 -06:00 |
|
|
|
8d6e9b25a4
|
Just validate command is in PATH; forking a shell is wasteful
|
2021-01-14 17:19:02 -06:00 |
|
Lain Soykaf
|
39f3683a06
|
Pbkdf2: Use it everywhere.
|
2021-01-14 15:06:16 +01:00 |
|
Lain Soykaf
|
87a31c5c9b
|
Password -> Password.Pbkdf2
|
2021-01-14 14:49:39 +01:00 |
|
|
|
f0ab60189e
|
truncated_namespace should default to nil
|
2021-01-13 11:54:00 -06:00 |
|
lain
|
9106048c61
|
Password: Replace Pbkdf2 with Password.
|
2021-01-13 15:11:11 +01:00 |
|
lain
|
c7cd9bd591
|
Password: Add password module
Replaces Pbkdf2.
|
2021-01-13 15:09:01 +01:00 |
|
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/>;'
|
2021-01-13 07:49:50 +01:00 |
|
|
|
c35e6fb516
|
Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader
|
2021-01-12 16:34:24 -06:00 |
|
|
|
12528edc34
|
Fix another ad-hoc construction of the upload base_url
|
2021-01-12 16:32:52 -06:00 |
|
|
|
8b28dce82a
|
Deprecate Pleroma.Uploaders.S3, :public_endpoint
|
2021-01-12 16:31:35 -06:00 |
|
|
|
5453038ce9
|
Merge branch 'fix/backup-url-on-s3' into 'develop'
Standardize base url for uploads
See merge request pleroma/pleroma!3246
|
2021-01-12 20:54:30 +00:00 |
|
lain
|
7a1cb752dd
|
Pagination: Don't be dos'd by random parameters.
|
2021-01-12 12:59:50 +01:00 |
|
|
|
ef59d99833
|
Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
|
2021-01-11 14:19:14 -06:00 |
|
|
|
1040881047
|
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
|
2021-01-11 14:01:31 -06:00 |
|
lain
|
e1a547d7d3
|
ChatMessages: Fix pagination headers.
They used to contain the path parameter `id` as query param,
which would break the link.
|
2021-01-11 15:30:40 +01:00 |
|
