lain
229acae6c3
Merge branch 'develop' into '2435-list-multiple-users'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Alexander Strizhakov
875fbaae35
support for expires_in/expires_at in filters
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
Mark Felder
0b19534475
Merge branch 'develop' into docs/apache-config
4 years ago
Mark Felder
f868dcf3ac
Ensure consistent behavior between pleroma.user activate/deactivate mix tasks
4 years ago
Alexander Strizhakov
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
4 years ago
Mark Felder
5e8da27e14
Provide pleroma.user mix task for both activate and deactivate
4 years ago
Mark Felder
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder
6bfd497f4a
Include own_votes in the poll data
4 years ago
Mark Felder
80ccdb56f6
Make tag urls absolute
4 years ago
Mark Felder
42e49529c2
Test URL formatting
4 years ago
Mark Felder
0c485d5555
Improve description
4 years ago
eugenijm
7fcaa188a0
Allow to define custom HTTP headers per each frontend
4 years ago
eugenijm
133644dfa2
Ability to set the Service-Worker-Allowed header
4 years ago
lain
ba40af054c
Merge branch 'test-cases-mox-setup' into 'develop'
...
Mox mode setup tweak; refactoring
See merge request pleroma/pleroma!3263
4 years ago
feld
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
4 years ago
Mark Felder
9988d9261c
Add bucket_namespace to be extra certain truncated_namespace works
4 years ago
Mark Felder
dfc4cb6ebd
Special handling for unconfirmed users based on instance config no longer needed.
4 years ago
Mark Felder
5d344e5c79
Only need to test if unconfirmed users are successfully deleted
...
It's no longer possible to have an active user account with User.is_confirmed == false
4 years ago
Mark Felder
3cb4d40ebf
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.
4 years ago
Ivan Tashkinov
318d6dde1c
Mox mode setup tweak; refactoring.
4 years ago
feld
958a7f6ed0
Merge branch 'fix/reblog-api' into 'develop'
...
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
4 years ago
Mark Felder
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
Egor Kislitsyn
51d5951c02
Test that only author can reblog a private status
4 years ago
Egor Kislitsyn
1b79dce7bc
Fix Reblog API
...
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
4 years ago
Lain Soykaf
bdfd72630f
ListController: Fix being unable to add / remove users.
4 years ago
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.
4 years ago
Mark Felder
2c0fe2ea9e
Remove toggle_confirmation; require explicit state change
...
Also cosmetic changes to make the code clearer
4 years ago
Mark Felder
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
Mark Felder
ebd7d1365b
Make setting user activation status explicit
4 years ago
Mark Felder
7516660753
Remove toggle_activation
4 years ago
Mark Felder
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
Mark Felder
f7e59c28ed
Change user.approval_pending field to user.is_approved
4 years ago
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.
4 years ago
Mark Felder
0b725f5d21
Lint
4 years ago
Mark Felder
12c8ce481c
Bump Copyright year
4 years ago
Mark Felder
fb47e83adc
Add ConfigDB migration
4 years ago
Lain Soykaf
fd9a0ac329
BackupTest: Fix s3 test.
4 years ago
Lain Soykaf
c4b74c9c3f
Linting.
4 years ago
Lain Soykaf
39f3683a06
Pbkdf2: Use it everywhere.
4 years ago
Lain Soykaf
87a31c5c9b
Password -> Password.Pbkdf2
4 years ago
Mark Felder
ba234d3c73
Unnecessary duplication here
4 years ago
Mark Felder
94e5180846
Consistent style
4 years ago
Lain Soykaf
aff83eb7c1
Linting
4 years ago
lain
9106048c61
Password: Replace Pbkdf2 with Password.
4 years ago
lain
c7cd9bd591
Password: Add password module
...
Replaces Pbkdf2.
4 years ago
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/ >;'
4 years ago
Mark Felder
67e888498c
Switch another test to Upload.base_url/0
4 years ago
Mark Felder
e87cca97e6
Fix tests relying on old behavior. Use the Upload.base_url, Luke.
4 years ago
Mark Felder
8b28dce82a
Deprecate Pleroma.Uploaders.S3, :public_endpoint
4 years ago
feld
5453038ce9
Merge branch 'fix/backup-url-on-s3' into 'develop'
...
Standardize base url for uploads
See merge request pleroma/pleroma!3246
4 years ago
lain
e1a547d7d3
ChatMessages: Fix pagination headers.
...
They used to contain the path parameter `id` as query param,
which would break the link.
4 years ago
Mark Felder
3c936061d5
Apply Upload.base_url for S3
4 years ago
lain
5822338f3a
Merge branch 'guppe-example' into 'develop'
...
ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243
4 years ago
Alex Gleason
e73c7fa7e5
Merge remote-tracking branch 'upstream/develop' into confirm-users
4 years ago
Alex Gleason
1b98cd8610
Remove ConfirmUserPlug
4 years ago
lain
80167e62dd
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
...
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
4 years ago
Alex Gleason
3342f6a7ef
Backups: render ID in API
4 years ago
lain
bd788c0939
ActivtityPub Test: Add example for guppe actor
4 years ago
lain
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
4 years ago
lain
4d56aca904
Merge branch 'adminapi-user-email' into 'develop'
...
AdminAPI: return user email
See merge request pleroma/pleroma!3240
4 years ago
Alex Gleason
9f6fa5877f
Add AdminAPI.AccountViewTest
4 years ago
Alex Gleason
20af025c65
AdminAPI: return user email
4 years ago
Roger Braun
48cd336a72
allow external emoji
4 years ago
Mark Felder
f9090e00e6
Add test to validate URLs to custom emojis are properly encoded
4 years ago
lain
20a269ed69
Merge branch 'fix/pagination-regression' into 'develop'
...
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
4 years ago
lain
fee0c6a2cb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
4 years ago
lain
e802b48d55
User: Use ObjectID type to validate also-known-as field
4 years ago
lain
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
4 years ago
lain
bea69853a2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
4 years ago
lain
95a0ae8a35
AccountControllerTest: Fix test logic
4 years ago
lain
d44850d7a5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
4 years ago
lain
8e5904daa5
SideEffects.DeleteTest: asyncify.
...
Replace Mock with Mox, mock out Logger.
4 years ago
Mark Felder
0e93775ed0
Add test to validate profile pagination works with keyset
4 years ago
lain
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
Alex Gleason
0ec7e9b8e9
AdminAPI: return id for moderation log entries
4 years ago
Alex Gleason
7b44605cb8
Migration to confirm previously-logged-in users
4 years ago
feld
afe9c152ab
Merge branch 'fix/reports-ordering' into 'develop'
...
Do not reverse order of reports. We want newest ones sorted to the top.
Closes #2364
See merge request pleroma/pleroma!3225
4 years ago
Mark Felder
e4791258d4
Ensure newest report is returned first in the list
4 years ago
Alex Gleason
64f0e96ff6
Automatically confirm logged-in users
4 years ago
Alex Gleason
11d40e92b7
Render AKAs in Actor endpoints
4 years ago
Alex Gleason
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Mark Felder
4c5f75f4e9
Support pagination in AdminAPI for user statuses
4 years ago
Haelwenn
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
4 years ago
Haelwenn
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
4 years ago
Alexander Strizhakov
7bfb041658
insreasing test coverage for StealEmojiPolicy
4 years ago
lain
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
4 years ago
Haelwenn (lanodan) Monnier
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
4 years ago
lain
ab633e51ab
Linting
4 years ago
lain
1a3da01a65
Tests: Stub the pipeline in all tests.
...
Restores the old un-moxed behavior.
4 years ago
lain
5db1e6c8d3
Pipeline test: Switch from Mock to Mox.
...
Speeds up the test and makes it possible to run async.
4 years ago
lain
0ef0aed205
Tests: Add a helper method to reduce sleeping times in test.
...
This will 'time travel', i.e. change the inserted_at and update_at
fields of the object in question. This is used to backdate things
were we used sleeping before to ensure time differences.
4 years ago
lain
ba19975838
Linting
4 years ago
lain
9d5ce82221
Test: More async/sync tweaks.
4 years ago
lain
b17c36c45a
Tests: More test fixes.
4 years ago
lain
2f8ec8a9cc
XMLBuidlder test: Make async.
4 years ago
lain
9ba60f70d2
Tests: Make as many tests as possible async.
...
In general, tests that match these criteria can be made async:
- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer.
4 years ago
lain
ee81a94ab2
Caching: Add caching behavior, add null implementation.
4 years ago
Kaizhe Huang
509f82e4d6
Add test for subscribe_address in JSON WebFinger response
4 years ago