akkoma
6 years agoMerge branch 'bugfix/formatter-single-char-nicks' into 'develop'
kaniini [Fri, 24 Aug 2018 18:42:14 +0000 (18:42 +0000)]
Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'

formatter: fix single char local nicknames

Closes #163

See merge request pleroma/pleroma!290

6 years agotests: formatting
William Pitcock [Fri, 24 Aug 2018 18:33:36 +0000 (18:33 +0000)]
tests: formatting

6 years agoMerge branch 'config/fe-collapse-subject' into 'develop'
kaniini [Fri, 24 Aug 2018 18:27:43 +0000 (18:27 +0000)]
Merge branch 'config/fe-collapse-subject' into 'develop'

fe config: add collapse_message_with_subject fe option

See merge request pleroma/pleroma!289

6 years agoformatter: adjust regexp captures to match local users with single character nickname...
William Pitcock [Fri, 24 Aug 2018 18:18:48 +0000 (18:18 +0000)]
formatter: adjust regexp captures to match local users with single character nicknames (closes #163)

6 years agotest: add testcase for formatter issue #163
William Pitcock [Fri, 24 Aug 2018 18:14:19 +0000 (18:14 +0000)]
test: add testcase for formatter issue #163

6 years agofe config: add collapse_message_with_subject fe option
William Pitcock [Fri, 24 Aug 2018 18:03:41 +0000 (18:03 +0000)]
fe config: add collapse_message_with_subject fe option

6 years agoRevert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"
kaniini [Fri, 24 Aug 2018 18:01:30 +0000 (18:01 +0000)]
Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"

This reverts merge request !288

6 years agoMerge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'
kaniini [Fri, 24 Aug 2018 17:40:55 +0000 (17:40 +0000)]
Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'

add collapseMessageWithSubject in config

See merge request pleroma/pleroma!288

6 years agoadd collapseMessageWithSubject in config
hakabahitoyo [Fri, 24 Aug 2018 10:10:23 +0000 (19:10 +0900)]
add collapseMessageWithSubject in config

6 years agoMerge branch 'fix/suggestions-api-error-handling' into 'develop'
kaniini [Thu, 23 Aug 2018 20:56:43 +0000 (20:56 +0000)]
Merge branch 'fix/suggestions-api-error-handling' into 'develop'

Better error handling in /api/v1/suggestions

See merge request pleroma/pleroma!287

6 years agoMerge branch 'develop' into 'develop'
Haelwenn [Thu, 23 Aug 2018 17:09:37 +0000 (17:09 +0000)]
Merge branch 'develop' into 'develop'

Add an OpenRC service

See merge request pleroma/pleroma!285

6 years agoAdd an OpenRC service
vaartis [Wed, 22 Aug 2018 20:27:15 +0000 (20:27 +0000)]
Add an OpenRC service

6 years agodebug
hakabahitoyo [Thu, 23 Aug 2018 02:52:18 +0000 (11:52 +0900)]
debug

6 years agoMerge branch 'security/activitypub-reject-bogus-ids' into 'develop'
kaniini [Thu, 23 Aug 2018 01:39:08 +0000 (01:39 +0000)]
Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'

security: activitypub: reject activities with bogus ids

See merge request pleroma/pleroma!286

6 years agoformatting
William Pitcock [Thu, 23 Aug 2018 01:34:36 +0000 (01:34 +0000)]
formatting

6 years agotests: add a testcase for verifying that objects without a valid ID are always rejected
William Pitcock [Thu, 23 Aug 2018 00:55:41 +0000 (00:55 +0000)]
tests: add a testcase for verifying that objects without a valid ID are always rejected

6 years agotransmogrifier: reject activities lacking a valid ID
William Pitcock [Thu, 23 Aug 2018 01:23:02 +0000 (01:23 +0000)]
transmogrifier: reject activities lacking a valid ID

6 years agoRun mix format
Haelwenn (lanodan) Monnier [Wed, 22 Aug 2018 10:09:01 +0000 (12:09 +0200)]
Run mix format

6 years ago[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
Haelwenn (lanodan) Monnier [Tue, 21 Aug 2018 23:47:25 +0000 (01:47 +0200)]
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil

6 years ago[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
Haelwenn (lanodan) Monnier [Tue, 21 Aug 2018 23:46:26 +0000 (01:46 +0200)]
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos

6 years agoMerge branch 'feature/peertube_2' into 'develop'
kaniini [Tue, 21 Aug 2018 16:58:44 +0000 (16:58 +0000)]
Merge branch 'feature/peertube_2' into 'develop'

rebase/update of feature/peertube

See merge request pleroma/pleroma!217

6 years agoMerge branch 'sanitize-bio' into 'develop'
kaniini [Tue, 21 Aug 2018 16:56:24 +0000 (16:56 +0000)]
Merge branch 'sanitize-bio' into 'develop'

mastodon api: sanitize the bio HTML

See merge request pleroma/pleroma!282

6 years agoMerge branch 'twitter-api-bios' into 'develop'
kaniini [Tue, 21 Aug 2018 16:55:26 +0000 (16:55 +0000)]
Merge branch 'twitter-api-bios' into 'develop'

Twitter API: Support Mastodon-style bios

See merge request pleroma/pleroma!283

6 years ago[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
Haelwenn (lanodan) Monnier [Thu, 9 Aug 2018 23:19:00 +0000 (01:19 +0200)]
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles

6 years ago[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
Haelwenn (lanodan) Monnier [Fri, 3 Aug 2018 22:58:55 +0000 (00:58 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes

6 years agoFix attachement rendering
Haelwenn (lanodan) Monnier [Wed, 13 Jun 2018 22:26:37 +0000 (00:26 +0200)]
Fix attachement rendering

6 years agoRender peertube videos in mastodon.
lain [Sun, 25 Mar 2018 15:07:40 +0000 (17:07 +0200)]
Render peertube videos in mastodon.

6 years agoUse activitypub to fetch posts.
lain [Sun, 25 Mar 2018 15:00:30 +0000 (17:00 +0200)]
Use activitypub to fetch posts.

This falls back to ostatus.

6 years agoBasic peertube support.
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 17:06:28 +0000 (19:06 +0200)]
Basic peertube support.

6 years agoPleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)
Haelwenn (lanodan) Monnier [Wed, 1 Aug 2018 01:24:39 +0000 (03:24 +0200)]
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)

6 years agoattempt to add html validation to mastodon api test case
ensra [Tue, 21 Aug 2018 14:41:32 +0000 (15:41 +0100)]
attempt to add html validation to mastodon api test case

6 years agothis should be looking at the follower's bio, not the user's bio.
ensra [Tue, 21 Aug 2018 14:25:21 +0000 (15:25 +0100)]
this should be looking at the follower's bio, not the user's bio.
fixes test.

6 years agosync bio sanitization code in tests
ensra [Tue, 21 Aug 2018 14:24:06 +0000 (15:24 +0100)]
sync bio sanitization code in tests

6 years agofix test for converting bio \r\n to <br>.
ensra [Tue, 21 Aug 2018 13:51:27 +0000 (14:51 +0100)]
fix test for converting bio \r\n to <br>.

6 years agoFormat
ensra [Tue, 21 Aug 2018 13:12:55 +0000 (14:12 +0100)]
Format

6 years agoTwitter API: Support Mastodon-style bios
ensra [Tue, 21 Aug 2018 13:03:36 +0000 (14:03 +0100)]
Twitter API: Support Mastodon-style bios
(multi-line, with links, and user mentions)

6 years agomastodon api: sanitize the bio HTML
ensra [Tue, 21 Aug 2018 09:53:53 +0000 (10:53 +0100)]
mastodon api: sanitize the bio HTML

6 years agoMerge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'
kaniini [Mon, 20 Aug 2018 18:44:52 +0000 (18:44 +0000)]
Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'

formatter: consistent presentation of hashtags and mentions

See merge request pleroma/pleroma!280

6 years agoformatting
William Pitcock [Mon, 20 Aug 2018 18:40:05 +0000 (18:40 +0000)]
formatting

6 years agocommon api: format hashtags in the same way as we format mentions
William Pitcock [Wed, 21 Mar 2018 00:51:47 +0000 (00:51 +0000)]
common api: format hashtags in the same way as we format mentions

6 years agoMerge branch 'update/pleroma-fe-20180821' into 'develop'
kaniini [Mon, 20 Aug 2018 18:17:05 +0000 (18:17 +0000)]
Merge branch 'update/pleroma-fe-20180821' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!279

6 years agoupdate pleroma frontend
William Pitcock [Mon, 20 Aug 2018 18:10:29 +0000 (18:10 +0000)]
update pleroma frontend

6 years agoMerge branch 'fix/redirect-on-user-fetch' into 'develop'
eal [Mon, 20 Aug 2018 12:13:07 +0000 (12:13 +0000)]
Merge branch 'fix/redirect-on-user-fetch' into 'develop'

ActivityPub: follow redirects when fetching user

See merge request pleroma/pleroma!278

6 years agoActivityPub: follow redirects when fetching user
eal [Mon, 20 Aug 2018 11:51:13 +0000 (14:51 +0300)]
ActivityPub: follow redirects when fetching user

6 years agoMerge branch 'update/pleroma-fe-20180820' into 'develop'
kaniini [Mon, 20 Aug 2018 04:50:27 +0000 (04:50 +0000)]
Merge branch 'update/pleroma-fe-20180820' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!277

6 years agoupdate pleroma frontend
William Pitcock [Mon, 20 Aug 2018 04:45:34 +0000 (04:45 +0000)]
update pleroma frontend

6 years agoMerge branch 'update/pleroma-fe-20180818' into 'develop'
kaniini [Sat, 18 Aug 2018 18:24:33 +0000 (18:24 +0000)]
Merge branch 'update/pleroma-fe-20180818' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!276

6 years agoupdate pleroma frontend
William Pitcock [Sat, 18 Aug 2018 18:19:11 +0000 (18:19 +0000)]
update pleroma frontend

6 years agoMerge branch 'develop' into 'develop'
kaniini [Fri, 17 Aug 2018 16:03:52 +0000 (16:03 +0000)]
Merge branch 'develop' into 'develop'

Fix typo in app creation response

See merge request pleroma/pleroma!275

6 years agoFix typo in app creation response
shadowfacts [Fri, 17 Aug 2018 12:48:24 +0000 (12:48 +0000)]
Fix typo in app creation response

Mastodon sends redirect_uri (singular), so should Pleroma.

6 years agoMerge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'
kaniini [Thu, 16 Aug 2018 23:59:34 +0000 (23:59 +0000)]
Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'

mastodon api: add undocumented fields to json response, return app id as string…

See merge request pleroma/pleroma!274

6 years agomastodon api controller: client_name, not name
William Pitcock [Thu, 16 Aug 2018 23:49:35 +0000 (23:49 +0000)]
mastodon api controller: client_name, not name

6 years agomastodon api: add undocumented fields to json response, return app id as string like...
William Pitcock [Thu, 16 Aug 2018 23:36:35 +0000 (23:36 +0000)]
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does

6 years agoMerge branch 'bugfix/mix-lock' into 'develop'
kaniini [Thu, 16 Aug 2018 23:35:39 +0000 (23:35 +0000)]
Merge branch 'bugfix/mix-lock' into 'develop'

update mix.lock

See merge request pleroma/pleroma!273

6 years agoupdate mix.lock
William Pitcock [Thu, 16 Aug 2018 23:25:45 +0000 (23:25 +0000)]
update mix.lock

6 years agoMerge branch 'patch-2' into 'develop'
kaniini [Thu, 16 Aug 2018 15:45:12 +0000 (15:45 +0000)]
Merge branch 'patch-2' into 'develop'

Update mix.exs

See merge request pleroma/pleroma!241

6 years agoMerge branch 'dev-lanodan-url-regex' into 'develop'
kaniini [Thu, 16 Aug 2018 15:41:16 +0000 (15:41 +0000)]
Merge branch 'dev-lanodan-url-regex' into 'develop'

lib/pleroma/formatter.ex: Fix URL regex

Closes #127

See merge request pleroma/pleroma!69

6 years agoMerge branch 'mastofe/system-font' into 'develop'
kaniini [Thu, 16 Aug 2018 15:38:59 +0000 (15:38 +0000)]
Merge branch 'mastofe/system-font' into 'develop'

Mastodon frontend: Use system font

See merge request pleroma/pleroma!247

6 years agofix compile
kaniini [Thu, 16 Aug 2018 15:37:58 +0000 (15:37 +0000)]
fix compile

6 years agoMerge branch 'develop' into 'patch-2'
kaniini [Thu, 16 Aug 2018 15:23:04 +0000 (15:23 +0000)]
Merge branch 'develop' into 'patch-2'

# Conflicts:
#   mix.exs

6 years agoMerge branch 'bugfix/federation-kroeg' into 'develop'
kaniini [Thu, 16 Aug 2018 15:20:15 +0000 (15:20 +0000)]
Merge branch 'bugfix/federation-kroeg' into 'develop'

fix federation with kroeg

See merge request pleroma/pleroma!272

6 years agoMerge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
kaniini [Thu, 16 Aug 2018 15:19:46 +0000 (15:19 +0000)]
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'

Fix: Output repeats at ActivityPub outbox

Closes #191

See merge request pleroma/pleroma!175

6 years agoMerge branch 'fix/normalize-file-extension' into 'develop'
kaniini [Thu, 16 Aug 2018 15:17:17 +0000 (15:17 +0000)]
Merge branch 'fix/normalize-file-extension' into 'develop'

Normalize file extension for uploaded files

Closes #218

See merge request pleroma/pleroma!233

6 years agotestsuite: add puckipedia test fixture
William Pitcock [Thu, 16 Aug 2018 15:10:10 +0000 (15:10 +0000)]
testsuite: add puckipedia test fixture

6 years agoMerge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into...
lambda [Wed, 15 Aug 2018 07:47:33 +0000 (07:47 +0000)]
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'

Feature / Suggestions API with third party recommendation engine

See merge request pleroma/pleroma!254

6 years agotestsuite: formatting
William Pitcock [Tue, 14 Aug 2018 17:15:33 +0000 (17:15 +0000)]
testsuite: formatting

6 years agotest: add kroeg fixtures
William Pitcock [Tue, 14 Aug 2018 17:07:01 +0000 (17:07 +0000)]
test: add kroeg fixtures

6 years agoactivitypub: transmogrifier: add necessary translations for kroeg
William Pitcock [Tue, 14 Aug 2018 17:05:11 +0000 (17:05 +0000)]
activitypub: transmogrifier: add necessary translations for kroeg

6 years agoformatting
lain [Sun, 12 Aug 2018 17:42:21 +0000 (19:42 +0200)]
formatting

6 years agoFix for elixir 1.7.
lain [Sun, 12 Aug 2018 16:41:33 +0000 (18:41 +0200)]
Fix for elixir 1.7.

6 years agoupdate frontend
lain [Sun, 12 Aug 2018 16:16:19 +0000 (18:16 +0200)]
update frontend

6 years agoUpdate Mastofe.
lain [Sun, 12 Aug 2018 13:29:30 +0000 (15:29 +0200)]
Update Mastofe.

6 years agoMerge branch 'feature/invites' into 'develop'
lambda [Sun, 12 Aug 2018 12:04:15 +0000 (12:04 +0000)]
Merge branch 'feature/invites' into 'develop'

Invites

Closes #108

See merge request pleroma/pleroma!208

6 years agoUpdate generate_invite_token.ex
lambda [Sun, 12 Aug 2018 11:11:08 +0000 (11:11 +0000)]
Update generate_invite_token.ex

6 years agoMerge branch 'fix/remote-follow-errormessage' into 'develop'
lambda [Sun, 12 Aug 2018 10:55:53 +0000 (10:55 +0000)]
Merge branch 'fix/remote-follow-errormessage' into 'develop'

Remote follow: don't show confusing error if already following

See merge request pleroma/pleroma!267

6 years agoMerge branch 'bugfix/gopher-empty-lines' into 'develop'
lambda [Sun, 12 Aug 2018 10:55:21 +0000 (10:55 +0000)]
Merge branch 'bugfix/gopher-empty-lines' into 'develop'

lib/pleroma/gopher/server.ex: Fix errorneous empty lines

See merge request pleroma/pleroma!270

6 years agoMerge branch 'emoji-in-account-view' into 'develop'
lambda [Sun, 12 Aug 2018 10:41:30 +0000 (10:41 +0000)]
Merge branch 'emoji-in-account-view' into 'develop'

Render emoji in user profiles

See merge request pleroma/pleroma!265

6 years agolib/pleroma/gopher/server.ex: Fix errorneous empty lines
Haelwenn (lanodan) Monnier [Fri, 10 Aug 2018 16:01:42 +0000 (18:01 +0200)]
lib/pleroma/gopher/server.ex: Fix errorneous empty lines

6 years agoMerge branch 'bugfix/fix-gopher-server-i' into 'develop'
lambda [Fri, 10 Aug 2018 13:45:39 +0000 (13:45 +0000)]
Merge branch 'bugfix/fix-gopher-server-i' into 'develop'

fix gopher server informational messages

See merge request pleroma/pleroma!268

6 years agofix gopher server informational messages
trqx@goat.si [Thu, 9 Aug 2018 14:17:45 +0000 (16:17 +0200)]
fix gopher server informational messages

some gopher clients did not accept those lines due to a missing tab

6 years agoRemote follow: don't show confusing error if already following
eal [Thu, 9 Aug 2018 17:47:29 +0000 (20:47 +0300)]
Remote follow: don't show confusing error if already following

6 years agoHTML-sanitize usernames before emojifying.
eal [Thu, 9 Aug 2018 10:07:03 +0000 (13:07 +0300)]
HTML-sanitize usernames before emojifying.

6 years agoAdd tests for emoji in user profiles
eal [Wed, 8 Aug 2018 06:24:50 +0000 (09:24 +0300)]
Add tests for emoji in user profiles

Also use the correct field in TwitterAPI...

6 years agoTwitterAPI user view: add screen_name_html and description_html.
eal [Wed, 8 Aug 2018 05:38:25 +0000 (08:38 +0300)]
TwitterAPI user view: add screen_name_html and description_html.

6 years agoMastoAPI AccountView: render profile emoji.
eal [Tue, 7 Aug 2018 18:56:50 +0000 (21:56 +0300)]
MastoAPI AccountView: render profile emoji.

6 years agoMerge branch 'bugfix/duplicate-follow-requests' into 'develop'
lambda [Mon, 6 Aug 2018 18:07:27 +0000 (18:07 +0000)]
Merge branch 'bugfix/duplicate-follow-requests' into 'develop'

user: filter out duplicate follow requests

Closes #228

See merge request pleroma/pleroma!263

6 years agoMerge branch 'feature/camelcase-hashtags' into 'develop'
lambda [Mon, 6 Aug 2018 18:07:01 +0000 (18:07 +0000)]
Merge branch 'feature/camelcase-hashtags' into 'develop'

formatter: preserve case of hashtags

Closes #165

See merge request pleroma/pleroma!262

6 years agouser: filter out duplicate follow requests
William Pitcock [Sun, 5 Aug 2018 01:10:05 +0000 (01:10 +0000)]
user: filter out duplicate follow requests

6 years agoformatter: preserve case of hashtags
William Pitcock [Sun, 5 Aug 2018 00:35:29 +0000 (00:35 +0000)]
formatter: preserve case of hashtags

when generating hashtag links, we used the casefolded version that we use in
the link URLs, instead of the original version.

accordingly, adjust the formatter to use the original text for the links, while
keeping the casefolded version for the URLs.

6 years agoadd suggestions/web config
Hakaba Hitoyo [Thu, 2 Aug 2018 09:03:35 +0000 (18:03 +0900)]
add suggestions/web config

6 years agoMerge branch 'bugfix/digest-legacy-compat' into 'develop'
lambda [Wed, 1 Aug 2018 10:37:28 +0000 (10:37 +0000)]
Merge branch 'bugfix/digest-legacy-compat' into 'develop'

activitypub: actually send digest header when federating

See merge request pleroma/pleroma!261

6 years agoactivitypub: actually send digest header when federating
William Pitcock [Wed, 1 Aug 2018 10:22:03 +0000 (10:22 +0000)]
activitypub: actually send digest header when federating

this is needed for backwards compatibility with non-digest pleroma instances

6 years agoMerge branch 'security/digest-signature-validation' into 'develop'
lambda [Wed, 1 Aug 2018 08:11:28 +0000 (08:11 +0000)]
Merge branch 'security/digest-signature-validation' into 'develop'

digest signature validation

See merge request pleroma/pleroma!260

6 years agoAllow additionnal schemes in the config
Haelwenn (lanodan) Monnier [Mon, 30 Jul 2018 19:59:04 +0000 (21:59 +0200)]
Allow additionnal schemes in the config

6 years agoactivitypub: verify remote http signature digests by recomputing the digest and repla...
William Pitcock [Tue, 31 Jul 2018 23:17:47 +0000 (23:17 +0000)]
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header

6 years agoactivitypub: add digest header to outbound messages and sign it
William Pitcock [Tue, 31 Jul 2018 21:41:18 +0000 (21:41 +0000)]
activitypub: add digest header to outbound messages and sign it

6 years ago[Pleroma.FormatterTest] Add test for XMPP link
Haelwenn (lanodan) Monnier [Sat, 23 Jun 2018 11:32:03 +0000 (13:32 +0200)]
[Pleroma.FormatterTest] Add test for XMPP link

6 years ago[Pleroma.FormatterTest]: .add_links: Add a space before the dot
Haelwenn (lanodan) Monnier [Sat, 23 Jun 2018 11:28:14 +0000 (13:28 +0200)]
[Pleroma.FormatterTest]: .add_links: Add a space before the dot

A dot is legal in the url, even at the end, so I moved it for the test

6 years ago[Pleroma.Formatter]: Add support for non-HTTP schemes in URIs
Haelwenn (lanodan) Monnier [Mon, 18 Jun 2018 10:45:15 +0000 (12:45 +0200)]
[Pleroma.Formatter]: Add support for non-HTTP schemes in URIs

The call to the regex in add_links is there just to be sure it’s a legal URI, it can be removed if you want to get more performance.

The URI Schemes list is sorted, but with http(s) at the start (in case it might make it faster for common links).

Closes: https://git.pleroma.social/pleroma/pleroma/issues/127
6 years agoMerge branch 'feature/filter_exif' into 'develop'
lambda [Wed, 25 Jul 2018 07:16:50 +0000 (07:16 +0000)]
Merge branch 'feature/filter_exif' into 'develop'

Feature/filter exif (  solve #187 )

See merge request pleroma/pleroma!237