Mark Felder [Tue, 12 Feb 2019 00:25:12 +0000 (00:25 +0000)]
Fix compile
Mark Felder [Mon, 11 Feb 2019 23:59:04 +0000 (23:59 +0000)]
WIP: Fix Twitter Cards
Twitter cards were not passing any useful metadata. A few things were
being handled on Twitter's end by trying to match OpenGraph tags with
their own, but it wasn't working at all for media. This is an attempt to
fix that.
Common functions have been pulled out of opengraph and put into
utils. Twitter's functionality was entirely replaced with a direct copy
of Opengraph's and then modified as needed.
Profiles are now represented as Summary Cards
Posts with images are now represented as Summart with Large Image Cards
Posts with video and audio attachments are represented as Player Cards.
This now passes the Twitter Card Validator.
Validator and Docs are below
https://cards-dev.twitter.com/validator
https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards
kaniini [Mon, 11 Feb 2019 18:45:15 +0000 (18:45 +0000)]
Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'
Filter summary field in KeywordPolicy
See merge request pleroma/pleroma!812
rinpatch [Mon, 11 Feb 2019 18:35:40 +0000 (21:35 +0300)]
Filter summary in keywordpolicy
rinpatch [Mon, 11 Feb 2019 15:02:14 +0000 (15:02 +0000)]
Merge branch 'feature/thread-muting' into 'develop'
Feature/thread muting
See merge request pleroma/pleroma!796
lambda [Mon, 11 Feb 2019 12:33:58 +0000 (12:33 +0000)]
Merge branch 'feature/rich-media-limits' into 'develop'
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
Karen Konou [Mon, 11 Feb 2019 11:10:10 +0000 (12:10 +0100)]
Merge branch 'develop' into feature/thread-muting
Karen Konou [Mon, 11 Feb 2019 10:59:51 +0000 (11:59 +0100)]
Refactor as per Rin's suggestions, add endpoint tests
lambda [Mon, 11 Feb 2019 08:22:54 +0000 (08:22 +0000)]
Merge branch 'revert-
e0de0fcf' into 'develop'
Revert "Merge branch 'object-creation' into 'develop'"
See merge request pleroma/pleroma!810
lambda [Mon, 11 Feb 2019 08:07:39 +0000 (08:07 +0000)]
Revert "Merge branch 'object-creation' into 'develop'"
This reverts merge request !802
William Pitcock [Sun, 10 Feb 2019 21:37:51 +0000 (21:37 +0000)]
rich media: tighten fetching timeouts and size limits
kaniini [Sun, 10 Feb 2019 21:28:41 +0000 (21:28 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
Update Mastodon Frontend to 2019-02-10 bundle
See merge request pleroma/pleroma!806
kaniini [Sun, 10 Feb 2019 21:16:29 +0000 (21:16 +0000)]
Merge branch 'feather_mention' into 'develop'
Add Feather to the clients list
See merge request pleroma/pleroma!804
kaniini [Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)]
Merge branch 'fix/credo-issues' into 'develop'
Fix credo issues
See merge request pleroma/pleroma!786
kaniini [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'
Update service files of OpenRC and systemd to new recommended paths
See merge request pleroma/pleroma!798
shibayashi [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Update service files of OpenRC and systemd to new recommended paths
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 18:55:22 +0000 (19:55 +0100)]
Update Mastodon Frontend to 2019-02-10 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10
[ci skip]
succfemboi [Sun, 10 Feb 2019 15:18:04 +0000 (16:18 +0100)]
add feather to webclients
lambda [Sun, 10 Feb 2019 14:21:12 +0000 (14:21 +0000)]
Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'
Recommend the acme-challenge path that is used in the installation guides
See merge request pleroma/pleroma!803
lambda [Sun, 10 Feb 2019 13:47:26 +0000 (13:47 +0000)]
Merge branch 'docs/pleroma-clients' into 'develop'
docs/Clients.md: Add documentation about clients supporting pleroma
See merge request pleroma/pleroma!726
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 13:42:32 +0000 (14:42 +0100)]
docs/Clients.md: Add Nekonium
[ci skip]
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 13:24:48 +0000 (14:24 +0100)]
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically
[ci skip]
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:39:29 +0000 (18:39 +0100)]
docs/Clients.md: Add Social (GNOME)
[ci skip]
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:28:25 +0000 (18:28 +0100)]
docs/Clients.md: Add per-type sections
helps differenciate between Electrons and others like Brutaldon.
[ci skip]
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 17:20:10 +0000 (18:20 +0100)]
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore
Haelwenn (lanodan) Monnier [Mon, 28 Jan 2019 04:50:08 +0000 (05:50 +0100)]
WIP: docs/Clients.md: Add documentation about clients supporting pleroma
[ci skip]
Karen Konou [Sun, 10 Feb 2019 08:31:20 +0000 (09:31 +0100)]
refactor, status view updating, error handling
rinpatch [Sun, 10 Feb 2019 07:39:27 +0000 (07:39 +0000)]
Merge branch 'object-creation' into 'develop'
Do object insertion through Cachex
See merge request pleroma/pleroma!802
shibayashi [Sat, 9 Feb 2019 22:08:27 +0000 (23:08 +0100)]
Recommend the acme-challenge path that is used in the installation guides
kaniini [Sat, 9 Feb 2019 21:03:42 +0000 (21:03 +0000)]
Merge branch 'follow-enhancements' into 'develop'
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
lain [Sat, 9 Feb 2019 21:01:08 +0000 (22:01 +0100)]
Do object insertion through Cachex
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
Karen Konou [Sat, 9 Feb 2019 19:52:11 +0000 (20:52 +0100)]
Add unique index and unique constraint check, uniqueness test fails
Karen Konou [Sat, 9 Feb 2019 17:34:00 +0000 (18:34 +0100)]
Merged "check mute" test into the other two
Karen Konou [Sat, 9 Feb 2019 17:08:46 +0000 (18:08 +0100)]
elixir too new for CI's mix format lol
Karen Konou [Sat, 9 Feb 2019 16:47:57 +0000 (17:47 +0100)]
it works!!
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:30:42 +0000 (16:30 +0100)]
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:20:18 +0000 (16:20 +0100)]
de-group import/s
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 15:16:26 +0000 (16:16 +0100)]
de-group alias/es
Haelwenn (lanodan) Monnier [Sat, 9 Feb 2019 13:39:27 +0000 (14:39 +0100)]
HTML.Scrubber.Default: Consistency
Haelwenn (lanodan) Monnier [Fri, 8 Feb 2019 16:18:44 +0000 (17:18 +0100)]
Stash
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:19:35 +0000 (21:19 +0100)]
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:24:57 +0000 (21:24 +0100)]
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 20:04:11 +0000 (21:04 +0100)]
Web.Federator: Fix unused variable
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 19:20:02 +0000 (20:20 +0100)]
Credo fixes: alias grouping/ordering
Haelwenn (lanodan) Monnier [Wed, 6 Feb 2019 19:19:39 +0000 (20:19 +0100)]
Credo fixes: parameter consistency
Haelwenn (lanodan) Monnier [Sun, 3 Feb 2019 17:44:18 +0000 (18:44 +0100)]
Make credo happy
Karen Konou [Sat, 9 Feb 2019 13:34:42 +0000 (14:34 +0100)]
added another test
Karen Konou [Sat, 9 Feb 2019 13:23:51 +0000 (14:23 +0100)]
Made a test!
lain [Sat, 9 Feb 2019 12:39:57 +0000 (13:39 +0100)]
Do autofollow first.
lain [Sat, 9 Feb 2019 12:24:23 +0000 (13:24 +0100)]
Respect blocks in mass follow.
lambda [Sat, 9 Feb 2019 11:39:01 +0000 (11:39 +0000)]
Merge branch 'add-media-path-to-caddy-cache' into 'develop'
Add /media to Caddy cache
See merge request pleroma/pleroma!791
shibayashi [Sat, 9 Feb 2019 11:39:01 +0000 (11:39 +0000)]
Add /media to Caddy cache
lambda [Sat, 9 Feb 2019 11:38:37 +0000 (11:38 +0000)]
Merge branch 'feature/keyword-policy' into 'develop'
Add keyword policy
See merge request pleroma/pleroma!794
rinpatch [Sat, 9 Feb 2019 05:12:30 +0000 (08:12 +0300)]
oof
rinpatch [Fri, 8 Feb 2019 17:23:26 +0000 (20:23 +0300)]
Add tests and fix a typo in docs
Karen Konou [Fri, 8 Feb 2019 12:21:34 +0000 (13:21 +0100)]
help i am not good with git
Karen Konou [Fri, 8 Feb 2019 12:17:11 +0000 (13:17 +0100)]
Added thread unmuting (still a bit buggy maybe)
lambda [Fri, 8 Feb 2019 12:18:05 +0000 (12:18 +0000)]
Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'
Split hide_network only for local users
See merge request pleroma/pleroma!781
Karen Konou [Fri, 8 Feb 2019 12:17:11 +0000 (13:17 +0100)]
Added thread unmuting (still a bit buggy maybe)
rinpatch [Fri, 8 Feb 2019 12:12:44 +0000 (15:12 +0300)]
fix typo in config.md
rinpatch [Fri, 8 Feb 2019 12:12:13 +0000 (15:12 +0300)]
wow
lambda [Fri, 8 Feb 2019 12:10:35 +0000 (12:10 +0000)]
Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'
Mark streaming feature for iOS apps in readme
See merge request pleroma/pleroma!790
lambda [Fri, 8 Feb 2019 12:09:43 +0000 (12:09 +0000)]
Merge branch 'oauth2_strengthening' into 'develop'
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix
See merge request pleroma/pleroma!793
Karen Konou [Fri, 8 Feb 2019 11:44:02 +0000 (12:44 +0100)]
Merge branch 'develop' into feature/thread-muting
rinpatch [Fri, 8 Feb 2019 10:16:50 +0000 (13:16 +0300)]
What idiot did that? (me)
rinpatch [Fri, 8 Feb 2019 10:12:33 +0000 (13:12 +0300)]
Merge branch 'develop' into feature/keyword-policy
rinpatch [Fri, 8 Feb 2019 10:12:09 +0000 (13:12 +0300)]
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
rinpatch [Fri, 8 Feb 2019 09:48:39 +0000 (12:48 +0300)]
Add default config for keyword policy
rinpatch [Fri, 8 Feb 2019 09:38:24 +0000 (12:38 +0300)]
Add keyword policy
Karen Konou [Thu, 7 Feb 2019 22:47:13 +0000 (23:47 +0100)]
resolved merge conflict
Karen Konou [Thu, 7 Feb 2019 22:44:30 +0000 (23:44 +0100)]
Somehow fixed the repo insert [skip-ci]
Karen Konou [Thu, 7 Feb 2019 21:38:54 +0000 (22:38 +0100)]
made a silly oopsie
Karen Konou [Thu, 7 Feb 2019 21:38:54 +0000 (22:38 +0100)]
made a silly oopsie
Karen Konou [Thu, 7 Feb 2019 21:25:07 +0000 (22:25 +0100)]
ugghhhh
Ivan Tashkinov [Thu, 7 Feb 2019 19:14:06 +0000 (22:14 +0300)]
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
Karen Konou [Tue, 5 Feb 2019 12:35:24 +0000 (13:35 +0100)]
Migration and some boilerplate stuff
hakabahitoyo [Thu, 7 Feb 2019 03:01:35 +0000 (12:01 +0900)]
mark streaming feature for ios apps in readme
kaniini [Thu, 7 Feb 2019 02:19:52 +0000 (02:19 +0000)]
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'
Remove Pawoo apps from README.md
See merge request pleroma/pleroma!788
kaniini [Thu, 7 Feb 2019 02:18:51 +0000 (02:18 +0000)]
Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'
Mark streaming feature for Apps in README.md
See merge request pleroma/pleroma!789
hakabahitoyo [Thu, 7 Feb 2019 02:04:37 +0000 (11:04 +0900)]
Mark streaming feature for Apps in README.md
Hakaba Hitoyo [Thu, 7 Feb 2019 01:15:27 +0000 (01:15 +0000)]
Update README.md
kaniini [Wed, 6 Feb 2019 22:40:24 +0000 (22:40 +0000)]
Merge branch 'rename-followings' into 'develop'
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
See merge request pleroma/pleroma!787
Mark Felder [Wed, 6 Feb 2019 22:34:44 +0000 (22:34 +0000)]
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
This was a dirty regex replace which worked on my server
Haelwenn [Wed, 6 Feb 2019 18:39:13 +0000 (18:39 +0000)]
Merge branch 'bugfix/rich-media-card' into 'develop'
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
William Pitcock [Wed, 6 Feb 2019 18:27:55 +0000 (18:27 +0000)]
tests: add a rich media card that contains all relevant fields
kaniini [Wed, 6 Feb 2019 18:19:47 +0000 (18:19 +0000)]
Merge branch 'add-admin-and-moderator-fields' into 'develop'
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
William Pitcock [Wed, 6 Feb 2019 18:12:26 +0000 (18:12 +0000)]
test: add some regression tests for the rich media card rendering
William Pitcock [Wed, 6 Feb 2019 18:02:15 +0000 (18:02 +0000)]
mastodon api: rich media: don't clobber %URI struct with a string
Haelwenn [Wed, 6 Feb 2019 18:02:10 +0000 (18:02 +0000)]
Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'
Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format.
See merge request pleroma/pleroma!784
Michael Loftis [Wed, 6 Feb 2019 17:54:30 +0000 (17:54 +0000)]
adds a couple of explicit examples for ExSyslogger
rinpatch [Wed, 6 Feb 2019 17:47:58 +0000 (17:47 +0000)]
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
href [Wed, 6 Feb 2019 17:42:19 +0000 (18:42 +0100)]
Fix if clause in activity_pub user_view
Michael Loftis [Wed, 6 Feb 2019 17:34:09 +0000 (17:34 +0000)]
rids the duplicate timestamp from default ExSyslogger config
Maxim Filippov [Wed, 6 Feb 2019 10:41:31 +0000 (13:41 +0300)]
Split hide_networ only for local users
lambda [Wed, 6 Feb 2019 09:47:36 +0000 (09:47 +0000)]
Merge branch '2019-02-06-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!780
lain [Wed, 6 Feb 2019 09:40:01 +0000 (10:40 +0100)]
update frontend
eugenijm [Mon, 4 Feb 2019 12:28:35 +0000 (15:28 +0300)]
Allow to configure visibility for admin and moderator badges
eugenijm [Mon, 4 Feb 2019 02:03:57 +0000 (05:03 +0300)]
Add is_admin and is_moderator boolean fields to the user view
rinpatch [Tue, 5 Feb 2019 21:01:20 +0000 (21:01 +0000)]
Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'
rich media: parser: reject any data which cannot be explicitly encoded into JSON
Closes #596
See merge request pleroma/pleroma!779
William Pitcock [Tue, 5 Feb 2019 20:50:57 +0000 (20:50 +0000)]
rich media: parser: reject any data which cannot be explicitly encoded into JSON