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
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
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
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
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
46dba03098
rich media: parser: only try to validate strings, not numbers (OEmbed)
2019-01-31 16:19:31 +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
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
6b54a3ec0b
Merge branch 'multiple-hackney-pools' into 'develop'
...
Fix 4aff4efapleroma/pleroma!743
2019-01-30 20:18:05 +00:00
5ea0397e2d
Fix 4aff4efa typos
2019-01-30 21:08:41 +01:00
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
47ec690c54
Use race-condition free mass follow.
2019-01-30 19:33:25 +01:00
935e65e261
Use race-condition free following method.
2019-01-30 19:21:04 +01:00
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
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
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
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
cbb2b709de
activitypub: transmogrifier: fix follow request rejections
2019-01-29 11:57:46 +00:00
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
2019-01-29 13:12:28 +03:00
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
2019-01-29 05:11:08 +00:00
61d6715714
rich media: oembed: return data in the same format as the other parsers
2019-01-28 21:13:25 +00:00
ddb5545202
rich media: kill some testsuite noise
2019-01-28 20:55:33 +00:00
0f11254a06
rich media: parser: add some basic sanity checks on the returned data with pattern matching
2019-01-28 20:43:21 +00:00
83b7062634
rich media: parser: cache negatives
2019-01-28 20:19:07 +00:00
8fb16e9f0f
rich media: parser: add copyright header
2019-01-28 20:00:01 +00:00
50d6183893
Split hide_network into hide_followers & hide_followings
2019-01-28 21:40:08 +03:00
f53d464db0
Put deprecation warnings undre Pleroma.Config.
2019-01-28 14:39:54 +01:00
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
2019-01-28 15:39:14 +03:00
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
2019-01-28 15:25:06 +03:00
8e8a1e1ba8
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.
2019-01-28 13:07:12 +01:00
href
William Pitcock
eugenijm
Luna
Haelwenn (lanodan) Monnier
kaniini
lambda
href
lain
rinpatch
Haelwenn
Ivan Tashkinov
Maxim Filippov