Commit graph

7449 commits

Author SHA1 Message Date
lain 86d821a96e Dokku deploys: Keep the git dir so version number generation works. 2019-11-11 13:37:56 +01:00
lain 417f9a782f Merge branch 'fix/1399' into 'develop'
fix for migrate config to db task

Closes #1399

See merge request pleroma/pleroma!1964
2019-11-11 12:13:45 +00:00
lain e73cc742b9 Merge branch 'new-rate-limiter' into 'develop'
New rate limiter

See merge request pleroma/pleroma!1946
2019-11-11 12:13:06 +00:00
Steven Fuchs 94627baa5c New rate limiter 2019-11-11 12:13:06 +00:00
Alexander 6a4201e0b4
fix for migrate task 2019-11-10 22:54:37 +03:00
lain 7438c177d9 Merge branch 'disable-attachment-links' into 'develop'
Disable attachment links by default

Closes #1394

See merge request pleroma/pleroma!1962
2019-11-10 14:25:09 +00:00
rinpatch 4499a7a075 Disable attachment links by default
Closes #1394
2019-11-10 15:02:47 +03:00
lain 3a1aaadc18 Merge branch 'issue/1339' into 'develop'
[#1339] add subject to atom feed

See merge request pleroma/pleroma!1961
2019-11-10 11:20:20 +00:00
lain e08bd99bab Apply suggestion to config/config.exs 2019-11-10 11:02:34 +00:00
lain 4885d403fe Apply suggestion to config/config.exs 2019-11-10 10:44:23 +00:00
lain 8b8d705ce6 Merge branch 'refactor/readme' into 'develop'
Partial readme rewrite

See merge request pleroma/pleroma!1958
2019-11-10 10:30:52 +00:00
Maksim Pechnikov 9d0b989521 add subject to atom feed 2019-11-10 11:10:20 +03:00
kaniini 9de593689c Merge branch 'refactor/cheatsheet' into 'develop'
Big config cheatsheet revamp

See merge request pleroma/pleroma!1959
2019-11-10 00:56:01 +00:00
rinpatch 518b0193a1 Big config cheatsheet revamp
Categorize things, remove old deprecation warnings, consistently place
dots in unordered lists, fix links, etc.
2019-11-10 03:33:36 +03:00
rinpatch 56e3d4ecca readme: replace banner logo with the one using paths for text 2019-11-10 00:52:04 +03:00
rinpatch 6d62d9d46f readme: Add logo banner 2019-11-10 00:06:44 +03:00
rinpatch c5368a395d readme: remove unnecessary heading 2019-11-09 23:32:21 +03:00
rinpatch eca66aefba readme: Remove unnecessary description and add a missing dot 2019-11-09 23:30:46 +03:00
rinpatch d1477e9ca3 Add #pleroma-dev to matrix section as well 2019-11-09 22:10:29 +03:00
rinpatch 96da25c92f Partial readme rewrite
Remove the outdated generic installation guide and point to
platform-specific ones instead, update contact info, protocols we
support, etc.
2019-11-09 22:01:25 +03:00
rinpatch 8a03ce50ea Merge branch 'chore/update-fe' into 'develop'
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642

See merge request pleroma/pleroma!1956
2019-11-08 23:08:03 +00:00
rinpatch 3cc2437598 Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642 2019-11-09 01:49:36 +03:00
rinpatch d8e99189d0 Merge branch 'bugfix/containment-no-id' into 'develop'
object containment: handle all cases where ID is invalid (missing, nil, non-string)

Closes #1387

See merge request pleroma/pleroma!1955
2019-11-08 21:12:23 +00:00
Ariadne Conill 5b60d82592 object containment: handle all cases where ID is invalid (missing, nil, non-string) 2019-11-08 14:51:28 -06: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 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
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
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
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
Maxim Filippov 2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset 2019-11-05 11:36:47 +10:00