Tristan Mahé [Fri, 13 Jul 2018 18:14:37 +0000 (11:14 -0700)]
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
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
William Pitcock [Sun, 24 Jun 2018 06:34:44 +0000 (06:34 +0000)]
activity interpretation: formatting
William Pitcock [Sun, 24 Jun 2018 06:30:23 +0000 (06:30 +0000)]
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
William Pitcock [Sun, 24 Jun 2018 06:14:17 +0000 (06:14 +0000)]
mastodon api: add interpreter for Article activity types
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 [Sun, 24 Jun 2018 06:52:17 +0000 (06:52 +0000)]
utils: make_create_data: add support for Article objects
William Pitcock [Sun, 24 Jun 2018 05:33:22 +0000 (05:33 +0000)]
transmogrifier: accept Article activities
William Pitcock [Sun, 24 Jun 2018 06:31:09 +0000 (06:31 +0000)]
tests: add default_scope where appropriate
William Pitcock [Sat, 23 Jun 2018 07:02:49 +0000 (07:02 +0000)]
twitter api: allow setting default_scope
William Pitcock [Sat, 23 Jun 2018 06:55:32 +0000 (06:55 +0000)]
twitter api: user view: show default message scope if known
William Pitcock [Sat, 23 Jun 2018 06:53:29 +0000 (06:53 +0000)]
mastodon api: use info["default_scope"] if available for post scope
William Pitcock [Mon, 18 Jun 2018 21:21:03 +0000 (21:21 +0000)]
activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 21:20:44 +0000 (21:20 +0000)]
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
William Pitcock [Mon, 18 Jun 2018 21:20:18 +0000 (21:20 +0000)]
federator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
William Pitcock [Mon, 18 Jun 2018 21:08:37 +0000 (21:08 +0000)]
ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 21:08:12 +0000 (21:08 +0000)]
common api: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 21:01:33 +0000 (21:01 +0000)]
activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 20:58:09 +0000 (20:58 +0000)]
streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 20:57:38 +0000 (20:57 +0000)]
user: use Object.normalize() instead of Object.get_by_ap_id() directly.
William Pitcock [Mon, 18 Jun 2018 20:54:59 +0000 (20:54 +0000)]
activity: add normalize() to find a complete activity given either URI or partial structure
William Pitcock [Mon, 18 Jun 2018 05:23:54 +0000 (05:23 +0000)]
object: add helper functions to handle various forms of a given object and return a normalized one
lambda [Wed, 27 Jun 2018 12:48:01 +0000 (12:48 +0000)]
Merge branch 'features/initial-state_rights' into 'develop'
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
See merge request pleroma/pleroma!236
Tristan Mahé [Tue, 26 Jun 2018 22:09:45 +0000 (15:09 -0700)]
use the correct end file
Tristan Mahé [Tue, 26 Jun 2018 21:35:35 +0000 (14:35 -0700)]
maybe I should learn proper elixir ;D
Tristan Mahé [Tue, 26 Jun 2018 21:16:28 +0000 (14:16 -0700)]
mogrify mix.lock
Tristan Mahé [Tue, 26 Jun 2018 21:03:23 +0000 (14:03 -0700)]
do the filtering
Tristan Mahé [Tue, 26 Jun 2018 20:49:57 +0000 (13:49 -0700)]
format...
Tristan Mahé [Tue, 26 Jun 2018 20:45:47 +0000 (13:45 -0700)]
filter exif data #187
Haelwenn (lanodan) Monnier [Tue, 26 Jun 2018 18:48:35 +0000 (20:48 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
Related to https://git.pleroma.social/pleroma/mastofe/issues/20
lambda [Mon, 25 Jun 2018 08:45:42 +0000 (08:45 +0000)]
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
lambda [Mon, 25 Jun 2018 06:12:29 +0000 (06:12 +0000)]
Merge branch 'feature/configurable-blocks' into 'develop'
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
squidboi [Mon, 25 Jun 2018 06:05:44 +0000 (23:05 -0700)]
combined outgoing_blocks with statement
Vivian Lim [Sun, 24 Jun 2018 22:24:41 +0000 (15:24 -0700)]
mix format
lambda [Sun, 24 Jun 2018 13:28:42 +0000 (13:28 +0000)]
Merge branch 'feature/application-xml-mime' into 'develop'
config: add application/xml mimetype support.
See merge request pleroma/pleroma!228
lambda [Sun, 24 Jun 2018 13:17:14 +0000 (13:17 +0000)]
Merge branch 'features/glitch-soc-frontend' into 'develop'
Empty 2.4.x endpoints and ``api/v2/search``
See merge request pleroma/pleroma!214
Vivian Lim [Sun, 24 Jun 2018 06:20:30 +0000 (23:20 -0700)]
return unquoted empty array from /api/qvitter/mutes.json
Vivian Lim [Sun, 24 Jun 2018 06:05:54 +0000 (23:05 -0700)]
fixes- found that TwitterAPI.Controller adds .json suffix already
Vivian Lim [Sun, 24 Jun 2018 05:21:39 +0000 (22:21 -0700)]
return empty array for api/qvitter/mutes.json queries instead of html
squidboi [Sat, 23 Jun 2018 21:32:00 +0000 (14:32 -0700)]
fix mind-crushingly dumb syntax error
squidboi [Sat, 23 Jun 2018 21:27:07 +0000 (14:27 -0700)]
change moved attributes into normal variables
squidboi [Sat, 23 Jun 2018 21:16:08 +0000 (14:16 -0700)]
move configurable module attributes into relevant functions
Haelwenn (lanodan) Monnier [Sat, 23 Jun 2018 09:54:04 +0000 (11:54 +0200)]
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
Haelwenn (lanodan) Monnier [Wed, 13 Jun 2018 16:21:59 +0000 (18:21 +0200)]
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
Haelwenn (lanodan) Monnier [Mon, 4 Jun 2018 15:44:08 +0000 (17:44 +0200)]
Fake 2.4.0 API
Haelwenn (lanodan) Monnier [Thu, 21 Jun 2018 17:28:39 +0000 (19:28 +0200)]
lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format
Hnng!
lambda [Thu, 21 Jun 2018 07:09:57 +0000 (07:09 +0000)]
Merge branch 'feature/mrf-simple-accept-lists' into 'develop'
mrf simple: add accept lists
See merge request pleroma/pleroma!231
William Pitcock [Tue, 19 Jun 2018 21:23:37 +0000 (21:23 +0000)]
mrf simple: add accept lists
accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space.
lambda [Tue, 19 Jun 2018 09:50:05 +0000 (09:50 +0000)]
Merge branch 'features/column_media_streaming' into 'develop'
Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225
lambda [Tue, 19 Jun 2018 09:42:45 +0000 (09:42 +0000)]
Merge branch 'bugfix/block-follow-relationships' into 'develop'
fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230
William Pitcock [Tue, 19 Jun 2018 08:53:54 +0000 (08:53 +0000)]
tests: fix a completely bogus mastodon api test
William Pitcock [Tue, 19 Jun 2018 08:31:06 +0000 (08:31 +0000)]
user: add helper function to fetch a user given only an ap_id (fix tests)
lambda [Tue, 19 Jun 2018 05:15:11 +0000 (05:15 +0000)]
Merge branch 'feature/exclude-replies-filter' into 'develop'
activitypub: support filtering activities by whether or not they are a reply (closes #109)
Closes #109
See merge request pleroma/pleroma!226
lambda [Tue, 19 Jun 2018 05:13:00 +0000 (05:13 +0000)]
Merge branch 'bugfix/as2-contentmap' into 'develop'
handle ActivityStreams 2.0 contentMap
See merge request pleroma/pleroma!229
William Pitcock [Tue, 19 Jun 2018 00:57:57 +0000 (00:57 +0000)]
tests: transmogrifier: ensure incoming blocks have the same effect as local blocks
William Pitcock [Tue, 19 Jun 2018 00:45:24 +0000 (00:45 +0000)]
tests: prove that the block code is properly destroying follow relationships
William Pitcock [Tue, 19 Jun 2018 00:36:40 +0000 (00:36 +0000)]
user: when processing a block in User.block(), ensure all follow relationships are broken
this is needed for activitypub conformance
ref #213
William Pitcock [Mon, 18 Jun 2018 22:11:48 +0000 (22:11 +0000)]
tests: add regression test for contentMap-only posts
William Pitcock [Mon, 18 Jun 2018 21:51:22 +0000 (21:51 +0000)]
activitypub transmogrifier: fix handling of contentMap.
William Pitcock [Mon, 18 Jun 2018 04:57:59 +0000 (04:57 +0000)]
config: add application/xml mimetype support.
application/xml is the older xml mimetype. some legacy scripts make use of it,
as well as common use for debugging with curl and other tools. so it makes sense
to have it alongside text/xml.
William Pitcock [Mon, 18 Jun 2018 03:18:39 +0000 (03:18 +0000)]
activitypub: support filtering activities by whether or not they are a reply (closes #109)
Haelwenn (lanodan) Monnier [Sun, 17 Jun 2018 13:01:27 +0000 (15:01 +0200)]
MastodonAPI: Add streaming to media tabs of federated and local TLs
lambda [Sun, 17 Jun 2018 10:33:08 +0000 (10:33 +0000)]
Merge branch 'patch-2' into 'develop'
Comment for Old Servers
See merge request pleroma/pleroma!224
squidboi [Sat, 16 Jun 2018 23:33:52 +0000 (16:33 -0700)]
added info about block configuration to CONFIGURATION.md
squidboi [Sat, 16 Jun 2018 22:37:16 +0000 (15:37 -0700)]
Merge branch 'develop' into feature/configurable-blocks
Artik Banana [Sat, 16 Jun 2018 18:14:05 +0000 (18:14 +0000)]
Add comment about TLS curves for older servers.
lambda [Sat, 16 Jun 2018 10:39:36 +0000 (10:39 +0000)]
Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
Configs for mrf_rejectnonpublic
See merge request pleroma/pleroma!205
eal [Fri, 15 Jun 2018 20:43:30 +0000 (20:43 +0000)]
Merge branch 'bugfix/mastofe_thread_render' into 'develop'
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads
See merge request pleroma/pleroma!223
Haelwenn (lanodan) Monnier [Fri, 15 Jun 2018 19:37:29 +0000 (21:37 +0200)]
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
lain [Fri, 15 Jun 2018 20:01:17 +0000 (22:01 +0200)]
Fix typo
lambda [Thu, 14 Jun 2018 19:11:30 +0000 (19:11 +0000)]
Merge branch 'fix/missing-file-extension' into 'develop'
Add missing file extension if file does not have one
See merge request pleroma/pleroma!222
Francis Dinh [Thu, 14 Jun 2018 16:12:38 +0000 (12:12 -0400)]
Add missing file extension if file does not have one
lambda [Thu, 14 Jun 2018 13:55:50 +0000 (13:55 +0000)]
Merge branch 'fix/mp3-recognition' into 'develop'
upload.ex: add MPEG Layer 3 file header.
See merge request pleroma/pleroma!221
eal [Thu, 14 Jun 2018 13:41:08 +0000 (16:41 +0300)]
upload.ex: add MPEG Layer 3 file header.
lambda [Thu, 14 Jun 2018 07:23:14 +0000 (07:23 +0000)]
Merge branch 'patch-2' into 'develop'
* fix nginx 1.15 warning:
See merge request pleroma/pleroma!213
lambda [Thu, 14 Jun 2018 07:20:54 +0000 (07:20 +0000)]
Merge branch 'bugfix/mrf-orphaning' into 'develop'
activitypub transmogrifier: handle activity lookup failure
Closes #156
See merge request pleroma/pleroma!216
lambda [Thu, 14 Jun 2018 07:19:36 +0000 (07:19 +0000)]
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
lambda [Thu, 14 Jun 2018 07:14:18 +0000 (07:14 +0000)]
Merge branch 'bugfix/oauth2-param-name' into 'develop'
oauth: support either name or username parameter with grant_type=password
Closes #180
See merge request pleroma/pleroma!219
projects / akkoma / log