Alexander Strizhakov
|
b5d001fc8c
|
not used mock
|
2021-02-10 18:44:49 +03:00 |
|
rinpatch
|
a853218701
|
Merge branch 'features/ap_id-c2s-authentication' into 'develop'
activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295
|
2021-02-09 19:29:43 +00:00 |
|
|
|
55a13fc360
|
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
Helps prevent accidental button mashes from submitting incomplete posts
|
2021-02-08 15:32:47 -06:00 |
|
Haelwenn (lanodan) Monnier
|
8c7b3b20d8
|
activity_pub_controller: Add authentication to object & activity endpoints
|
2021-02-08 20:00:47 +01:00 |
|
Ivan Tashkinov
|
d1c6dd97aa
|
[#3213] Partially addressed code review points.
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
|
2021-02-07 22:24:12 +03:00 |
|
|
|
7b67bf4e97
|
Merge branch 'fix/configdb-error' into 'develop'
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
|
2021-02-04 14:33:59 +00:00 |
|
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
|
2021-02-04 14:26:03 +00:00 |
|
Haelwenn (lanodan) Monnier
|
ecff027418
|
Redirect non-local activities when /notice/:id is used
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
|
2021-02-04 15:17:40 +01:00 |
|
|
|
008499f65a
|
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
|
2021-02-03 14:23:23 +00:00 |
|
|
|
c3dd860a02
|
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
|
2021-02-03 14:22:23 +00:00 |
|
|
|
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
|
2021-02-03 14:21:57 +00:00 |
|
Haelwenn (lanodan) Monnier
|
fb25231fbe
|
Add test for Answer presence into an authenticated /outbox
|
2021-02-03 12:07:18 +01:00 |
|
Ivan Tashkinov
|
4e14945670
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
|
2021-02-03 09:31:38 +03:00 |
|
|
|
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
|
2021-02-02 18:35:08 +00:00 |
|
|
|
d37d4106c6
|
Merge branch 'fix/majic-nits' into 'develop'
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
|
2021-02-02 18:15:00 +00:00 |
|
|
|
28d2917c3a
|
Merge branch 'develop' into fix/majic-nits
|
2021-02-02 12:01:48 -06:00 |
|
|
|
d289ad8579
|
Merge branch 'develop' into 'fix/2411-mutes-api'
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
|
2021-02-02 17:57:58 +00:00 |
|
|
|
cd5ff7a943
|
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
# CHANGELOG.md
|
2021-02-02 17:11:38 +00:00 |
|
Alexander Strizhakov
|
0dc68c157f
|
fix for scheduled post with poll
|
2021-02-01 18:22:26 +03:00 |
|
Alexander Strizhakov
|
fdf1dfed56
|
only_remote -> remote renaming
|
2021-02-01 14:11:12 +03:00 |
|
Alexander Strizhakov
|
77f0a0af7d
|
more tests and update for docs and changelog
|
2021-02-01 14:11:12 +03:00 |
|
Alexander Strizhakov
|
2cb6dc5a3a
|
list timeline filtration by params
|
2021-02-01 14:11:12 +03:00 |
|
Alexander Strizhakov
|
b6a72680e2
|
added only_media flag to home timeline
|
2021-02-01 14:11:11 +03:00 |
|
Alexander Strizhakov
|
c3110c46f3
|
expanding filtration for home timeline
added local & remote statuses filtration for home timeline
|
2021-02-01 14:11:11 +03:00 |
|
Ivan Tashkinov
|
cf4765af40
|
[#3213] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
|
2021-01-31 23:06:38 +03:00 |
|
Ivan Tashkinov
|
1b49b8efe5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
2021-01-31 20:38:58 +03:00 |
|
Ivan Tashkinov
|
6fd4163ab6
|
[#3213] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
|
2021-01-31 20:37:33 +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 |
|
|
|
9272cef500
|
Switch to a build of Majic that does not try to fix extensions by default
|
2021-01-28 14:03:29 -06: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 |
|
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 |
|
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 |
|
|
|
0b19534475
|
Merge branch 'develop' into docs/apache-config
|
2021-01-25 17:00:26 -06:00 |
|
Ivan Tashkinov
|
694d98be55
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
2021-01-25 21:24:07 +03: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 |
|
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 |
|
|
|
80ccdb56f6
|
Make tag urls absolute
|
2021-01-21 16:49:19 -06:00 |
|
|
|
42e49529c2
|
Test URL formatting
|
2021-01-21 14:42:16 -06:00 |
|
|
|
0c485d5555
|
Improve description
|
2021-01-21 14:42:08 -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 |
|
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 |
|
|
|
dfc4cb6ebd
|
Special handling for unconfirmed users based on instance config no longer needed.
|
2021-01-20 11:30:29 -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
|
51d5951c02
|
Test that only author can reblog a private status
|
2021-01-18 21:01:00 +04: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
|
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
|
ebd7d1365b
|
Make setting user activation status explicit
|
2021-01-15 11:37:17 -06:00 |
|
Mark Felder
|
860b5c7804
|
Change user.deactivated field to user.is_active
|
2021-01-15 11:24:46 -06:00 |
|
|
|
f7e59c28ed
|
Change user.approval_pending field to user.is_approved
|
2021-01-15 10:42:02 -06:00 |
|
Lain Soykaf
|
c4b74c9c3f
|
Linting.
|
2021-01-14 16:01:14 +01:00 |
|
Lain Soykaf
|
39f3683a06
|
Pbkdf2: Use it everywhere.
|
2021-01-14 15:06:16 +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 |
|
Lain Soykaf
|
aff83eb7c1
|
Linting
|
2021-01-13 16:00:12 +01:00 |
|
lain
|
9106048c61
|
Password: Replace Pbkdf2 with Password.
|
2021-01-13 15:11:11 +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 |
|
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 |
|
lain
|
5822338f3a
|
Merge branch 'guppe-example' into 'develop'
ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243
|
2021-01-08 15:55:48 +00:00 |
|
lain
|
80167e62dd
|
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
|
2021-01-08 13:10:49 +00:00 |
|
Alex Gleason
|
3342f6a7ef
|
Backups: render ID in API
|
2021-01-07 13:06:22 -06:00 |
|
lain
|
bd788c0939
|
ActivtityPub Test: Add example for guppe actor
|
2021-01-07 16:20:30 +01:00 |
|
lain
|
cf0eb0c1c5
|
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
|
2021-01-07 11:09:18 +00:00 |
|
lain
|
4d56aca904
|
Merge branch 'adminapi-user-email' into 'develop'
AdminAPI: return user email
See merge request pleroma/pleroma!3240
|
2021-01-07 10:08:02 +00:00 |
|
Alex Gleason
|
9f6fa5877f
|
Add AdminAPI.AccountViewTest
|
2021-01-06 11:43:07 -06:00 |
|
Alex Gleason
|
20af025c65
|
AdminAPI: return user email
|
2021-01-06 11:30:32 -06:00 |
|
Roger Braun
|
48cd336a72
|
allow external emoji
|
2021-01-06 10:13:01 -06:00 |
|
|
|
f9090e00e6
|
Add test to validate URLs to custom emojis are properly encoded
|
2021-01-05 13:58:49 -06:00 |
|
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
|
2021-01-05 12:40:45 +00:00 |
|
lain
|
e802b48d55
|
User: Use ObjectID type to validate also-known-as field
|
2021-01-05 13:10:14 +01:00 |
|
lain
|
f0e6cff583
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
|
2021-01-05 12:42:30 +01:00 |
|
lain
|
bea69853a2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
|
2021-01-05 12:19:39 +01:00 |
|
lain
|
95a0ae8a35
|
AccountControllerTest: Fix test logic
|
2021-01-05 11:48:40 +01:00 |
|
lain
|
d44850d7a5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
|
2021-01-05 10:48:32 +01:00 |
|
lain
|
8e5904daa5
|
SideEffects.DeleteTest: asyncify.
Replace Mock with Mox, mock out Logger.
|
2021-01-04 18:40:59 +01:00 |
|
|
|
0e93775ed0
|
Add test to validate profile pagination works with keyset
|
2021-01-04 11:04:58 -06:00 |
|
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
2021-01-04 13:38:31 +01:00 |
|
Alex Gleason
|
0ec7e9b8e9
|
AdminAPI: return id for moderation log entries
|
2021-01-01 11:59:48 -06:00 |
|
|
|
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
|
2020-12-31 19:24:49 +00:00 |
|
|
|
e4791258d4
|
Ensure newest report is returned first in the list
|
2020-12-31 12:40:42 -06:00 |
|
Alex Gleason
|
11d40e92b7
|
Render AKAs in Actor endpoints
|
2020-12-30 18:53:27 -06:00 |
|
Alex Gleason
|
cbce880076
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
2020-12-30 17:10:02 -06:00 |
|
|
|
4c5f75f4e9
|
Support pagination in AdminAPI for user statuses
|
2020-12-30 15:18:54 -06:00 |
|
