William Pitcock [Mon, 27 Aug 2018 23:36:30 +0000 (23:36 +0000)]
upload: strip exif data before finalizing the file path
William Pitcock [Mon, 27 Aug 2018 23:30:53 +0000 (23:30 +0000)]
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
William Pitcock [Mon, 27 Aug 2018 23:24:35 +0000 (23:24 +0000)]
mix: add ex_aws and ex_aws_s3 dependencies
William Pitcock [Mon, 27 Aug 2018 10:49:12 +0000 (10:49 +0000)]
Revert "enable scope options and such"
This reverts commit
e5642d75668298eff25309a8ee775ec38ed927f3.
William Pitcock [Mon, 20 Aug 2018 18:29:53 +0000 (18:29 +0000)]
enable scope options and such
William Pitcock [Tue, 14 Aug 2018 17:07:10 +0000 (17:07 +0000)]
formatting
William Pitcock [Mon, 6 Aug 2018 11:20:41 +0000 (11:20 +0000)]
user: fix up notification last calculation [NOT related to upstream]
lambda [Mon, 27 Aug 2018 08:29:25 +0000 (08:29 +0000)]
Merge branch 'feature/relay' into 'develop'
message relay
Closes #144
See merge request pleroma/pleroma!264
lambda [Mon, 27 Aug 2018 08:25:27 +0000 (08:25 +0000)]
Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
activitypub: filter destination list for announce activities differently than normal (closes #164)
Closes #164
See merge request pleroma/pleroma!227
kaniini [Sun, 26 Aug 2018 23:24:41 +0000 (23:24 +0000)]
Merge branch 'feature/emoji-in-local-users' into 'develop'
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
William Pitcock [Sun, 26 Aug 2018 23:19:45 +0000 (23:19 +0000)]
tests: fix formatting
kaniini [Sun, 26 Aug 2018 22:56:18 +0000 (22:56 +0000)]
Merge branch 'bugfix/formatting' into 'develop'
fix formatting
See merge request pleroma/pleroma!301
William Pitcock [Sun, 26 Aug 2018 22:46:25 +0000 (22:46 +0000)]
fix formatting
kaniini [Sun, 26 Aug 2018 22:44:22 +0000 (22:44 +0000)]
Merge branch 'tests/notification-smoketests' into 'develop'
tests: add notification smoketests (ref #265)
See merge request pleroma/pleroma!300
William Pitcock [Sun, 26 Aug 2018 22:42:02 +0000 (22:42 +0000)]
tests: add notification smoketests (ref #265)
kaniini [Sun, 26 Aug 2018 22:39:15 +0000 (22:39 +0000)]
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
common api: properly handle replying to orphaned threads
See merge request pleroma/pleroma!299
William Pitcock [Sun, 26 Aug 2018 22:37:36 +0000 (22:37 +0000)]
common api: handle replying to orphaned threads
kaniini [Sun, 26 Aug 2018 21:35:12 +0000 (21:35 +0000)]
Merge branch 'login-with-email' into 'develop'
When logging in, try treating the login as an email
Closes #245
See merge request pleroma/pleroma!295
kaniini [Sun, 26 Aug 2018 21:06:15 +0000 (21:06 +0000)]
Merge branch 'develop' into 'feature/relay'
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
kaniini [Sun, 26 Aug 2018 20:18:16 +0000 (20:18 +0000)]
Merge branch 'update-pleroma-frontend' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!298
kaniini [Sun, 26 Aug 2018 20:16:46 +0000 (20:16 +0000)]
Merge branch 'improve-example-caddyfile' into 'develop'
Improve example Caddyfile
See merge request pleroma/pleroma!296
kaniini [Sun, 26 Aug 2018 20:16:12 +0000 (20:16 +0000)]
Merge branch 'remove-unused-settings' into 'develop'
Remove unused settings
See merge request pleroma/pleroma!297
hakabahitoyo [Sun, 26 Aug 2018 12:08:03 +0000 (21:08 +0900)]
update pleroma frontend
hakabahitoyo [Sun, 26 Aug 2018 08:40:15 +0000 (17:40 +0900)]
remove unused settings from /api/statusnet/config
hakabahitoyo [Sun, 26 Aug 2018 08:21:57 +0000 (17:21 +0900)]
remove unused settings
shibayashi [Sun, 26 Aug 2018 01:36:52 +0000 (03:36 +0200)]
Improve example Caddyfile
Ekaterina Vaartis [Sat, 25 Aug 2018 18:22:34 +0000 (21:22 +0300)]
When logging in, try treating the login as an email
Closes #245
kaniini [Sat, 25 Aug 2018 00:20:25 +0000 (00:20 +0000)]
Merge branch 'feature/twitterapi-object-description' into 'develop'
twitter api: provide object descriptions as attachment description field
See merge request pleroma/pleroma!293
William Pitcock [Sat, 25 Aug 2018 00:03:25 +0000 (00:03 +0000)]
twitter api: provide object descriptions as attachment description field
kaniini [Fri, 24 Aug 2018 22:00:13 +0000 (22:00 +0000)]
Merge branch 'update/pleroma-fe-
20180824' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!292
William Pitcock [Fri, 24 Aug 2018 21:58:19 +0000 (21:58 +0000)]
update pleroma frontend
kaniini [Fri, 24 Aug 2018 20:15:59 +0000 (20:15 +0000)]
Merge branch 'feature/tls-sni-support' into 'develop'
http: fix TLS server name indication
Closes #261
See merge request pleroma/pleroma!291
William Pitcock [Fri, 24 Aug 2018 20:01:13 +0000 (20:01 +0000)]
http: fix TLS server name indication
by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.
since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.
closes #261
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
William Pitcock [Fri, 24 Aug 2018 18:33:36 +0000 (18:33 +0000)]
tests: formatting
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
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)
William Pitcock [Fri, 24 Aug 2018 18:14:19 +0000 (18:14 +0000)]
test: add testcase for formatter issue #163
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
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
projects / akkoma / log