Phil Hagelberg
1d8950798c
Fix activity_representer to work with User.get_or_fetch returning tuple.
2019-11-09 18:06:51 -08:00
Phil Hagelberg
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
Phil Hagelberg
e79d8985ab
Don't show 404 in static-fe controller unless it's actually not found.
2019-11-09 18:06:51 -08:00
Phil Hagelberg
c1fc139986
Add permalinks to the static-fe notice rendering.
2019-11-09 18:06:51 -08:00
Phil Hagelberg
d1320160f4
Looks like source_data is on user directly now.
2019-11-09 18:06:51 -08:00
William Pitcock
ca5ef201ef
static fe: add remote follow button
2019-11-09 18:06:51 -08:00
William Pitcock
b33fbd58e3
static fe: add support for message subjects
2019-11-09 18:06:51 -08:00
William Pitcock
e2904b5777
static fe: reformat activity representer
2019-11-09 18:06:51 -08:00
William Pitcock
2b5bd5236d
static fe: add user profile rendering
2019-11-09 18:06:51 -08:00
William Pitcock
8f08da750a
static fe: use a generic activity representer to render activities
2019-11-09 18:06:51 -08:00
William Pitcock
ff8d0902f3
static fe: formatting
2019-11-09 18:06:51 -08:00
William Pitcock
a4d3a8ec03
static fe: proof of concept
2019-11-09 18:06:51 -08: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
36f4382b33
Bump mix.exs version
2019-11-09 17:30:43 +03:00
rinpatch
182aee9fe8
Merge branch 'release/1.1.5' into 'stable'
...
Release/1.1.5
See merge request pleroma/pleroma!1954
2019-11-09 13:32:11 +00:00
rinpatch
287d92c920
Add a changelog entry about frontend bundle update
2019-11-09 02:09:47 +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
6871084f34
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
2019-11-09 01:47:32 +03:00
Ariadne Conill
6e65da782e
object containment: handle all cases where ID is invalid (missing, nil, non-string)
2019-11-09 01:41:34 +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
4c5055bac9
Add changelog for 1.1.5
2019-11-08 23:43:11 +03:00
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