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 |
|
Mark Felder
|
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 |
|
Ivan Tashkinov
|
218c519606
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
|
2021-01-22 10:05:28 +03:00 |
|
Mark Felder
|
80ccdb56f6
|
Make tag urls absolute
|
2021-01-21 16:49:19 -06:00 |
|
Ivan Tashkinov
|
ca7f240643
|
[#3213] Ignoring of blank elements from objects.data->tag.
|
2021-01-21 20:50:06 +03:00 |
|
Ivan Tashkinov
|
c041e9c630
|
[#3213] HashtagsTableMigrator: failures handling fix, retry function.
Changed default hashtags filtering strategy to non-aggregate approach.
|
2021-01-21 20:23:08 +03:00 |
|
Ivan Tashkinov
|
2634a16b4c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
2021-01-21 20:20:35 +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 |
|
feld
|
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 |
|
Mark Felder
|
704eef3c2d
|
Special handling for unconfirmed users based on instance config no longer needed.
|
2021-01-20 11:14:15 -06:00 |
|
Mark Felder
|
e759579f97
|
Active users must be confirmed
|
2021-01-19 16:39:55 -06:00 |
|
Ivan Tashkinov
|
b830605577
|
[#3213] Performance-related stat in HashtagsTableMigrator. Reworked count/_ to indicate approximate total count for current iteration.
|
2021-01-19 22:03:25 +03:00 |
|
Ivan Tashkinov
|
f0f0f2af00
|
[#3213] timeout option for HashtagsTableMigrator.count/_ .
|
2021-01-19 21:17:06 +03:00 |
|
Ivan Tashkinov
|
7f07909a7b
|
[#3213] Added HashtagsTableMigrator.count/1 .
|
2021-01-19 21:13:32 +03:00 |
|
feld
|
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 |
|
Mark Felder
|
28581e03ad
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-18 14:58:21 -06:00 |
|
Mark Felder
|
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 |
|
Ivan Tashkinov
|
9d28a7ebfb
|
[#3213] Missing copyright header for HashtagsTableMigrator.State.
|
2021-01-17 21:58:15 +03:00 |
|
Ivan Tashkinov
|
85f7ef4d13
|
[#3213] Feature lock adjustment for HashtagsTableMigrator.
|
2021-01-17 10:57:06 +03: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 |
|
Ivan Tashkinov
|
48b399cedb
|
[#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
|
2021-01-16 20:22:14 +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 |
|
Mark Felder
|
63923df0a5
|
Further simplify changeset logic
|
2021-01-15 10:42:02 -06:00 |
|
Mark Felder
|
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 |
|
Mark Felder
|
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 |
|
Mark Felder
|
8d6e9b25a4
|
Just validate command is in PATH; forking a shell is wasteful
|
2021-01-14 17:19:02 -06:00 |
|
Ivan Tashkinov
|
f5f267fa76
|
[#3213] Refactoring of HashtagsTableMigrator.
|
2021-01-14 22:41:27 +03: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 |
|
Ivan Tashkinov
|
e350898828
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
2021-01-13 22:11:16 +03:00 |
|
Ivan Tashkinov
|
3e4d84729a
|
[#3213] Prototype of data migrations functionality / HashtagsTableMigrator.
|
2021-01-13 22:07:38 +03:00 |
|
Mark Felder
|
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 |
|
Mark Felder
|
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 |
|
Mark Felder
|
12528edc34
|
Fix another ad-hoc construction of the upload base_url
|
2021-01-12 16:32:52 -06:00 |
|
Mark Felder
|
8b28dce82a
|
Deprecate Pleroma.Uploaders.S3, :public_endpoint
|
2021-01-12 16:31:35 -06:00 |
|
feld
|
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 |
|