09e1c8c05d
Merge branch 'revert-0a82a7e6' into 'develop'
...
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
See merge request pleroma/pleroma!758
2019-02-01 20:23:55 +00:00
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
2019-02-01 20:22:58 +00:00
28bfb09b01
Merge branch 'hotfix/object-normalize-cache' into 'develop'
...
object: use cached accesses when possible in Object.normalize()
See merge request pleroma/pleroma!757
2019-02-01 19:45:55 +00:00
ffbf306c9a
Merge branch 'streaming-api-url-fix' into 'develop'
...
Fix WebSocket streaming API URL.
See merge request pleroma/pleroma!756
2019-02-01 19:39:50 +00:00
af10ef8d4e
object: use cached accesses when possible in Object.normalize()
2019-02-01 19:38:57 +00:00
a184811a60
Use url() instead of static_url in Endpoint.websocket_url()
2019-02-01 22:35:19 +03:00
7e384a2425
Merge branch 'develop' into 'develop'
...
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
2019-02-01 19:18:46 +00:00
9cac8729af
update nodeinfo version when requesting 2.1
2019-02-01 16:03:23 -03:00
d747bd9870
Use String.replace_leading instead of String.replace for getting websocket streaming api url.
...
Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function.
2019-02-01 21:58:43 +03:00
1cdcee89da
mix format pass
2019-02-01 14:40:43 -03:00
23b1c64a19
downcase software name in nodeinfo
2019-02-01 14:35:08 -03:00
e8c7be38fc
add tests for nodeinfo 2.0 compat and 2.1's new field
2019-02-01 14:33:14 -03:00
389e6a878a
Merge branch 'bugfix/get_list_return_404' into 'develop'
...
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list
See merge request pleroma/pleroma!755
2019-02-01 17:27:50 +00:00
b17ce875cf
keep compatibility with nodeinfo 2.0
...
splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler
gives the same result, while the 2.1 handler inserts the
software.repository field. requested by @href
2019-02-01 14:23:40 -03:00
74c6119f28
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list
2019-02-01 18:21:16 +01:00
cd6db6abe4
use Mix.Project.Config for some Application functions
2019-02-01 14:11:23 -03:00
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
2019-02-01 17:05:29 +00:00
fc7644798d
Merge branch 'serve-sw-pleroma.js' into 'develop'
...
Serve sw-pleroma.js properly
See merge request pleroma/pleroma!754
2019-02-01 14:24:07 +00:00
fa5ec765d9
Serve sw-pleroma.js properly
2019-02-01 11:34:41 +01:00
ddab8d45ec
Merge branch 'fix-rich-media-toggle' into 'develop'
...
Remove default value for rich media.
See merge request pleroma/pleroma!751
2019-02-01 09:33:50 +00:00
01d483f9c7
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
2019-02-01 10:21:17 +01:00
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
b0c4c082c4
mix format pass
2019-02-01 04:02:40 -03:00
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
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
a7c55c61bb
docs/Pleroma-API.md: Add missing token field documentation
...
[ci skip]
2019-01-31 23:23:53 +01:00
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
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
308b35ebe2
User.follow_all: ensure its stays unique
2019-01-31 18:17:44 +01:00
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
106475f265
test: http mocks: formatting
2019-01-31 16:30:56 +00:00
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
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
3f5b784596
test: rich media: parser: add malformed data regression test
2019-01-31 16:19:53 +00:00
46dba03098
rich media: parser: only try to validate strings, not numbers (OEmbed)
2019-01-31 16:19:31 +00:00
4e76f9fde1
test: add malformed OGP data fixture
2019-01-31 16:12:35 +00:00
dafb6f0b5e
rich media: parser: reject OGP fields we cannot safely process
2019-01-31 16:03:56 +00:00
7057891db6
Make rich media support toggleable
2019-01-31 18:18:20 +03:00
a0dc95d084
Clarify the description of the `logo_mask` configuration key.
2019-01-31 13:14:22 +00:00
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
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
2019-01-31 12:16:23 +00:00
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
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
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
de0c1c641a
[MastodonFE] Update Frontend (glitch)
2019-01-31 10:35:44 +01:00
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
242748cc54
Reformat to make markdownlint happy and other little typographic things
2019-01-30 22:26:10 +01:00
388475c478
Add reference to Pleroma Wiki in the Readme
2019-01-30 22:15:52 +01:00
6b54a3ec0b
Merge branch 'multiple-hackney-pools' into 'develop'
...
Fix 4aff4efapleroma/pleroma!743
2019-01-30 20:18:05 +00:00
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
kaniini
href
William Pitcock
eugenijm
Luna
Haelwenn
Haelwenn (lanodan) Monnier
lambda
href
lain
rinpatch
Alice
shibayashi