Mark Felder
|
d047372291
|
Merge branch 'develop' into fix/reports-from-admins
|
4 years ago |
|
feld
|
7b67bf4e97
|
Merge branch 'fix/configdb-error' into 'develop'
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
|
4 years ago |
|
Haelwenn
|
ea5469961a
|
Merge branch 'bugfix/notice-external-redirect' into 'develop'
Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
ecff027418
|
Redirect non-local activities when /notice/:id is used
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
|
4 years ago |
|
Mark Felder
|
887db076b5
|
Load an emoji.txt specific to the test env
|
4 years ago |
|
Mark Felder
|
5bb5949048
|
Validate admin making report doesn't get their own report notification, but other admins do
|
4 years ago |
|
feld
|
008499f65a
|
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
feld
|
c3dd860a02
|
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
|
4 years ago |
|
feld
|
8d2ea95402
|
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
Feature/2438 users/instances posts total count
Closes #2438
See merge request pleroma/pleroma!3270
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
fb25231fbe
|
Add test for Answer presence into an authenticated /outbox
|
4 years ago |
|
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
|
4 years ago |
|
feld
|
d37d4106c6
|
Merge branch 'fix/majic-nits' into 'develop'
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
|
4 years ago |
|
Mark Felder
|
28d2917c3a
|
Merge branch 'develop' into fix/majic-nits
|
4 years ago |
|
feld
|
d289ad8579
|
Merge branch 'develop' into 'fix/2411-mutes-api'
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
|
4 years ago |
|
feld
|
cd5ff7a943
|
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Alexander Strizhakov
|
aacd1c90b7
|
fix for test warnings
|
4 years ago |
|
Alexander Strizhakov
|
0dc68c157f
|
fix for scheduled post with poll
|
4 years ago |
|
Alexander Strizhakov
|
fdf1dfed56
|
only_remote -> remote renaming
|
4 years ago |
|
Alexander Strizhakov
|
77f0a0af7d
|
more tests and update for docs and changelog
|
4 years ago |
|
Alexander Strizhakov
|
2cb6dc5a3a
|
list timeline filtration by params
|
4 years ago |
|
Alexander Strizhakov
|
b6a72680e2
|
added only_media flag to home timeline
|
4 years ago |
|
Alexander Strizhakov
|
c3110c46f3
|
expanding filtration for home timeline
added local & remote statuses filtration for home timeline
|
4 years ago |
|
Alexander Strizhakov
|
c369d2b930
|
support for with_relationships parameter
in /api/v1/mutes and /api/v1/accounts/:id endpoints
|
4 years ago |
|
Mark Felder
|
5fcab23aa3
|
Improve error message for ConfigDB
|
4 years ago |
|
Mark Felder
|
9272cef500
|
Switch to a build of Majic that does not try to fix extensions by default
|
4 years ago |
|
Egor Kislitsyn
|
a51d903e0c
|
Make sure active_user_count/1 counts only local users
|
4 years ago |
|
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.
|
4 years ago |
|
Egor Kislitsyn
|
bddb01bded
|
Add tests
|
4 years ago |
|
Egor Kislitsyn
|
793fc77b16
|
Add active user count
|
4 years ago |
|
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
|
4 years ago |
|
Alexander Strizhakov
|
d4158e8bf0
|
added total
to the instance adminAPI endpoint
|
4 years ago |
|
Alexander Strizhakov
|
6806c03e85
|
added total
to the user statuses adminAPI endpoint
|
4 years ago |
|
feld
|
d7af0294e6
|
Merge branch 'service-worker-allowed-header' into 'develop'
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
|
4 years ago |
|
Mark Felder
|
e854c35e65
|
Convert tests to all use clear_config instead of Pleroma.Config.put
|
4 years ago |
|
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 |
