Ivan Tashkinov
|
5992382cf8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
|
2021-02-11 19:31:57 +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 |
|
|
|
593c0851d9
|
Merge branch 'develop' into 'new-user-emails'
|
2021-02-08 16:01:50 -06:00 |
|
Haelwenn
|
a5bee1bf35
|
Merge branch 'feat/mrf-noemptypolicy' into 'develop'
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
See merge request pleroma/pleroma!3309
|
2021-02-08 21:49:20 +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 |
|
|
|
6a3e75c8e6
|
Lint
|
2021-02-05 09:00:17 -06:00 |
|
|
|
c361440396
|
Add basic test to validate the registration email is dispatched when the others are disabled
Also only check for subject as the body is a mess of html and we don't really need to prove its contents if the subject matches.
|
2021-02-04 17:56:46 -06:00 |
|
|
|
d047372291
|
Merge branch 'develop' into fix/reports-from-admins
|
2021-02-04 12:37:20 -06: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 |
|
|
|
5bb5949048
|
Validate admin making report doesn't get their own report notification, but other admins do
|
2021-02-03 12:54:53 -06: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 |
|
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
|
aacd1c90b7
|
fix for test warnings
|
2021-02-01 19:33:40 +03: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 |
|
Egor Kislitsyn
|
a51d903e0c
|
Make sure active_user_count/1 counts only local users
|
2021-01-28 22:23:10 +04: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 |
|
