a918167256
Merge branch 'fix/saner-static-cache-control' into 'develop'
...
Set better Cache-Control header for static content
Closes #1382
See merge request pleroma/pleroma!1943
2019-11-06 14:31:32 +00:00
365657320c
Fix TrailingFormatPlug not being active for /api/oauth_tokens
2019-11-06 17:22:23 +03:00
66c502879b
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.
2019-11-06 17:19:32 +03:00
84175fe30e
Set better Cache-Control header for static content
...
Closes #1382
2019-11-06 16:41:19 +03:00
8b19464176
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'
...
Force password reset for multiple users
Closes admin-fe#46
See merge request pleroma/pleroma!1928
2019-11-06 12:24:41 +00:00
f171095960
Grouped reports with status data baked in
2019-11-06 21:25:46 +10:00
be6e5e017e
Merge branch 'fix/object-reinject-set-cache' into 'develop'
...
Object Fetcher: set cache after reinjecting
See merge request pleroma/pleroma!1942
2019-11-06 11:20:34 +00:00
54746c6c26
Object Fetcher: set cache after reinjecting
...
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
2019-11-06 14:00:03 +03:00
efc4d6d9ec
Merge branch 'ci/remove-docs-build' into 'develop'
...
CI: Remove the docs-build job
See merge request pleroma/pleroma!1941
2019-11-06 01:13:20 +00:00
d5dc0c4a7e
CI: Remove the docs-build job
...
The artifacts it produces were no longer used since we switched to
mkdocs.
2019-11-05 23:45:07 +03:00
e1fc6cb78f
Check client and token in GET /oauth/authorize
2019-11-05 23:52:47 +09:00
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-11-05 15:21:00 +01:00
faced6236b
NoteValidator: Add very basic validator for Note objects.
2019-11-05 15:02:31 +01:00
3d1b445cbf
Object Validators: Extract common validations.
2019-11-05 15:02:09 +01:00
21716aa594
Merge branch 'release/1.1.4' into 'stable'
...
Release/1.1.4 - user.info fix plus NOT NULL for user.info
See merge request pleroma/pleroma!1927
2019-11-05 12:02:45 +00:00
f11eebc183
Merge branch 'chore/bump-htmlentities' into 'develop'
...
Bump HtmlEntities to 0.5
See merge request pleroma/pleroma!1939
2019-11-05 10:01:29 +00:00
9d3b12a658
Bump HtmlEntities to 0.5
...
This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17
2019-11-05 12:37:25 +03:00
e52955c961
update following_relationship.ex
2019-11-05 10:50:03 +03:00
62bc0657e7
excluded invisible users from search results
2019-11-05 08:55:41 +03:00
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
2019-11-05 11:36:47 +10:00
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-05 02:12:48 +03:00
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
2019-11-04 20:44:24 +03:00
b7de4ad082
Apply suggestion to CHANGELOG.md
2019-11-04 17:31:08 +00:00
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
4388255eed
Migrations: Don't copy over mutes unless there actually are some.
2019-11-04 18:13:37 +01:00
fee1276963
Merge branch 'failing-search-fixes' into 'develop'
...
User Search: Remove superfluous setweight and random test.
See merge request pleroma/pleroma!1935
2019-11-04 16:28:55 +00:00
478eb5944d
Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'
...
Add `pleroma.direct_conversation_id` to the `conversation` event payload
See merge request pleroma/pleroma!1925
2019-11-04 15:59:36 +00:00
4e53520917
User Search: Remove superfluous setweight and random test.
...
The test tested for a behavior that isn't actually enforced anymore.
2019-11-04 16:57:41 +01:00
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
2019-11-04 18:36:16 +03:00
6a151e7c7f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
2019-11-04 16:25:05 +01:00
a304a2a845
Merge branch 'transmogrifier-test-errors' into 'develop'
...
capture test log where errors are expected
See merge request pleroma/pleroma!1915
2019-11-04 15:19:29 +00:00
f7f69356bd
Merge branch 'missing-tesla-mocks' into 'develop'
...
add missing tesla mocks
See merge request pleroma/pleroma!1879
2019-11-04 15:18:32 +00:00
5271bbcf11
add missing tesla mocks
2019-11-04 15:18:32 +00:00
bec6d02f30
Merge branch 'chore/update-fast-sanitize' into 'develop'
...
mix: update fast_sanitize dependency to 1af67547
Closes #1372
See merge request pleroma/pleroma!1934
2019-11-04 14:52:56 +00:00
203d9812f0
mix: update fast_sanitize dependency to 1af67547
2019-11-04 08:38:40 -06:00
5f844fd3f2
Migrations: Add a fixup migration for the muted_notifications
...
This sets info->muted_notifications to an emtpy array if it is explicitly set
to null before. This can happen when safe_jsonb_set coalesces to a jsonb null,
which will make ecto not use the default value of [] anymore because it has been
explicitly overwritten.
2019-11-04 15:38:28 +01:00
06cc77e6fb
Merge branch 'faster-user-deactivation' into 'develop'
...
User: Don't pull remote users follower count immediately after deactivating.
Closes #1369
See merge request pleroma/pleroma!1933
2019-11-04 14:24:21 +00:00
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
2019-11-04 14:11:44 +00:00
0c31258616
User: Don't pull remote users follower count immediately after deactivating.
...
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.
Closes #1369
2019-11-04 14:36:54 +01:00
bab786cd93
Merge branch 'chore/update-fast-sanitize' into 'develop'
...
update fast sanitize dependency
See merge request pleroma/pleroma!1932
2019-11-03 22:00:50 +00:00
f42f300870
update fast sanitize dependency
2019-11-03 15:41:30 -06:00
57995fa8cf
fix migrate
...
update migrate
2019-11-03 20:44:59 +03:00
8dd7c099a7
Merge branch 'bugfix/streamer-follows' into 'develop'
...
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
2019-11-03 17:09:57 +00:00
74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
2019-11-03 16:19:27 +00:00
61bcd4595f
Merge branch 'feature/fast_sanitize' into 'develop'
...
Switching to FastSanitize
See merge request pleroma/pleroma!1916
2019-11-03 16:18:19 +00:00
4bf942583f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
2019-11-03 09:05:12 -06:00
9d8da9ea15
Merge branch 'fix/migration-schema' into 'develop'
...
Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923
2019-11-02 15:07:47 +00:00
55ef88ef95
Bump fast_sanitize version
2019-11-01 20:58:24 +03:00
366ada7b29
Merge branch 'fix/moderation-log-crash' into 'develop'
...
Fix moderation log crash
Closes #1345
See merge request pleroma/pleroma!1929
2019-11-01 17:56:20 +00:00
ab5c8ec9fa
Update docs
2019-11-01 20:27:16 +03:00
rinpatch