035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
6 years ago
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
6 years ago
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
6 years ago
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
6 years ago
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
6 years ago
ecdb0b7f57
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
...
mastodon api: fix rendering of cards without image URLs (closes #597 )
Closes #597
See merge request pleroma/pleroma!777
6 years ago
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
6 years ago
f8b831ecfd
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
...
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
6 years ago
a2bb5d890d
html: don't attempt to parse nil content
6 years ago
e71ab5a10f
activitypub: transmogrifier: fix bare tags
6 years ago
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
6 years ago
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
6 years ago
03991e7bc5
Merge branch 'feature/mrf-tag' into 'develop'
...
MRF TagPolicy engine
See merge request pleroma/pleroma!768
6 years ago
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
6 years ago
64a3993425
activitypub: mrf: tag policy: add support for subscription control
6 years ago
3ae11835a9
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
...
fix hellthread threshold deprecation warning
See merge request pleroma/pleroma!770
6 years ago
4031c94a59
fix hellthread threshold deprecation warning
6 years ago
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
6 years ago
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
6 years ago
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
6 years ago
88e32a32ce
mrf: add initial MRF.TagPolicy engine
6 years ago
25a659d2dc
Merge branch 'mime-riff' into 'develop'
...
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
6 years ago
127f99ae18
Mime: detect RIFF formats (wave, webp, avi)
6 years ago
00835bf678
Merge branch 'fix/rich-media-relative-path' into 'develop'
...
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
6 years ago
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
58262a8b8a
removed a debug thingy
6 years ago
4430641349
squished a bug
6 years ago
3cf046babb
actually commited the changes
6 years ago
63a4f4b7be
fixed Map,put arguments, updated nomenclature
6 years ago
583c4e0f17
more tweaks, fixed silly mistakes...
6 years ago
e10cda7541
implemented tweaks
6 years ago
c57f37bd36
Merge branch 'mogrify-orient' into 'develop'
...
Update Mogrify docs and warning for deprecated syntax
See merge request pleroma/pleroma!763
6 years ago
531507a635
fixed things
6 years ago
10130fa7d6
made toggleable, added docs
6 years ago
0ef0ae35ab
added optional delist feature
6 years ago
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
69a38644bc
Merge branch '589-fix-cache' into 'develop'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
6 years ago
505a084058
Still do caching in tests.
6 years ago
0c08bd4181
Update Mogrify docs and warning for deprecated syntax to encourage
...
users to enable both strip and auto-orient
6 years ago
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
...
Added tests.
6 years ago
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
6 years ago
2c59eb3cfc
Add responsive features to layout
6 years ago
68d461b3a9
Check if rich media uri is relative
6 years ago
833404f0f5
Use with instead of if in the card
6 years ago
e4d18f328b
merge only if page_url is an absolute path
6 years ago
cbadf9d333
Fix rich media relative path
6 years ago
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
28bfb09b01
Merge branch 'hotfix/object-normalize-cache' into 'develop'
...
object: use cached accesses when possible in Object.normalize()
See merge request pleroma/pleroma!757
6 years ago
ffbf306c9a
Merge branch 'streaming-api-url-fix' into 'develop'
...
Fix WebSocket streaming API URL.
See merge request pleroma/pleroma!756
6 years ago
af10ef8d4e
object: use cached accesses when possible in Object.normalize()
6 years ago
a184811a60
Use url() instead of static_url in Endpoint.websocket_url()
6 years ago
7e384a2425
Merge branch 'develop' into 'develop'
...
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
6 years ago
9cac8729af
update nodeinfo version when requesting 2.1
6 years ago
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.
6 years ago
1cdcee89da
mix format pass
6 years ago
23b1c64a19
downcase software name in nodeinfo
6 years ago
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
6 years ago
74c6119f28
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list
6 years ago
cd6db6abe4
use Mix.Project.Config for some Application functions
6 years ago
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
fc7644798d
Merge branch 'serve-sw-pleroma.js' into 'develop'
...
Serve sw-pleroma.js properly
See merge request pleroma/pleroma!754
6 years ago
fa5ec765d9
Serve sw-pleroma.js properly
6 years ago
01d483f9c7
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
6 years ago
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
b0c4c082c4
mix format pass
6 years ago
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
b19b4f8537
Remove default value for rich media.
...
Setting it to true will actually override a 'false' set before.
6 years ago
308b35ebe2
User.follow_all: ensure its stays unique
6 years ago
44913c1019
Merge branch 'bugfix/rich-media-non-unicode' into 'develop'
...
rich media non-unicode bugfix
See merge request pleroma/pleroma!749
6 years ago
46dba03098
rich media: parser: only try to validate strings, not numbers (OEmbed)
6 years ago
dafb6f0b5e
rich media: parser: reject OGP fields we cannot safely process
6 years ago
7057891db6
Make rich media support toggleable
6 years ago
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
6 years ago
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
6 years ago
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
6b54a3ec0b
Merge branch 'multiple-hackney-pools' into 'develop'
...
Fix 4aff4efapleroma/pleroma!743
6 years ago
5ea0397e2d
Fix 4aff4efa typos
6 years ago
bd5086731e
Merge branch 'multiple-hackney-pools' into 'develop'
...
Use multiple hackney pools
See merge request pleroma/pleroma!739
6 years ago
47ec690c54
Use race-condition free mass follow.
6 years ago
935e65e261
Use race-condition free following method.
6 years ago
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
7a2c4f984b
Merge branch 'bugfix/fix-rejects' into 'develop'
...
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
6 years ago
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
57549f6043
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
6 years ago
cbb2b709de
activitypub: transmogrifier: fix follow request rejections
6 years ago
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
6 years ago
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
6 years ago
61d6715714
rich media: oembed: return data in the same format as the other parsers
6 years ago
ddb5545202
rich media: kill some testsuite noise
6 years ago
0f11254a06
rich media: parser: add some basic sanity checks on the returned data with pattern matching
6 years ago
83b7062634
rich media: parser: cache negatives
6 years ago
8fb16e9f0f
rich media: parser: add copyright header
6 years ago
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
f53d464db0
Put deprecation warnings undre Pleroma.Config.
6 years ago
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
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.
6 years ago
f1d58c5c49
Don't run warnings in a task.
6 years ago
de0fb88a9c
Merge branch 'safe-render-activities' into 'develop'
...
remove unnecessary filter (re !723 )
See merge request pleroma/pleroma!729
6 years ago
eugenijm