lambda
fc7644798d
Merge branch 'serve-sw-pleroma.js' into 'develop'
...
Serve sw-pleroma.js properly
See merge request pleroma/pleroma!754
6 years ago
href
fa5ec765d9
Serve sw-pleroma.js properly
6 years ago
lambda
ddab8d45ec
Merge branch 'fix-rich-media-toggle' into 'develop'
...
Remove default value for rich media.
See merge request pleroma/pleroma!751
6 years ago
lain
01d483f9c7
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
6 years ago
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
Luna
b0c4c082c4
mix format pass
6 years ago
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
6 years ago
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
6 years ago
Haelwenn (lanodan) Monnier
a7c55c61bb
docs/Pleroma-API.md: Add missing token field documentation
...
[ci skip]
6 years ago
lain
b19b4f8537
Remove default value for rich media.
...
Setting it to true will actually override a 'false' set before.
6 years ago
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
6 years ago
href
308b35ebe2
User.follow_all: ensure its stays unique
6 years ago
lambda
44913c1019
Merge branch 'bugfix/rich-media-non-unicode' into 'develop'
...
rich media non-unicode bugfix
See merge request pleroma/pleroma!749
6 years ago
William Pitcock
106475f265
test: http mocks: formatting
6 years ago
kaniini
dea33f4aec
Merge branch 'develop' into 'develop'
...
Clarify the description of the `logo_mask` configuration key.
See merge request pleroma/pleroma!747
6 years ago
kaniini
fb9730010e
Merge branch 'fix/rich-media-disable-in-config' into 'develop'
...
Make rich media support toggleable
See merge request pleroma/pleroma!748
6 years ago
William Pitcock
3f5b784596
test: rich media: parser: add malformed data regression test
6 years ago
William Pitcock
46dba03098
rich media: parser: only try to validate strings, not numbers (OEmbed)
6 years ago
William Pitcock
4e76f9fde1
test: add malformed OGP data fixture
6 years ago
William Pitcock
dafb6f0b5e
rich media: parser: reject OGP fields we cannot safely process
6 years ago
rinpatch
7057891db6
Make rich media support toggleable
6 years ago
Alice
a0dc95d084
Clarify the description of the `logo_mask` configuration key.
6 years ago
lambda
bd89cdbe31
Merge branch 'revert-4d3655c4' into 'develop'
...
Revert "Merge branch 'spc-fix-3' into 'develop'"
See merge request pleroma/pleroma!745
6 years ago
lambda
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
6 years ago
kaniini
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
6 years ago
Haelwenn
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
Haelwenn
5f40f4f74d
Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'
...
[MastodonFE] Update Frontend (glitch)
See merge request pleroma/pleroma!730
6 years ago
Haelwenn (lanodan) Monnier
de0c1c641a
[MastodonFE] Update Frontend (glitch)
6 years ago
Egor Kislitsyn
58e250d9d2
fix merge
6 years ago
Egor Kislitsyn
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
kaniini
95d6118090
Merge branch 'add-wiki-reference-to-readme' into 'develop'
...
Add wiki reference to readme
See merge request pleroma/pleroma!744
6 years ago
shibayashi
242748cc54
Reformat to make markdownlint happy and other little typographic things
6 years ago
shibayashi
388475c478
Add reference to Pleroma Wiki in the Readme
6 years ago
lambda
6b54a3ec0b
Merge branch 'multiple-hackney-pools' into 'develop'
...
Fix 4aff4efa
typos
See merge request pleroma/pleroma!743
6 years ago
lambda
45d22269e7
Merge branch '2019-1-30-update-frontend' into 'develop'
...
update frontend
See merge request pleroma/pleroma!742
6 years ago
href
5ea0397e2d
Fix 4aff4efa
typos
6 years ago
lain
88a40308d3
update frontend
6 years ago
kaniini
bd5086731e
Merge branch 'multiple-hackney-pools' into 'develop'
...
Use multiple hackney pools
See merge request pleroma/pleroma!739
6 years ago
kaniini
6fe01a3234
Merge branch 'better-following' into 'develop'
...
Use race condition free queries for following / unfollowing
See merge request pleroma/pleroma!740
6 years ago
lain
c53b96a024
Fix specs.
6 years ago
lain
47ec690c54
Use race-condition free mass follow.
6 years ago
lain
935e65e261
Use race-condition free following method.
6 years ago
Egor Kislitsyn
ab31adf15b
tiny improve
6 years ago
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.
6 years ago
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
6 years ago
Haelwenn (lanodan) Monnier
7db517ff06
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
6 years ago
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
6 years ago
Haelwenn (lanodan) Monnier
aa492af6c2
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
...
[ci skip]
6 years ago
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
6 years ago
Haelwenn (lanodan) Monnier
3f9d0c08ea
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
...
[ci skip]
6 years ago