e944a2213d
Use gettext for sensitive media warning.
2019-11-09 18:07:50 -08:00
2d1897e8a7
Apply all suggested changes from reviewers.
2019-11-09 18:07:50 -08:00
cc1b07132f
Notices should show entire thread from context.
2019-11-09 18:07:08 -08:00
748d800acb
Show images, video, and audio attachments to notices.
2019-11-09 18:07:08 -08:00
1d8950798c
Fix activity_representer to work with User.get_or_fetch returning tuple.
2019-11-09 18:06:51 -08:00
0cf04e1088
Fix OStatus controller to know about StaticFEController.
...
But only when it's configured to be on.
2019-11-09 18:06:51 -08:00
e79d8985ab
Don't show 404 in static-fe controller unless it's actually not found.
2019-11-09 18:06:51 -08:00
c1fc139986
Add permalinks to the static-fe notice rendering.
2019-11-09 18:06:51 -08:00
d1320160f4
Looks like source_data is on user directly now.
2019-11-09 18:06:51 -08:00
ca5ef201ef
static fe: add remote follow button
2019-11-09 18:06:51 -08:00
b33fbd58e3
static fe: add support for message subjects
2019-11-09 18:06:51 -08:00
e2904b5777
static fe: reformat activity representer
2019-11-09 18:06:51 -08:00
2b5bd5236d
static fe: add user profile rendering
2019-11-09 18:06:51 -08:00
8f08da750a
static fe: use a generic activity representer to render activities
2019-11-09 18:06:51 -08:00
ff8d0902f3
static fe: formatting
2019-11-09 18:06:51 -08:00
a4d3a8ec03
static fe: proof of concept
2019-11-09 18:06:51 -08:00
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
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
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
3cc2437598
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
2019-11-09 01:49:36 +03:00
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
5b60d82592
object containment: handle all cases where ID is invalid (missing, nil, non-string)
2019-11-08 14:51:28 -06:00
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
1b58b5c8db
Bump fast_sanitize
...
Fixes build fails on freebsd
2019-11-08 22:22:54 +03:00
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
532fd38b12
nodeinfo: add multifetch feature (ref pleroma-fe!977).
2019-11-08 12:48:28 -06:00
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
44f942e17d
Bump fast_sanitize to 0.1.2
...
Fixes build issues on macOS
2019-11-08 19:40:13 +03:00
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
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
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
7888803ffe
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
2019-11-07 08:26:24 +03:00
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
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
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
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
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
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
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
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
2019-11-05 11:36:47 +10: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
Phil Hagelberg