akkoma
5 years agostickers
sadposter [Wed, 20 Nov 2019 09:46:08 +0000 (09:46 +0000)]
stickers

5 years agover
sadposter [Wed, 13 Nov 2019 00:14:54 +0000 (00:14 +0000)]
ver

5 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Wed, 13 Nov 2019 00:10:01 +0000 (00:10 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

5 years agofe
sadposter [Wed, 13 Nov 2019 00:09:56 +0000 (00:09 +0000)]
fe

5 years agoMerge branch 'fix/docs-static-fe-category' into 'develop'
rinpatch [Mon, 11 Nov 2019 20:25:48 +0000 (20:25 +0000)]
Merge branch 'fix/docs-static-fe-category' into 'develop'

docs: move static-fe docs under a proper category

See merge request pleroma/pleroma!1972

5 years agodocs: move static-fe docs under a proper category
rinpatch [Mon, 11 Nov 2019 20:24:15 +0000 (23:24 +0300)]
docs: move static-fe docs under a proper category

5 years agoMerge branch 'nodeinfo-federation-enabled' into 'develop'
feld [Mon, 11 Nov 2019 19:14:06 +0000 (19:14 +0000)]
Merge branch 'nodeinfo-federation-enabled' into 'develop'

report federating status in nodeinfo

See merge request pleroma/pleroma!1971

5 years agoMerge branch 'feature/static-fe' into 'develop'
kaniini [Mon, 11 Nov 2019 19:10:44 +0000 (19:10 +0000)]
Merge branch 'feature/static-fe' into 'develop'

Static frontend

See merge request pleroma/pleroma!1917

5 years agoreport federating status in nodeinfo
href [Mon, 11 Nov 2019 18:03:43 +0000 (19:03 +0100)]
report federating status in nodeinfo

5 years agoMerge branch 'fix-dokku-2' into 'develop'
lain [Mon, 11 Nov 2019 15:01:31 +0000 (15:01 +0000)]
Merge branch 'fix-dokku-2' into 'develop'

Dokku deploys: Keep the git dir so version number generation works.

See merge request pleroma/pleroma!1967

5 years agoMerge branch 'patch-1' into 'develop'
rinpatch [Mon, 11 Nov 2019 14:09:46 +0000 (14:09 +0000)]
Merge branch 'patch-1' into 'develop'

Default config: Use extended nickname format

See merge request pleroma/pleroma!1968

5 years agoMerge branch 'chore/changelog-1940' into 'develop'
rinpatch [Mon, 11 Nov 2019 14:07:23 +0000 (14:07 +0000)]
Merge branch 'chore/changelog-1940' into 'develop'

Add a changelog entry for !1940

See merge request pleroma/pleroma!1970

5 years agoAdd a changelog entry for !1940
rinpatch [Mon, 11 Nov 2019 14:05:30 +0000 (17:05 +0300)]
Add a changelog entry for !1940

5 years agoMerge branch 'update-ci' into 'develop'
lain [Mon, 11 Nov 2019 13:13:20 +0000 (13:13 +0000)]
Merge branch 'update-ci' into 'develop'

Use PG12 in CI for the RUM pipeline

Closes #1377

See merge request pleroma/pleroma!1969

5 years agoDefault config: Use extended nickname format
lain [Mon, 11 Nov 2019 12:49:18 +0000 (12:49 +0000)]
Default config: Use extended nickname format

5 years agoUse PG12 in CI for the RUM pipeline
Egor Kislitsyn [Mon, 11 Nov 2019 12:47:33 +0000 (19:47 +0700)]
Use PG12 in CI for the RUM pipeline

5 years agoDokku deploys: Keep the git dir so version number generation works.
lain [Mon, 11 Nov 2019 12:37:56 +0000 (13:37 +0100)]
Dokku deploys: Keep the git dir so version number generation works.

5 years agoMerge branch 'update-docs' into 'develop'
lain [Mon, 11 Nov 2019 12:34:17 +0000 (12:34 +0000)]
Merge branch 'update-docs' into 'develop'

Add a warning about Pg version to the RUM related docs

See merge request pleroma/pleroma!1966

5 years agoMerge branch 'iss-1376' into 'develop'
lain [Mon, 11 Nov 2019 12:27:33 +0000 (12:27 +0000)]
Merge branch 'iss-1376' into 'develop'

Check client and token in GET /oauth/authorize

See merge request pleroma/pleroma!1940

5 years agoMerge branch 'fix/1399' into 'develop'
lain [Mon, 11 Nov 2019 12:13:45 +0000 (12:13 +0000)]
Merge branch 'fix/1399' into 'develop'

fix for migrate config to db task

Closes #1399

See merge request pleroma/pleroma!1964

5 years agoAdd a warning about Pg version to the RUM related docs
Egor Kislitsyn [Mon, 11 Nov 2019 12:13:07 +0000 (19:13 +0700)]
Add a warning about Pg version to the RUM related docs

5 years agoMerge branch 'new-rate-limiter' into 'develop'
lain [Mon, 11 Nov 2019 12:13:06 +0000 (12:13 +0000)]
Merge branch 'new-rate-limiter' into 'develop'

New rate limiter

See merge request pleroma/pleroma!1946

5 years agoNew rate limiter
Steven Fuchs [Mon, 11 Nov 2019 12:13:06 +0000 (12:13 +0000)]
New rate limiter

5 years agofix for migrate task
Alexander [Sun, 10 Nov 2019 19:54:37 +0000 (22:54 +0300)]
fix for migrate task

5 years agoMerge branch 'disable-attachment-links' into 'develop'
lain [Sun, 10 Nov 2019 14:25:09 +0000 (14:25 +0000)]
Merge branch 'disable-attachment-links' into 'develop'

Disable attachment links by default

Closes #1394

See merge request pleroma/pleroma!1962

5 years agoDisable attachment links by default
rinpatch [Sun, 10 Nov 2019 12:02:47 +0000 (15:02 +0300)]
Disable attachment links by default

Closes #1394

5 years agoMerge branch 'issue/1339' into 'develop'
lain [Sun, 10 Nov 2019 11:20:20 +0000 (11:20 +0000)]
Merge branch 'issue/1339' into 'develop'

[#1339] add subject to atom feed

See merge request pleroma/pleroma!1961

5 years agoApply suggestion to config/config.exs
lain [Sun, 10 Nov 2019 11:02:34 +0000 (11:02 +0000)]
Apply suggestion to config/config.exs

5 years agoApply suggestion to config/config.exs
lain [Sun, 10 Nov 2019 10:44:23 +0000 (10:44 +0000)]
Apply suggestion to config/config.exs

5 years agoMerge branch 'refactor/readme' into 'develop'
lain [Sun, 10 Nov 2019 10:30:52 +0000 (10:30 +0000)]
Merge branch 'refactor/readme' into 'develop'

Partial readme rewrite

See merge request pleroma/pleroma!1958

5 years agoadd subject to atom feed
Maksim Pechnikov [Fri, 8 Nov 2019 06:23:24 +0000 (09:23 +0300)]
add subject to atom feed

5 years agoFormatter moved to new module.
Phil Hagelberg [Sun, 10 Nov 2019 02:26:19 +0000 (18:26 -0800)]
Formatter moved to new module.

5 years agoAdd changelog entry, cheatsheet docs, and alphabetize.
Phil Hagelberg [Sat, 9 Nov 2019 17:50:45 +0000 (09:50 -0800)]
Add changelog entry, cheatsheet docs, and alphabetize.

5 years agoAdd some further test cases.
Phil Hagelberg [Fri, 8 Nov 2019 16:55:32 +0000 (08:55 -0800)]
Add some further test cases.

Including like ... private visibility, cos that's super important.

5 years agoAdd tests for static_fe controller.
Phil Hagelberg [Fri, 8 Nov 2019 06:29:46 +0000 (22:29 -0800)]
Add tests for static_fe controller.

5 years agoPrevent non-local notices from rendering.
Phil Hagelberg [Fri, 8 Nov 2019 05:43:21 +0000 (21:43 -0800)]
Prevent non-local notices from rendering.

5 years agoMove static_fe config to its own section instead of in :instance.
Phil Hagelberg [Fri, 8 Nov 2019 03:31:28 +0000 (19:31 -0800)]
Move static_fe config to its own section instead of in :instance.

5 years agoRender errors in HTML, not with JS.
Phil Hagelberg [Wed, 6 Nov 2019 06:00:19 +0000 (22:00 -0800)]
Render errors in HTML, not with JS.

5 years agoExpand subject content automatically when config is set.
Phil Hagelberg [Wed, 6 Nov 2019 05:37:46 +0000 (21:37 -0800)]
Expand subject content automatically when config is set.

5 years agoInclude metadata in static FE conversations and profiles.
Phil Hagelberg [Wed, 6 Nov 2019 05:28:36 +0000 (21:28 -0800)]
Include metadata in static FE conversations and profiles.

5 years agoCatch 404s.
Phil Hagelberg [Tue, 5 Nov 2019 06:56:51 +0000 (22:56 -0800)]
Catch 404s.

5 years agoPagination for user profiles.
Phil Hagelberg [Tue, 5 Nov 2019 06:49:05 +0000 (22:49 -0800)]
Pagination for user profiles.

5 years agoMake many of the improvements suggested in review.
Phil Hagelberg [Tue, 5 Nov 2019 06:02:10 +0000 (22:02 -0800)]
Make many of the improvements suggested in review.

5 years agoStatic FE plug should only respond to text/html requests.
Phil Hagelberg [Sun, 3 Nov 2019 20:29:17 +0000 (12:29 -0800)]
Static FE plug should only respond to text/html requests.

5 years agoMove static FE routing into its own plug.
Phil Hagelberg [Sat, 2 Nov 2019 02:47:18 +0000 (19:47 -0700)]
Move static FE routing into its own plug.

Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place.

5 years agoMake sure notice link is remote if the post is remote.
Phil Hagelberg [Fri, 1 Nov 2019 01:26:34 +0000 (18:26 -0700)]
Make sure notice link is remote if the post is remote.

5 years agoVisually separate header.
Phil Hagelberg [Fri, 1 Nov 2019 00:44:43 +0000 (17:44 -0700)]
Visually separate header.

5 years agoFix a bug where reblogs were displayed under the wrong user.
Phil Hagelberg [Thu, 31 Oct 2019 03:21:10 +0000 (20:21 -0700)]
Fix a bug where reblogs were displayed under the wrong user.

5 years agoChange date formatting.
Phil Hagelberg [Thu, 31 Oct 2019 03:20:54 +0000 (20:20 -0700)]
Change date formatting.

5 years agoMove static-fe CSS to a separate file.
Phil Hagelberg [Thu, 31 Oct 2019 03:20:26 +0000 (20:20 -0700)]
Move static-fe CSS to a separate file.

5 years agoShow counts for replies, likes, and announces for selected notice.
Phil Hagelberg [Wed, 30 Oct 2019 05:05:18 +0000 (22:05 -0700)]
Show counts for replies, likes, and announces for selected notice.

Using text instead of an icon, for now.

5 years agoFormat dates using CommonAPI utils.
Phil Hagelberg [Wed, 30 Oct 2019 04:09:05 +0000 (21:09 -0700)]
Format dates using CommonAPI utils.

5 years agoAdd header to profile/notice pages linking to pleroma-fe.
Phil Hagelberg [Wed, 30 Oct 2019 03:55:43 +0000 (20:55 -0700)]
Add header to profile/notice pages linking to pleroma-fe.

5 years agoRemove activity/user representer; move logic to controller.
Phil Hagelberg [Wed, 30 Oct 2019 03:30:43 +0000 (20:30 -0700)]
Remove activity/user representer; move logic to controller.

5 years agoGet rid of @data in views and use separate fields.
Phil Hagelberg [Wed, 30 Oct 2019 02:27:42 +0000 (19:27 -0700)]
Get rid of @data in views and use separate fields.

5 years agoUse gettext for sensitive media warning.
Phil Hagelberg [Wed, 30 Oct 2019 00:53:58 +0000 (17:53 -0700)]
Use gettext for sensitive media warning.

5 years agoApply all suggested changes from reviewers.
Phil Hagelberg [Wed, 30 Oct 2019 00:45:26 +0000 (17:45 -0700)]
Apply all suggested changes from reviewers.

5 years agoNotices should show entire thread from context.
Phil Hagelberg [Tue, 29 Oct 2019 02:47:20 +0000 (19:47 -0700)]
Notices should show entire thread from context.

5 years agoShow images, video, and audio attachments to notices.
Phil Hagelberg [Tue, 29 Oct 2019 02:05:45 +0000 (19:05 -0700)]
Show images, video, and audio attachments to notices.

5 years agoFix activity_representer to work with User.get_or_fetch returning tuple.
Phil Hagelberg [Mon, 28 Oct 2019 02:02:19 +0000 (19:02 -0700)]
Fix activity_representer to work with User.get_or_fetch returning tuple.

5 years agoFix OStatus controller to know about StaticFEController.
Phil Hagelberg [Mon, 28 Oct 2019 02:01:18 +0000 (19:01 -0700)]
Fix OStatus controller to know about StaticFEController.

But only when it's configured to be on.

5 years agoDon't show 404 in static-fe controller unless it's actually not found.
Phil Hagelberg [Mon, 28 Oct 2019 00:53:20 +0000 (17:53 -0700)]
Don't show 404 in static-fe controller unless it's actually not found.

5 years agoAdd permalinks to the static-fe notice rendering.
Phil Hagelberg [Sun, 27 Oct 2019 23:37:57 +0000 (16:37 -0700)]
Add permalinks to the static-fe notice rendering.

5 years agoLooks like source_data is on user directly now.
Phil Hagelberg [Sun, 27 Oct 2019 22:20:43 +0000 (15:20 -0700)]
Looks like source_data is on user directly now.

5 years agostatic fe: add remote follow button
William Pitcock [Sun, 3 Mar 2019 13:36:59 +0000 (13:36 +0000)]
static fe: add remote follow button

5 years agostatic fe: add support for message subjects
William Pitcock [Sat, 2 Mar 2019 22:35:54 +0000 (22:35 +0000)]
static fe: add support for message subjects

5 years agostatic fe: reformat activity representer
William Pitcock [Sat, 2 Mar 2019 21:40:02 +0000 (21:40 +0000)]
static fe: reformat activity representer

5 years agostatic fe: add user profile rendering
William Pitcock [Sat, 2 Mar 2019 21:12:38 +0000 (21:12 +0000)]
static fe: add user profile rendering

5 years agostatic fe: use a generic activity representer to render activities
William Pitcock [Sat, 2 Mar 2019 20:10:30 +0000 (20:10 +0000)]
static fe: use a generic activity representer to render activities

5 years agostatic fe: formatting
William Pitcock [Sat, 2 Mar 2019 14:23:26 +0000 (14:23 +0000)]
static fe: formatting

5 years agostatic fe: proof of concept
William Pitcock [Sat, 2 Mar 2019 14:17:55 +0000 (14:17 +0000)]
static fe: proof of concept

5 years agoMerge branch 'refactor/cheatsheet' into 'develop'
kaniini [Sun, 10 Nov 2019 00:56:01 +0000 (00:56 +0000)]
Merge branch 'refactor/cheatsheet' into 'develop'

Big config cheatsheet revamp

See merge request pleroma/pleroma!1959

5 years agoBig config cheatsheet revamp
rinpatch [Sun, 10 Nov 2019 00:33:36 +0000 (03:33 +0300)]
Big config cheatsheet revamp

Categorize things, remove old deprecation warnings, consistently place
dots in unordered lists, fix links, etc.

5 years agoreadme: replace banner logo with the one using paths for text
rinpatch [Sat, 9 Nov 2019 21:52:04 +0000 (00:52 +0300)]
readme: replace banner logo with the one using paths for text

5 years agoreadme: Add logo banner
rinpatch [Sat, 9 Nov 2019 21:06:44 +0000 (00:06 +0300)]
readme: Add logo banner

5 years agoreadme: remove unnecessary heading
rinpatch [Sat, 9 Nov 2019 20:32:21 +0000 (23:32 +0300)]
readme: remove unnecessary heading

5 years agoreadme: Remove unnecessary description and add a missing dot
rinpatch [Sat, 9 Nov 2019 20:30:03 +0000 (23:30 +0300)]
readme: Remove unnecessary description and add a missing dot

5 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Sat, 9 Nov 2019 19:11:33 +0000 (19:11 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

5 years agoAdd #pleroma-dev to matrix section as well
rinpatch [Sat, 9 Nov 2019 19:10:29 +0000 (22:10 +0300)]
Add #pleroma-dev to matrix section as well

5 years agofe
sadposter [Sat, 9 Nov 2019 19:10:22 +0000 (19:10 +0000)]
fe

5 years agoPartial readme rewrite
rinpatch [Sat, 9 Nov 2019 19:01:25 +0000 (22:01 +0300)]
Partial readme rewrite

Remove the outdated generic installation guide and point to
platform-specific ones instead, update contact info, protocols we
support, etc.

5 years agoMerge branch 'chore/update-fe' into 'develop'
rinpatch [Fri, 8 Nov 2019 23:08:03 +0000 (23:08 +0000)]
Merge branch 'chore/update-fe' into 'develop'

Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642

See merge request pleroma/pleroma!1956

5 years agoBump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
rinpatch [Fri, 8 Nov 2019 22:47:32 +0000 (01:47 +0300)]
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642

5 years agoMerge branch 'bugfix/containment-no-id' into 'develop'
rinpatch [Fri, 8 Nov 2019 21:12:23 +0000 (21:12 +0000)]
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

5 years agoobject containment: handle all cases where ID is invalid (missing, nil, non-string)
Ariadne Conill [Fri, 8 Nov 2019 20:51:28 +0000 (14:51 -0600)]
object containment: handle all cases where ID is invalid (missing, nil, non-string)

5 years agoMerge branch 'chore/bump-fast-sanitize-again-again' into 'develop'
rinpatch [Fri, 8 Nov 2019 20:02:25 +0000 (20:02 +0000)]
Merge branch 'chore/bump-fast-sanitize-again-again' into 'develop'

Bump fast_sanitize

See merge request pleroma/pleroma!1953

5 years agoBump fast_sanitize
rinpatch [Fri, 8 Nov 2019 19:22:39 +0000 (22:22 +0300)]
Bump fast_sanitize

Fixes build fails on freebsd

5 years agoMerge branch 'chore/add-multifetch' into 'develop'
kaniini [Fri, 8 Nov 2019 19:08:39 +0000 (19:08 +0000)]
Merge branch 'chore/add-multifetch' into 'develop'

nodeinfo: add multifetch feature (ref pleroma-fe!977).

See merge request pleroma/pleroma!1952

5 years agonodeinfo: add multifetch feature (ref pleroma-fe!977).
Ariadne Conill [Fri, 8 Nov 2019 18:48:28 +0000 (12:48 -0600)]
nodeinfo: add multifetch feature (ref pleroma-fe!977).

5 years agoMerge branch 'chore/bump-fast-sanitize-again' into 'develop'
rinpatch [Fri, 8 Nov 2019 17:01:07 +0000 (17:01 +0000)]
Merge branch 'chore/bump-fast-sanitize-again' into 'develop'

Bump fast_sanitize to 0.1.2

See merge request pleroma/pleroma!1951

5 years agoBump fast_sanitize to 0.1.2
rinpatch [Fri, 8 Nov 2019 16:40:13 +0000 (19:40 +0300)]
Bump fast_sanitize to 0.1.2

Fixes build issues on macOS

5 years agoMerge branch 'chore/bump-fast-sanitize' into 'develop'
rinpatch [Thu, 7 Nov 2019 23:32:25 +0000 (23:32 +0000)]
Merge branch 'chore/bump-fast-sanitize' into 'develop'

Bump fast_sanitize to 0.1.1

Closes #1378

See merge request pleroma/pleroma!1949

5 years agoBump fast_sanitize to 0.1.1
rinpatch [Thu, 7 Nov 2019 21:14:53 +0000 (00:14 +0300)]
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.

5 years agoMerge branch 'recipients-filter' into 'develop'
kaniini [Thu, 7 Nov 2019 15:13:20 +0000 (15:13 +0000)]
Merge branch 'recipients-filter' into 'develop'

Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`

See merge request pleroma/pleroma!1948

5 years agoMastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
eugenijm [Thu, 7 Nov 2019 00:00:21 +0000 (03:00 +0300)]
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`

5 years agoMerge branch 'fix/unwrapped-object-return' into 'develop'
rinpatch [Wed, 6 Nov 2019 23:01:04 +0000 (23:01 +0000)]
Merge branch 'fix/unwrapped-object-return' into 'develop'

Fetcher: fix local check returning unwrapped object

See merge request pleroma/pleroma!1947

5 years agoFetcher: fix local check returning unwrapped object
rinpatch [Wed, 6 Nov 2019 22:40:55 +0000 (01:40 +0300)]
Fetcher: fix local check returning unwrapped object

This resulted in error messages about failed refetches being logged.

5 years agoMerge branch 'fix/trailing-format-plug-oauth' into 'develop'
rinpatch [Wed, 6 Nov 2019 14:47:34 +0000 (14:47 +0000)]
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

5 years agoMerge branch 'changelog-cleanup' into 'develop'
rinpatch [Wed, 6 Nov 2019 14:39:46 +0000 (14:39 +0000)]
Merge branch 'changelog-cleanup' into 'develop'

Removed duplicate Changed entry in Unreleased section of CHANGELOG.md

See merge request pleroma/pleroma!1945

5 years agoMerge branch 'fix/saner-static-cache-control' into 'develop'
rinpatch [Wed, 6 Nov 2019 14:31:32 +0000 (14:31 +0000)]
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