lain [Fri, 1 Feb 2019 09:21:17 +0000 (10:21 +0100)]
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
href [Fri, 1 Feb 2019 09:14:35 +0000 (09:14 +0000)]
Merge branch '534_federation_targets_reachability' into 'develop'
[#534] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
Haelwenn [Thu, 31 Jan 2019 22:28:08 +0000 (22:28 +0000)]
Merge branch 'docs/pleroma-api-invite-token' into 'develop'
docs/Pleroma-API.md: Add missing token field documentation
See merge request pleroma/pleroma!752
Haelwenn (lanodan) Monnier [Thu, 31 Jan 2019 22:23:53 +0000 (23:23 +0100)]
docs/Pleroma-API.md: Add missing token field documentation
[ci skip]
lain [Thu, 31 Jan 2019 19:02:08 +0000 (20:02 +0100)]
Remove default value for rich media.
Setting it to true will actually override a 'false' set before.
kaniini [Thu, 31 Jan 2019 18:50:00 +0000 (18:50 +0000)]
Merge branch 'user-follow-all-unique' into 'develop'
User.follow_all: ensure the following array stays unique
See merge request pleroma/pleroma!750
href [Thu, 31 Jan 2019 17:07:46 +0000 (18:07 +0100)]
User.follow_all: ensure its stays unique
lambda [Thu, 31 Jan 2019 16:54:48 +0000 (16:54 +0000)]
Merge branch 'bugfix/rich-media-non-unicode' into 'develop'
rich media non-unicode bugfix
See merge request pleroma/pleroma!749
William Pitcock [Thu, 31 Jan 2019 16:30:56 +0000 (16:30 +0000)]
test: http mocks: formatting
kaniini [Thu, 31 Jan 2019 16:28:40 +0000 (16:28 +0000)]
Merge branch 'develop' into 'develop'
Clarify the description of the `logo_mask` configuration key.
See merge request pleroma/pleroma!747
kaniini [Thu, 31 Jan 2019 16:22:26 +0000 (16:22 +0000)]
Merge branch 'fix/rich-media-disable-in-config' into 'develop'
Make rich media support toggleable
See merge request pleroma/pleroma!748
William Pitcock [Thu, 31 Jan 2019 16:19:53 +0000 (16:19 +0000)]
test: rich media: parser: add malformed data regression test
William Pitcock [Thu, 31 Jan 2019 16:19:31 +0000 (16:19 +0000)]
rich media: parser: only try to validate strings, not numbers (OEmbed)
William Pitcock [Thu, 31 Jan 2019 16:12:35 +0000 (16:12 +0000)]
test: add malformed OGP data fixture
William Pitcock [Thu, 31 Jan 2019 16:03:56 +0000 (16:03 +0000)]
rich media: parser: reject OGP fields we cannot safely process
rinpatch [Thu, 31 Jan 2019 15:18:20 +0000 (18:18 +0300)]
Make rich media support toggleable
Alice [Thu, 31 Jan 2019 13:14:22 +0000 (13:14 +0000)]
Clarify the description of the `logo_mask` configuration key.
lambda [Thu, 31 Jan 2019 12:16:44 +0000 (12:16 +0000)]
Merge branch 'revert-
4d3655c4' into 'develop'
Revert "Merge branch 'spc-fix-3' into 'develop'"
See merge request pleroma/pleroma!745
lambda [Thu, 31 Jan 2019 12:16:23 +0000 (12:16 +0000)]
Revert "Merge branch 'spc-fix-3' into 'develop'"
This reverts merge request !682
kaniini [Thu, 31 Jan 2019 11:29:29 +0000 (11:29 +0000)]
Merge branch 'spc-fix-3' into 'develop'
Spc fix 3
See merge request pleroma/pleroma!682
Haelwenn [Thu, 31 Jan 2019 10:16:11 +0000 (10:16 +0000)]
Merge branch 'features/glitch-soc-frontend' into 'develop'
Features/glitch soc frontend
See merge request pleroma/pleroma!192
Haelwenn [Thu, 31 Jan 2019 10:12:48 +0000 (10:12 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'
[MastodonFE] Update Frontend (glitch)
See merge request pleroma/pleroma!730
Haelwenn (lanodan) Monnier [Sun, 16 Sep 2018 21:17:34 +0000 (23:17 +0200)]
[MastodonFE] Update Frontend (glitch)
kaniini [Wed, 30 Jan 2019 21:38:15 +0000 (21:38 +0000)]
Merge branch 'add-wiki-reference-to-readme' into 'develop'
Add wiki reference to readme
See merge request pleroma/pleroma!744
shibayashi [Wed, 30 Jan 2019 21:26:10 +0000 (22:26 +0100)]
Reformat to make markdownlint happy and other little typographic things
shibayashi [Wed, 30 Jan 2019 21:15:52 +0000 (22:15 +0100)]
Add reference to Pleroma Wiki in the Readme
lambda [Wed, 30 Jan 2019 20:18:05 +0000 (20:18 +0000)]
Merge branch 'multiple-hackney-pools' into 'develop'
Fix
4aff4efa typos
See merge request pleroma/pleroma!743
lambda [Wed, 30 Jan 2019 20:17:22 +0000 (20:17 +0000)]
Merge branch '2019-1-30-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!742
href [Wed, 30 Jan 2019 20:08:41 +0000 (21:08 +0100)]
lain [Wed, 30 Jan 2019 20:04:58 +0000 (21:04 +0100)]
update frontend
kaniini [Wed, 30 Jan 2019 19:01:57 +0000 (19:01 +0000)]
Merge branch 'multiple-hackney-pools' into 'develop'
Use multiple hackney pools
See merge request pleroma/pleroma!739
kaniini [Wed, 30 Jan 2019 18:50:00 +0000 (18:50 +0000)]
Merge branch 'better-following' into 'develop'
Use race condition free queries for following / unfollowing
See merge request pleroma/pleroma!740
lain [Wed, 30 Jan 2019 18:45:31 +0000 (19:45 +0100)]
Fix specs.
lain [Wed, 30 Jan 2019 18:33:25 +0000 (19:33 +0100)]
Use race-condition free mass follow.
lain [Wed, 30 Jan 2019 18:21:04 +0000 (19:21 +0100)]
Use race-condition free following method.
href [Wed, 30 Jan 2019 11:38:38 +0000 (12:38 +0100)]
Use multiple hackney pools
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
Haelwenn [Wed, 30 Jan 2019 10:56:53 +0000 (10:56 +0000)]
Merge branch 'docs/fix-frontend_config' into 'develop'
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
See merge request pleroma/pleroma!738
Haelwenn (lanodan) Monnier [Wed, 30 Jan 2019 10:51:12 +0000 (11:51 +0100)]
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
kaniini [Wed, 30 Jan 2019 10:38:41 +0000 (10:38 +0000)]
Merge branch 'docs/fix-frontend_config' into 'develop'
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
See merge request pleroma/pleroma!737
Haelwenn (lanodan) Monnier [Wed, 30 Jan 2019 10:33:06 +0000 (11:33 +0100)]
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
[ci skip]
lambda [Tue, 29 Jan 2019 19:24:30 +0000 (19:24 +0000)]
Merge branch 'docs/fix-pleroma-api-title' into 'develop'
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
See merge request pleroma/pleroma!736
Haelwenn (lanodan) Monnier [Tue, 29 Jan 2019 18:11:34 +0000 (19:11 +0100)]
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
[ci skip]
kaniini [Tue, 29 Jan 2019 14:47:36 +0000 (14:47 +0000)]
Merge branch 'bugfix/fix-rejects' into 'develop'
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
kaniini [Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)]
Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
William Pitcock [Tue, 29 Jan 2019 12:21:02 +0000 (12:21 +0000)]
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
William Pitcock [Tue, 29 Jan 2019 11:57:46 +0000 (11:57 +0000)]
activitypub: transmogrifier: fix follow request rejections
Ivan Tashkinov [Tue, 29 Jan 2019 10:12:28 +0000 (13:12 +0300)]
[#534] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
Haelwenn [Tue, 29 Jan 2019 05:11:08 +0000 (05:11 +0000)]
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
Rich Media support, part 2.
See merge request pleroma/pleroma!719
William Pitcock [Mon, 28 Jan 2019 21:07:36 +0000 (21:07 +0000)]
rich media: oembed: return data in the same format as the other parsers
William Pitcock [Mon, 28 Jan 2019 20:55:33 +0000 (20:55 +0000)]
rich media: kill some testsuite noise
William Pitcock [Mon, 28 Jan 2019 20:31:43 +0000 (20:31 +0000)]
rich media: parser: add some basic sanity checks on the returned data with pattern matching
William Pitcock [Mon, 28 Jan 2019 20:19:07 +0000 (20:19 +0000)]
rich media: parser: cache negatives
William Pitcock [Mon, 28 Jan 2019 19:59:36 +0000 (19:59 +0000)]
rich media: parser: add copyright header
kaniini [Mon, 28 Jan 2019 14:31:03 +0000 (14:31 +0000)]
Merge branch 'app-list-changes' into 'develop'
App list changes: Separate into two categories, and drop Subway Tooter.
See merge request pleroma/pleroma!731
scarlett [Mon, 28 Jan 2019 14:24:49 +0000 (14:24 +0000)]
App list changes: Separate into two categories, and drop Subway Tooter.
lain [Mon, 28 Jan 2019 13:39:54 +0000 (14:39 +0100)]
Put deprecation warnings undre Pleroma.Config.
Ivan Tashkinov [Mon, 28 Jan 2019 12:39:14 +0000 (15:39 +0300)]
[#534] Merged `upstream/develop`.
Ivan Tashkinov [Mon, 28 Jan 2019 12:25:06 +0000 (15:25 +0300)]
[#534] Various tweaks. Tests for Instances and Instance.
lain [Mon, 28 Jan 2019 12:07:12 +0000 (13:07 +0100)]
Return new-style config if old-style config is set to false.
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
lain [Mon, 28 Jan 2019 12:06:28 +0000 (13:06 +0100)]
Update config.md
lain [Mon, 28 Jan 2019 12:05:17 +0000 (13:05 +0100)]
Don't run warnings in a task.
lain [Mon, 28 Jan 2019 12:04:51 +0000 (13:04 +0100)]
Change default bg image in new config.
Haelwenn [Mon, 28 Jan 2019 11:48:03 +0000 (11:48 +0000)]
Merge branch 'safe-render-activities' into 'develop'
remove unnecessary filter (re !723)
See merge request pleroma/pleroma!729
href [Mon, 28 Jan 2019 11:24:14 +0000 (12:24 +0100)]
re
f83bae7c: remove unnecessary filter
lain [Mon, 28 Jan 2019 11:09:41 +0000 (12:09 +0100)]
Add deprecation warning mechanism.
href [Mon, 28 Jan 2019 10:49:03 +0000 (10:49 +0000)]
Merge branch 'oauth-login-failure-bug' into 'develop'
Correctly handle invalid credentials on auth login.
Closes #407
See merge request pleroma/pleroma!728
lain [Mon, 28 Jan 2019 10:41:47 +0000 (11:41 +0100)]
Correctly handle invalid credentials on auth login.
Closes #407
Haelwenn [Mon, 28 Jan 2019 08:23:21 +0000 (08:23 +0000)]
Merge branch 'patch-2' into 'develop'
Update the openrc service's retry with the correct format
See merge request pleroma/pleroma!727
vaartis [Mon, 28 Jan 2019 08:18:11 +0000 (08:18 +0000)]
Update the openrc service's retry with the correct format
Ivan Tashkinov [Mon, 28 Jan 2019 08:03:52 +0000 (11:03 +0300)]
[#534] Refactoring / tweaks per MR review.
William Pitcock [Mon, 28 Jan 2019 06:42:27 +0000 (06:42 +0000)]
mastodon api: card: force OGP images through mediaproxy
William Pitcock [Mon, 28 Jan 2019 06:19:00 +0000 (06:19 +0000)]
test: add status posting with OGP link preview test
William Pitcock [Mon, 28 Jan 2019 06:10:25 +0000 (06:10 +0000)]
rich media: helpers: clean up unused aliases
William Pitcock [Mon, 28 Jan 2019 06:07:18 +0000 (06:07 +0000)]
activitypub: prime OGP crawler cache when new messages are inserted into the database
William Pitcock [Mon, 28 Jan 2019 06:04:54 +0000 (06:04 +0000)]
rich media: add helpers module, use instead of MastodonAPI module
William Pitcock [Sun, 27 Jan 2019 12:39:20 +0000 (12:39 +0000)]
mastodon api: formatting
William Pitcock [Sun, 27 Jan 2019 12:34:49 +0000 (12:34 +0000)]
API: kill /api/rich_media/parse endpoint
William Pitcock [Sun, 27 Jan 2019 12:27:46 +0000 (12:27 +0000)]
test: update twitterapi tests
William Pitcock [Sun, 27 Jan 2019 12:27:37 +0000 (12:27 +0000)]
twitter api: fix up activity representer
William Pitcock [Sun, 27 Jan 2019 12:21:51 +0000 (12:21 +0000)]
test: update mastodon status view tests
William Pitcock [Sun, 27 Jan 2019 12:21:05 +0000 (12:21 +0000)]
rich media: add try/rescue to ensure we catch parsing and fetching failures
William Pitcock [Sun, 27 Jan 2019 12:16:08 +0000 (12:16 +0000)]
twitter api: embed card in twitterapi posts
William Pitcock [Sun, 27 Jan 2019 12:15:41 +0000 (12:15 +0000)]
mastodon api: embed card in status object
William Pitcock [Sun, 27 Jan 2019 09:37:11 +0000 (09:37 +0000)]
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
Haelwenn (lanodan) Monnier [Wed, 19 Sep 2018 00:04:56 +0000 (02:04 +0200)]
[MastoAPI][GlitchAPI] Add bookmarks
Haelwenn (lanodan) Monnier [Wed, 19 Sep 2018 00:10:54 +0000 (02:10 +0200)]
/web/index template: Modify for glitch-soc
rinpatch [Sun, 27 Jan 2019 22:01:20 +0000 (22:01 +0000)]
Merge branch 'notice-404-to-fe' into 'develop'
/notice/:id - send the FE index even if 404
See merge request pleroma/pleroma!725
href [Sun, 27 Jan 2019 21:51:50 +0000 (22:51 +0100)]
/notice/:id - send the FE index even if 404
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
lambda [Sun, 27 Jan 2019 20:10:09 +0000 (20:10 +0000)]
Merge branch 'safe-render-activities' into 'develop'
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
lain [Sun, 27 Jan 2019 20:03:15 +0000 (21:03 +0100)]
Fix objects.
kaniini [Sun, 27 Jan 2019 19:10:15 +0000 (19:10 +0000)]
Merge branch 'discard-invalid-likes' into 'develop'
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
href [Sun, 27 Jan 2019 18:27:16 +0000 (19:27 +0100)]
Transmogrifier: fix incoming objects with invalid likes
href [Sun, 27 Jan 2019 18:15:35 +0000 (19:15 +0100)]
Views: wrap activity rendering in a rescue
this avoids complete timeline breakage when an activity fucks up
rendering.
kaniini [Sun, 27 Jan 2019 15:22:08 +0000 (15:22 +0000)]
Merge branch 'hotfix/favorites-index' into 'develop'
add activities likes index, fixes favorites API call
See merge request pleroma/pleroma!722
kaniini [Sun, 27 Jan 2019 15:16:06 +0000 (15:16 +0000)]
Merge branch 'flake-random-worker-id' into 'develop'
Flake: random worker id
See merge request pleroma/pleroma!721
William Pitcock [Sun, 27 Jan 2019 15:15:33 +0000 (15:15 +0000)]
add activities likes index, fixes favorites API call
href [Sun, 27 Jan 2019 15:04:36 +0000 (16:04 +0100)]
Flake: random worker id
rinpatch [Sun, 27 Jan 2019 14:28:51 +0000 (14:28 +0000)]
Merge branch 'docs/emoji-endpoint-similarities' into 'develop'
docs/Pleroma-API.md: Add note about emoji endpoints similarities
See merge request pleroma/pleroma!720
Haelwenn (lanodan) Monnier [Sun, 27 Jan 2019 13:30:21 +0000 (14:30 +0100)]
docs/Pleroma-API.md: Add note about emoji endpoints similarities
[ci skip]
kaniini [Sun, 27 Jan 2019 12:45:50 +0000 (12:45 +0000)]
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
projects / akkoma / log