nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4044 commits 2 branches 0 tags 272 MiB
Commit graph

4044 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain 01d483f9c7 Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle 2019-02-01 10:21:17 +01:00
href b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop' 
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703
 2019-02-01 09:14:35 +00:00
Luna b0c4c082c4 mix format pass 2019-02-01 04:02:40 -03:00
Luna c05928dbda use nodeinfo 2.1, add repository field 
that is the only change from nodeinfo 2.0 to 2.1

also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
 2019-02-01 03:55:10 -03:00
Haelwenn 0340fcaeca Merge branch 'docs/pleroma-api-invite-token' into 'develop' 
docs/Pleroma-API.md: Add missing token field documentation

See merge request pleroma/pleroma!752
 2019-01-31 22:28:08 +00:00
Haelwenn (lanodan) Monnier a7c55c61bb
docs/Pleroma-API.md: Add missing token field documentation 
[ci skip]
 2019-01-31 23:23:53 +01:00
lain b19b4f8537 Remove default value for rich media. 
Setting it to true will actually override a 'false' set before.
 2019-01-31 20:02:08 +01:00
kaniini e914eeb632 Merge branch 'user-follow-all-unique' into 'develop' 
User.follow_all: ensure the following array stays unique

See merge request pleroma/pleroma!750
 2019-01-31 18:50:00 +00:00
href 308b35ebe2
User.follow_all: ensure its stays unique 2019-01-31 18:17:44 +01:00
lambda 44913c1019 Merge branch 'bugfix/rich-media-non-unicode' into 'develop' 
rich media non-unicode bugfix

See merge request pleroma/pleroma!749
 2019-01-31 16:54:48 +00:00
William Pitcock 106475f265 test: http mocks: formatting 2019-01-31 16:30:56 +00:00
kaniini dea33f4aec Merge branch 'develop' into 'develop' 
Clarify the description of the `logo_mask` configuration key.

See merge request pleroma/pleroma!747
 2019-01-31 16:28:40 +00:00
kaniini fb9730010e Merge branch 'fix/rich-media-disable-in-config' into 'develop' 
Make rich media support toggleable

See merge request pleroma/pleroma!748
 2019-01-31 16:22:26 +00:00
William Pitcock 3f5b784596 test: rich media: parser: add malformed data regression test 2019-01-31 16:19:53 +00:00
William Pitcock 46dba03098 rich media: parser: only try to validate strings, not numbers (OEmbed) 2019-01-31 16:19:31 +00:00
William Pitcock 4e76f9fde1 test: add malformed OGP data fixture 2019-01-31 16:12:35 +00:00
William Pitcock dafb6f0b5e rich media: parser: reject OGP fields we cannot safely process 2019-01-31 16:03:56 +00:00
rinpatch 7057891db6 Make rich media support toggleable 2019-01-31 18:18:20 +03:00
Alice a0dc95d084 Clarify the description of the logo_mask configuration key. 2019-01-31 13:14:22 +00:00
lambda bd89cdbe31 Merge branch 'revert-4d3655c4' into 'develop' 
Revert "Merge branch 'spc-fix-3' into 'develop'"

See merge request pleroma/pleroma!745
 2019-01-31 12:16:44 +00:00
lambda a43a1c6d4e Revert "Merge branch 'spc-fix-3' into 'develop'" 
This reverts merge request !682
 2019-01-31 12:16:23 +00:00
kaniini 4d3655c479 Merge branch 'spc-fix-3' into 'develop' 
Spc fix 3

See merge request pleroma/pleroma!682
 2019-01-31 11:29:29 +00:00
Haelwenn 00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop' 
Features/glitch soc frontend

See merge request pleroma/pleroma!192
 2019-01-31 10:16:11 +00:00
Haelwenn 5f40f4f74d Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop' 
[MastodonFE] Update Frontend (glitch)

See merge request pleroma/pleroma!730
 2019-01-31 10:12:48 +00:00
Haelwenn (lanodan) Monnier de0c1c641a
[MastodonFE] Update Frontend (glitch) 2019-01-31 10:35:44 +01:00
Egor Kislitsyn 58e250d9d2 fix merge 2019-01-31 15:23:50 +07:00
Egor Kislitsyn d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs 2019-01-31 15:07:49 +07:00
kaniini 95d6118090 Merge branch 'add-wiki-reference-to-readme' into 'develop' 
Add wiki reference to readme

See merge request pleroma/pleroma!744
 2019-01-30 21:38:15 +00:00
shibayashi 242748cc54
Reformat to make markdownlint happy and other little typographic things 2019-01-30 22:26:10 +01:00
shibayashi 388475c478
Add reference to Pleroma Wiki in the Readme 2019-01-30 22:15:52 +01:00
lambda 6b54a3ec0b Merge branch 'multiple-hackney-pools' into 'develop' 
Fix 4aff4efa typos

See merge request pleroma/pleroma!743
 2019-01-30 20:18:05 +00:00
lambda 45d22269e7 Merge branch '2019-1-30-update-frontend' into 'develop' 
update frontend

See merge request pleroma/pleroma!742
 2019-01-30 20:17:22 +00:00
href 5ea0397e2d
Fix 4aff4efa typos 2019-01-30 21:08:41 +01:00
lain 88a40308d3 update frontend 2019-01-30 21:04:58 +01:00
kaniini bd5086731e Merge branch 'multiple-hackney-pools' into 'develop' 
Use multiple hackney pools

See merge request pleroma/pleroma!739
 2019-01-30 19:01:57 +00:00
kaniini 6fe01a3234 Merge branch 'better-following' into 'develop' 
Use race condition free queries for following / unfollowing

See merge request pleroma/pleroma!740
 2019-01-30 18:50:00 +00:00
lain c53b96a024 Fix specs. 2019-01-30 19:45:31 +01:00
lain 47ec690c54 Use race-condition free mass follow. 2019-01-30 19:33:25 +01:00
lain 935e65e261 Use race-condition free following method. 2019-01-30 19:21:04 +01:00
Egor Kislitsyn ab31adf15b tiny improve 2019-01-30 22:56:59 +07:00
href 4aff4efa8d
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.
 2019-01-30 15:06:46 +01:00
Haelwenn aa98a100b4 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
 2019-01-30 10:56:53 +00:00
Haelwenn (lanodan) Monnier 7db517ff06
docs/config.md: Fix syntax, pleroma_fe isn’t an atom 2019-01-30 11:51:12 +01:00
kaniini cfda532d16 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
 2019-01-30 10:38:41 +00:00
Haelwenn (lanodan) Monnier aa492af6c2
docs/config.md: Fix typo, provide an example key with camelCase and where to find more 
[ci skip]
 2019-01-30 11:33:39 +01:00
lambda 97694eb451 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
 2019-01-29 19:24:30 +00:00
Haelwenn (lanodan) Monnier 3f9d0c08ea
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it 
[ci skip]
 2019-01-29 19:11:54 +01:00
kaniini 7a2c4f984b Merge branch 'bugfix/fix-rejects' into 'develop' 
follow request fixups

Closes #537

See merge request pleroma/pleroma!734
 2019-01-29 14:47:36 +00:00
kaniini d03a116654 Merge branch 'hj-happiness-improvement' into 'develop' 
New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700
 2019-01-29 13:54:10 +00:00
William Pitcock 57549f6043 activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target 2019-01-29 12:21:02 +00:00