nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
8680 commits 2 branches 0 tags 272 MiB
Commit graph

8680 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rinpatch 89ca9560e0 Bump HtmlEntities to 0.5 
This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17
 2019-11-08 23:38:32 +03:00
rinpatch 5cbb1cd550 Merge branch 'chore/bump-fast-sanitize-again-again' into 'develop' 
Bump fast_sanitize

See merge request pleroma/pleroma!1953
 2019-11-08 20:02:25 +00:00
rinpatch 33d0250edc Object Fetcher: set cache after reinjecting 
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
 2019-11-08 22:47:08 +03:00
rinpatch c389fb4dcc Fix TrailingFormatPlug not being active for /api/oauth_tokens 2019-11-08 22:46:51 +03:00
rinpatch 1b58b5c8db Bump fast_sanitize 
Fixes build fails on freebsd
 2019-11-08 22:22:54 +03:00
kaniini 0929d06e69 Merge branch 'chore/add-multifetch' into 'develop' 
nodeinfo: add multifetch feature (ref pleroma-fe!977).

See merge request pleroma/pleroma!1952
 2019-11-08 19:08:39 +00:00
Ariadne Conill 532fd38b12 nodeinfo: add multifetch feature (ref pleroma-fe!977). 2019-11-08 12:48:28 -06:00
rinpatch aa3551ebd2 Merge branch 'chore/bump-fast-sanitize-again' into 'develop' 
Bump fast_sanitize to 0.1.2

See merge request pleroma/pleroma!1951
 2019-11-08 17:01:07 +00:00
rinpatch 44f942e17d Bump fast_sanitize to 0.1.2 
Fixes build issues on macOS
 2019-11-08 19:40:13 +03:00
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions 2019-11-08 13:27:11 +01:00
Maxim Filippov b14bf9044f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-08 18:30:49 +09:00
Maxim Filippov 7258db023e Support old flag format 2019-11-08 18:21:29 +09:00
rinpatch 278674223d Merge branch 'chore/bump-fast-sanitize' into 'develop' 
Bump fast_sanitize to 0.1.1

Closes #1378

See merge request pleroma/pleroma!1949
 2019-11-07 23:32:25 +00:00
rinpatch 2f4e9a068f Bump fast_sanitize to 0.1.1 
The parser C-Node has been completely rewritten to not use the deprecated
`erl_interface` api.

Closes #1378 since Nodex was ripped out and the replacement randomizes
master node name.
 2019-11-08 00:51:04 +03:00
kaniini 5bf59f8e66 Merge branch 'recipients-filter' into 'develop' 
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`

See merge request pleroma/pleroma!1948
 2019-11-07 15:13:20 +00:00
eugenijm 7888803ffe Mastodon API: Add the recipients parameter to GET /api/v1/conversations 2019-11-07 08:26:24 +03:00
rinpatch 9f9c3c4fbe Merge branch 'fix/unwrapped-object-return' into 'develop' 
Fetcher: fix local check returning unwrapped object

See merge request pleroma/pleroma!1947
 2019-11-06 23:01:04 +00:00
rinpatch 32afa07995 Fetcher: fix local check returning unwrapped object 
This resulted in error messages about failed refetches being logged.
 2019-11-07 01:40:55 +03:00
rinpatch 802d249827 Merge branch 'fix/trailing-format-plug-oauth' into 'develop' 
Fix TrailingFormatPlug not being active for /api/oauth_tokens

Closes #1385

See merge request pleroma/pleroma!1944
 2019-11-06 14:47:34 +00:00
rinpatch e4632b0633 Merge branch 'changelog-cleanup' into 'develop' 
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md

See merge request pleroma/pleroma!1945
 2019-11-06 14:39:46 +00:00
rinpatch 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
rinpatch 365657320c Fix TrailingFormatPlug not being active for /api/oauth_tokens 2019-11-06 17:22:23 +03:00
Ivan Tashkinov 66c502879b Removed duplicate Changed entry in Unreleased section of CHANGELOG.md. 2019-11-06 17:19:32 +03:00
rinpatch 84175fe30e Set better Cache-Control header for static content 
Closes #1382
 2019-11-06 16:41:19 +03:00
feld 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
Maxim Filippov f171095960 Grouped reports with status data baked in 2019-11-06 21:25:46 +10:00
rinpatch 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
rinpatch 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
Haelwenn 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
rinpatch 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
AkiraFukushima e1fc6cb78f Check client and token in GET /oauth/authorize 2019-11-05 23:52:47 +09:00
lain 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
rinpatch 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
rinpatch 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
Maksim Pechnikov e52955c961 update following_relationship.ex 2019-11-05 10:50:03 +03:00
Maksim Pechnikov 62bc0657e7 excluded invisible users from search results 2019-11-05 08:55:41 +03:00
Maxim Filippov 2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset 2019-11-05 11:36:47 +10:00
Maxim Filippov 43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-05 02:12:48 +03:00
Maksim Pechnikov 4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id 2019-11-04 20:44:24 +03:00
lain b7de4ad082 Apply suggestion to CHANGELOG.md 2019-11-04 17:31:08 +00:00
lain 4388255eed Migrations: Don't copy over mutes unless there actually are some. 2019-11-04 18:13:37 +01:00
rinpatch 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
lain 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
lain 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
eugenijm ed29be24cb Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload. 2019-11-04 18:36:16 +03:00
Ariadne Conill 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
lain 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
lain 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
Steven Fuchs 5271bbcf11 add missing tesla mocks 2019-11-04 15:18:32 +00:00
kaniini 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