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
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 [Sun, 5 Aug 2018 01:10:05 +0000 (01:10 +0000)]
user: filter out duplicate follow requests
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.
Hakaba Hitoyo [Thu, 2 Aug 2018 09:03:35 +0000 (18:03 +0900)]
add suggestions/web config
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
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
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
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
William Pitcock [Tue, 31 Jul 2018 21:41:18 +0000 (21:41 +0000)]
activitypub: add digest header to outbound messages and sign it
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
hakabahitoyo [Fri, 20 Jul 2018 17:57:56 +0000 (02:57 +0900)]
improve test
hakabahitoyo [Fri, 20 Jul 2018 17:19:20 +0000 (02:19 +0900)]
debug
hakabahitoyo [Fri, 20 Jul 2018 16:44:35 +0000 (01:44 +0900)]
improve test
Tristan Mahé [Fri, 20 Jul 2018 00:44:18 +0000 (17:44 -0700)]
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
Hakaba Hitoyo [Thu, 19 Jul 2018 08:42:00 +0000 (17:42 +0900)]
merge
lambda [Thu, 19 Jul 2018 07:35:34 +0000 (07:35 +0000)]
Merge branch 'tests/plume' into 'develop'
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
lambda [Thu, 19 Jul 2018 07:31:33 +0000 (07:31 +0000)]
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251
lambda [Thu, 19 Jul 2018 07:31:10 +0000 (07:31 +0000)]
Merge branch 'feature/fe-configuration' into 'develop'
serverside frontend configuration
See merge request pleroma/pleroma!256
lambda [Wed, 18 Jul 2018 08:52:11 +0000 (08:52 +0000)]
Merge branch 'feature/media-description' into 'develop'
Feature/media description
Closes #174
See merge request pleroma/pleroma!255
Hakaba Hitoyo [Wed, 18 Jul 2018 04:36:20 +0000 (13:36 +0900)]
configurable timeout
Hakaba Hitoyo [Wed, 18 Jul 2018 00:58:59 +0000 (09:58 +0900)]
better configuration
William Pitcock [Wed, 18 Jul 2018 00:05:36 +0000 (00:05 +0000)]
config: formatting
William Pitcock [Tue, 17 Jul 2018 15:20:39 +0000 (15:20 +0000)]
TwitterAPI: present pleroma frontend config in API
William Pitcock [Tue, 17 Jul 2018 15:10:14 +0000 (15:10 +0000)]
config: make instance description configurable
Hakaba Hitoyo [Tue, 17 Jul 2018 08:29:18 +0000 (17:29 +0900)]
correct error message
Hakaba Hitoyo [Tue, 17 Jul 2018 08:20:13 +0000 (17:20 +0900)]
debug
Hakaba Hitoyo [Tue, 17 Jul 2018 08:00:14 +0000 (17:00 +0900)]
debug
Hakaba Hitoyo [Tue, 17 Jul 2018 07:56:30 +0000 (16:56 +0900)]
add suggestionsThirdPartyEngine into /nodeinfo/2.0.json
Hakaba Hitoyo [Tue, 17 Jul 2018 07:45:18 +0000 (16:45 +0900)]
do nothing if configuration is skipped
Hakaba Hitoyo [Tue, 17 Jul 2018 04:20:58 +0000 (13:20 +0900)]
improve getting host name
William Pitcock [Tue, 17 Jul 2018 03:37:40 +0000 (03:37 +0000)]
test: mastodon attachments: update for added description field
William Pitcock [Tue, 17 Jul 2018 03:37:26 +0000 (03:37 +0000)]
tests: verify media description api support is working
William Pitcock [Tue, 17 Jul 2018 03:36:50 +0000 (03:36 +0000)]
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
William Pitcock [Tue, 17 Jul 2018 03:36:11 +0000 (03:36 +0000)]
mastodon api: use object name as alt text
William Pitcock [Tue, 17 Jul 2018 03:35:08 +0000 (03:35 +0000)]
upload: use generic Document object type instead of Image (mastodon compatibility)
Mastodon does not use the object name as alt text when the object is an Image.
hakabahitoyo [Sun, 15 Jul 2018 11:36:26 +0000 (20:36 +0900)]
format
hakabahitoyo [Sat, 14 Jul 2018 05:03:30 +0000 (14:03 +0900)]
id field
hakabahitoyo [Sat, 14 Jul 2018 03:07:09 +0000 (12:07 +0900)]
change api
hakabahitoyo [Sat, 14 Jul 2018 02:41:09 +0000 (11:41 +0900)]
configurable
hakabahitoyo [Sat, 14 Jul 2018 01:04:37 +0000 (10:04 +0900)]
http access to third party user recommendation
Tristan Mahé [Fri, 13 Jul 2018 18:14:37 +0000 (11:14 -0700)]
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
hakabahitoyo [Fri, 13 Jul 2018 15:52:23 +0000 (00:52 +0900)]
better mock /api/v1/suggestions
hakabahitoyo [Fri, 13 Jul 2018 15:44:18 +0000 (00:44 +0900)]
mock /api/v1/suggestions
hakabahitoyo [Fri, 13 Jul 2018 15:21:38 +0000 (00:21 +0900)]
/api/v1/suggestions endpoint
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 21:25:44 +0000 (23:25 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 21:09:42 +0000 (23:09 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object
The code here is copied from feature/peertube by lain.
Co-authored-by: lain <lain@soykaf.club>
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 17:52:17 +0000 (19:52 +0200)]
Add test for Plume Articles
William Pitcock [Thu, 12 Jul 2018 20:32:05 +0000 (20:32 +0000)]
test: ostatus controller: add AS2 fetching tests
William Pitcock [Thu, 12 Jul 2018 17:13:20 +0000 (17:13 +0000)]
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
lambda [Thu, 12 Jul 2018 16:48:15 +0000 (16:48 +0000)]
Merge branch 'feature/object-normalization' into 'develop'
object normalization
See merge request pleroma/pleroma!238
lambda [Thu, 12 Jul 2018 16:47:19 +0000 (16:47 +0000)]
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes #229
See merge request pleroma/pleroma!235
lambda [Thu, 12 Jul 2018 16:46:50 +0000 (16:46 +0000)]
Merge branch 'bugfix/activitypub-object-actor' into 'develop'
activitypub: more robustly handle object-to-actor associations
See merge request pleroma/pleroma!250
lambda [Thu, 12 Jul 2018 16:45:57 +0000 (16:45 +0000)]
Merge branch 'feature/message-summary' into 'develop'
message summary
See merge request pleroma/pleroma!249
William Pitcock [Thu, 12 Jul 2018 16:37:42 +0000 (16:37 +0000)]
activitypub: more robustly handle object-to-actor associations
William Pitcock [Thu, 12 Jul 2018 16:12:54 +0000 (16:12 +0000)]
formatting
William Pitcock [Sun, 24 Jun 2018 06:23:19 +0000 (06:23 +0000)]
testsuite: twitter api: add summary where necessary
William Pitcock [Sun, 24 Jun 2018 06:22:53 +0000 (06:22 +0000)]
twitter api: activity representer: add summary field for testsuite
William Pitcock [Sun, 24 Jun 2018 05:33:34 +0000 (05:33 +0000)]
twitter api: refactor activity html generation, add support for Articles
William Pitcock [Sat, 23 Jun 2018 06:08:09 +0000 (06:08 +0000)]
twitterapi: activity view: expose message summary text
lambda [Thu, 12 Jul 2018 06:00:55 +0000 (06:00 +0000)]
Update nodeinfo_controller.ex
lambda [Thu, 12 Jul 2018 05:59:12 +0000 (05:59 +0000)]
Merge branch 'feature/default-scope' into 'develop'
default scope setting
See merge request pleroma/pleroma!239
lambda [Thu, 12 Jul 2018 05:58:39 +0000 (05:58 +0000)]
Merge branch 'feature/article-support' into 'develop'
article support (plume, etc)
See merge request pleroma/pleroma!240
lambda [Thu, 12 Jul 2018 05:56:29 +0000 (05:56 +0000)]
Merge branch 'feature/auto-shortcodes' into 'develop'
Feature: automatic shortcodes for emoji
See merge request pleroma/pleroma!245
lambda [Thu, 12 Jul 2018 05:55:20 +0000 (05:55 +0000)]
Merge branch 'bugfix/status-url-field' into 'develop'
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
Closes #231
See merge request pleroma/pleroma!246
lambda [Thu, 12 Jul 2018 05:54:14 +0000 (05:54 +0000)]
Merge branch 'bugfix/x509-public-key' into 'develop'
activitypub: switch to using x509 representation for public keys instead of pkcs#1
See merge request pleroma/pleroma!248
William Pitcock [Thu, 12 Jul 2018 02:45:48 +0000 (02:45 +0000)]
activitypub: switch to using x509 representation for public keys instead of pkcs#1
Haelwenn (lanodan) Monnier [Tue, 26 Jun 2018 11:51:35 +0000 (13:51 +0200)]
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes: https://git.pleroma.social/pleroma/pleroma/issues/229
Haelwenn (lanodan) Monnier [Mon, 2 Jul 2018 04:28:21 +0000 (06:28 +0200)]
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
Jorty [Sun, 1 Jul 2018 00:35:34 +0000 (20:35 -0400)]
Fix auto-shortcode emoji
Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.
Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway.
Jorty [Sat, 30 Jun 2018 21:20:08 +0000 (17:20 -0400)]
Move emoji glob setting to config.exs
Also, a bit of formatting, and the glob includes an "/emoji/" prefix to
make it more intuitive to users
Jorty [Sat, 30 Jun 2018 19:08:31 +0000 (15:08 -0400)]
Allow emojis to be added automatically
Tristan Mahé [Thu, 28 Jun 2018 17:49:44 +0000 (10:49 -0700)]
CONFIGURATION.md: add doc about upload and strip_exif
Artik Banana [Wed, 27 Jun 2018 19:35:38 +0000 (19:35 +0000)]
Update mix.exs
projects / akkoma / log