William Pitcock [Fri, 24 Aug 2018 18:03:41 +0000 (18:03 +0000)]
fe config: add collapse_message_with_subject fe option
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
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
hakabahitoyo [Fri, 24 Aug 2018 10:10:23 +0000 (19:10 +0900)]
add collapseMessageWithSubject in config
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
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
vaartis [Wed, 22 Aug 2018 20:27:15 +0000 (20:27 +0000)]
Add an OpenRC service
hakabahitoyo [Thu, 23 Aug 2018 02:52:18 +0000 (11:52 +0900)]
debug
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
William Pitcock [Thu, 23 Aug 2018 01:34:36 +0000 (01:34 +0000)]
formatting
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
William Pitcock [Thu, 23 Aug 2018 01:23:02 +0000 (01:23 +0000)]
transmogrifier: reject activities lacking a valid ID
Henry Jameson [Wed, 22 Aug 2018 13:10:59 +0000 (16:10 +0300)]
fixed notifications API completely breaking if there's a like for
missing (deleted) post.
Haelwenn (lanodan) Monnier [Wed, 22 Aug 2018 10:09:01 +0000 (12:09 +0200)]
Run mix format
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
Haelwenn (lanodan) Monnier [Tue, 21 Aug 2018 23:46:26 +0000 (01:46 +0200)]
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
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
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
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
Haelwenn (lanodan) Monnier [Thu, 9 Aug 2018 23:19:00 +0000 (01:19 +0200)]
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
Haelwenn (lanodan) Monnier [Fri, 3 Aug 2018 22:58:55 +0000 (00:58 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
Haelwenn (lanodan) Monnier [Wed, 13 Jun 2018 22:26:37 +0000 (00:26 +0200)]
Fix attachement rendering
lain [Sun, 25 Mar 2018 15:07:40 +0000 (17:07 +0200)]
Render peertube videos in mastodon.
lain [Sun, 25 Mar 2018 15:00:30 +0000 (17:00 +0200)]
Use activitypub to fetch posts.
This falls back to ostatus.
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 17:06:28 +0000 (19:06 +0200)]
Basic peertube support.
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)
ensra [Tue, 21 Aug 2018 14:41:32 +0000 (15:41 +0100)]
attempt to add html validation to mastodon api test case
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.
ensra [Tue, 21 Aug 2018 14:24:06 +0000 (15:24 +0100)]
sync bio sanitization code in tests
ensra [Tue, 21 Aug 2018 13:51:27 +0000 (14:51 +0100)]
fix test for converting bio \r\n to <br>.
ensra [Tue, 21 Aug 2018 13:12:55 +0000 (14:12 +0100)]
Format
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)
ensra [Tue, 21 Aug 2018 09:53:53 +0000 (10:53 +0100)]
mastodon api: sanitize the bio HTML
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
William Pitcock [Mon, 20 Aug 2018 18:40:05 +0000 (18:40 +0000)]
formatting
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
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
William Pitcock [Mon, 20 Aug 2018 18:10:29 +0000 (18:10 +0000)]
update pleroma frontend
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
eal [Mon, 20 Aug 2018 11:51:13 +0000 (14:51 +0300)]
ActivityPub: follow redirects when fetching user
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
William Pitcock [Mon, 20 Aug 2018 04:45:34 +0000 (04:45 +0000)]
update pleroma frontend
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
William Pitcock [Sat, 18 Aug 2018 18:19:11 +0000 (18:19 +0000)]
update pleroma frontend
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
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.
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
William Pitcock [Thu, 16 Aug 2018 23:49:35 +0000 (23:49 +0000)]
mastodon api controller: client_name, not name
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
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
William Pitcock [Thu, 16 Aug 2018 23:25:45 +0000 (23:25 +0000)]
update mix.lock
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
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
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
kaniini [Thu, 16 Aug 2018 15:37:58 +0000 (15:37 +0000)]
fix compile
kaniini [Thu, 16 Aug 2018 15:23:04 +0000 (15:23 +0000)]
Merge branch 'develop' into 'patch-2'
# Conflicts:
# mix.exs
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
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
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
William Pitcock [Thu, 16 Aug 2018 15:10:10 +0000 (15:10 +0000)]
testsuite: add puckipedia test fixture
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
William Pitcock [Tue, 14 Aug 2018 17:15:33 +0000 (17:15 +0000)]
testsuite: formatting
William Pitcock [Tue, 14 Aug 2018 17:07:01 +0000 (17:07 +0000)]
test: add kroeg fixtures
William Pitcock [Tue, 14 Aug 2018 17:05:11 +0000 (17:05 +0000)]
activitypub: transmogrifier: add necessary translations for kroeg
eal [Mon, 13 Aug 2018 13:21:18 +0000 (16:21 +0300)]
Use Image type for emoji icons.
eal [Mon, 13 Aug 2018 13:11:48 +0000 (16:11 +0300)]
ActivityPub user view: include tag if present.
eal [Sun, 12 Aug 2018 19:24:10 +0000 (22:24 +0300)]
CommonAPI: add emoji to user source data on update
lain [Sun, 12 Aug 2018 17:42:21 +0000 (19:42 +0200)]
formatting
lain [Sun, 12 Aug 2018 16:41:33 +0000 (18:41 +0200)]
Fix for elixir 1.7.
lain [Sun, 12 Aug 2018 16:16:19 +0000 (18:16 +0200)]
update frontend
lain [Sun, 12 Aug 2018 13:29:30 +0000 (15:29 +0200)]
Update Mastofe.
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
lambda [Sun, 12 Aug 2018 11:11:08 +0000 (11:11 +0000)]
Update generate_invite_token.ex
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
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
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
Haelwenn (lanodan) Monnier [Fri, 10 Aug 2018 16:01:42 +0000 (18:01 +0200)]
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
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
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
eal [Thu, 9 Aug 2018 17:47:29 +0000 (20:47 +0300)]
Remote follow: don't show confusing error if already following
eal [Thu, 9 Aug 2018 10:07:03 +0000 (13:07 +0300)]
HTML-sanitize usernames before emojifying.
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...
eal [Wed, 8 Aug 2018 05:38:25 +0000 (08:38 +0300)]
TwitterAPI user view: add screen_name_html and description_html.
eal [Tue, 7 Aug 2018 18:56:50 +0000 (21:56 +0300)]
MastoAPI AccountView: render profile emoji.
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
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
William Pitcock [Mon, 6 Aug 2018 11:10:49 +0000 (11:10 +0000)]
test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed
William Pitcock [Mon, 6 Aug 2018 10:57:19 +0000 (10:57 +0000)]
user: do not leak virtuals in account search
William Pitcock [Mon, 6 Aug 2018 10:44:25 +0000 (10:44 +0000)]
user: hide virtual actors from statistics queries
William Pitcock [Mon, 6 Aug 2018 10:37:52 +0000 (10:37 +0000)]
activitypub: do not show observable effects of non-public boosts
William Pitcock [Mon, 6 Aug 2018 08:46:06 +0000 (08:46 +0000)]
test: nickname is no longer a required field
William Pitcock [Mon, 6 Aug 2018 08:35:56 +0000 (08:35 +0000)]
relay: do not relay in test mode
William Pitcock [Mon, 6 Aug 2018 08:26:36 +0000 (08:26 +0000)]
run mix format
William Pitcock [Mon, 6 Aug 2018 08:20:21 +0000 (08:20 +0000)]
relay: reintroduce @allow_relay
William Pitcock [Mon, 6 Aug 2018 08:15:18 +0000 (08:15 +0000)]
activitypub: relay: fix up AS2 actor object
William Pitcock [Mon, 6 Aug 2018 08:13:05 +0000 (08:13 +0000)]
relay: move to /relay endpoint from / due to webapp issues
William Pitcock [Mon, 6 Aug 2018 08:03:10 +0000 (08:03 +0000)]
relay: only relay create activities
William Pitcock [Mon, 6 Aug 2018 08:03:00 +0000 (08:03 +0000)]
user: set up a valid followers address to use
William Pitcock [Mon, 6 Aug 2018 07:48:08 +0000 (07:48 +0000)]
activitypub: relay: add relay following/followers collection URLs
William Pitcock [Mon, 6 Aug 2018 07:43:37 +0000 (07:43 +0000)]
federator: actually relay the public activities
projects / akkoma / log