lambda
|
9908cf8fda
|
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
|
2018-08-15 07:47:33 +00:00 |
|
William Pitcock
|
f446e75577
|
activitypub: transmogrifier: add necessary translations for kroeg
|
2018-08-14 17:09:11 +00:00 |
|
eal
|
92caa2632b
|
Use Image type for emoji icons.
|
2018-08-13 16:21:18 +03:00 |
|
eal
|
1ed1ff17a4
|
ActivityPub user view: include tag if present.
|
2018-08-13 16:11:48 +03:00 |
|
eal
|
f9d13558c8
|
CommonAPI: add emoji to user source data on update
|
2018-08-13 15:27:20 +03:00 |
|
lain
|
8c0c930041
|
formatting
|
2018-08-12 19:42:21 +02:00 |
|
lain
|
ffd9ad1f0c
|
Fix for elixir 1.7.
|
2018-08-12 18:41:33 +02:00 |
|
lambda
|
13440a80e1
|
Merge branch 'feature/invites' into 'develop'
Invites
Closes #108
See merge request pleroma/pleroma!208
|
2018-08-12 12:04:15 +00:00 |
|
lambda
|
9de6145737
|
Merge branch 'fix/remote-follow-errormessage' into 'develop'
Remote follow: don't show confusing error if already following
See merge request pleroma/pleroma!267
|
2018-08-12 10:55:53 +00:00 |
|
eal
|
db5cdfa333
|
Remote follow: don't show confusing error if already following
|
2018-08-09 20:47:29 +03:00 |
|
eal
|
37b802682c
|
HTML-sanitize usernames before emojifying.
|
2018-08-09 13:07:03 +03:00 |
|
eal
|
ed9738e031
|
Add tests for emoji in user profiles
Also use the correct field in TwitterAPI...
|
2018-08-08 09:24:50 +03:00 |
|
eal
|
cee63ad3f7
|
TwitterAPI user view: add screen_name_html and description_html.
|
2018-08-08 08:38:25 +03:00 |
|
eal
|
c2d1a5e9c4
|
MastoAPI AccountView: render profile emoji.
|
2018-08-07 21:56:50 +03:00 |
|
William Pitcock
|
de6be63b1b
|
activitypub: do not show observable effects of non-public boosts
|
2018-08-06 11:28:57 +00:00 |
|
William Pitcock
|
5202d4ce10
|
relay: do not relay in test mode
|
2018-08-06 08:35:56 +00:00 |
|
William Pitcock
|
0ca9b9ff96
|
run mix format
|
2018-08-06 08:26:36 +00:00 |
|
William Pitcock
|
5abf9ad602
|
relay: reintroduce @allow_relay
|
2018-08-06 08:22:18 +00:00 |
|
William Pitcock
|
1e1a29f084
|
activitypub: relay: fix up AS2 actor object
|
2018-08-06 08:22:17 +00:00 |
|
William Pitcock
|
e49131bb72
|
relay: move to /relay endpoint from / due to webapp issues
|
2018-08-06 08:22:16 +00:00 |
|
William Pitcock
|
2b628f2341
|
relay: only relay create activities
|
2018-08-06 08:22:16 +00:00 |
|
William Pitcock
|
56dc8db582
|
activitypub: relay: add relay following/followers collection URLs
|
2018-08-06 08:22:14 +00:00 |
|
William Pitcock
|
1c40a631e8
|
federator: actually relay the public activities
|
2018-08-06 08:22:14 +00:00 |
|
William Pitcock
|
f9b0fc4ddb
|
relay: remove @allow_relay for the moment
|
2018-08-06 08:22:13 +00:00 |
|
William Pitcock
|
266b314051
|
relay: fix invoking federator, use a timer to sleep the mix task to force a context switch
|
2018-08-06 08:22:12 +00:00 |
|
William Pitcock
|
99be3d3dcc
|
relay: add relay follow/unfollow tasks
|
2018-08-06 08:22:12 +00:00 |
|
William Pitcock
|
1c90f88393
|
user: remote actors can have no nickname if they are virtual services
|
2018-08-06 08:22:11 +00:00 |
|
William Pitcock
|
7bed350a23
|
config: allow relaying to be disabled
|
2018-08-06 08:22:10 +00:00 |
|
William Pitcock
|
b7ca7f282a
|
activitypub: refactor relay concerns into new relay module
|
2018-08-06 08:22:10 +00:00 |
|
William Pitcock
|
00e890264c
|
activitypub: represent relay actor at instance root
|
2018-08-06 08:22:09 +00:00 |
|
Hakaba Hitoyo
|
f72cfada1a
|
add suggestions/web config
|
2018-08-02 18:03:35 +09:00 |
|
William Pitcock
|
3be58ad34e
|
activitypub: actually send digest header when federating
this is needed for backwards compatibility with non-digest pleroma instances
|
2018-08-01 10:32:02 +00:00 |
|
William Pitcock
|
8da406afa2
|
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header
|
2018-07-31 23:24:30 +00:00 |
|
William Pitcock
|
2890aef9e8
|
activitypub: add digest header to outbound messages and sign it
|
2018-07-31 23:24:30 +00:00 |
|
Hakaba Hitoyo
|
cc9c062b55
|
merge
|
2018-07-19 17:42:00 +09:00 |
|
lambda
|
41b0ecef95
|
Merge branch 'tests/plume' into 'develop'
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
|
2018-07-19 07:35:34 +00:00 |
|
lambda
|
54963a6379
|
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251
|
2018-07-19 07:31:33 +00:00 |
|
lambda
|
6f23fb53d3
|
Merge branch 'feature/fe-configuration' into 'develop'
serverside frontend configuration
See merge request pleroma/pleroma!256
|
2018-07-19 07:31:10 +00:00 |
|
Hakaba Hitoyo
|
b12d17d2ce
|
configurable timeout
|
2018-07-18 13:36:20 +09:00 |
|
Hakaba Hitoyo
|
e4dd58307a
|
better configuration
|
2018-07-18 09:58:59 +09:00 |
|
William Pitcock
|
b23630076f
|
TwitterAPI: present pleroma frontend config in API
|
2018-07-17 15:46:24 +00:00 |
|
William Pitcock
|
cf219b6add
|
config: make instance description configurable
|
2018-07-17 15:46:23 +00:00 |
|
Hakaba Hitoyo
|
5b4a21317d
|
correct error message
|
2018-07-17 17:29:18 +09:00 |
|
Hakaba Hitoyo
|
8ff336e02a
|
debug
|
2018-07-17 17:00:14 +09:00 |
|
Hakaba Hitoyo
|
2b7b1b3e6b
|
add suggestionsThirdPartyEngine into /nodeinfo/2.0.json
|
2018-07-17 16:56:30 +09:00 |
|
Hakaba Hitoyo
|
d76f0d87be
|
do nothing if configuration is skipped
|
2018-07-17 16:45:18 +09:00 |
|
Hakaba Hitoyo
|
df3233e7e7
|
improve getting host name
|
2018-07-17 13:20:58 +09:00 |
|
William Pitcock
|
99c0252314
|
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
|
2018-07-17 03:40:47 +00:00 |
|
William Pitcock
|
cd19d37a90
|
mastodon api: use object name as alt text
|
2018-07-17 03:40:46 +00:00 |
|
hakabahitoyo
|
e7c580828c
|
format
|
2018-07-15 20:36:26 +09:00 |
|
hakabahitoyo
|
2eeaf01627
|
id field
|
2018-07-14 14:03:30 +09:00 |
|
hakabahitoyo
|
127882a5d5
|
configurable
|
2018-07-14 11:41:09 +09:00 |
|
hakabahitoyo
|
eb0afda3a7
|
http access to third party user recommendation
|
2018-07-14 10:04:37 +09:00 |
|
hakabahitoyo
|
3812b627ca
|
better mock /api/v1/suggestions
|
2018-07-14 00:52:23 +09:00 |
|
hakabahitoyo
|
4a21c1b343
|
mock /api/v1/suggestions
|
2018-07-14 00:44:18 +09:00 |
|
hakabahitoyo
|
f944f8157a
|
/api/v1/suggestions endpoint
|
2018-07-14 00:21:38 +09:00 |
|
Haelwenn (lanodan) Monnier
|
7501481db4
|
[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding
|
2018-07-12 23:37:07 +02:00 |
|
Haelwenn (lanodan) Monnier
|
8472fba2a7
|
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object
The code here is copied from feature/peertube by lain.
Co-authored-by: lain <lain@soykaf.club>
|
2018-07-12 23:37:00 +02:00 |
|
William Pitcock
|
0899588e4d
|
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
|
2018-07-12 17:15:47 +00:00 |
|
lambda
|
d93789dfde
|
Merge branch 'feature/object-normalization' into 'develop'
object normalization
See merge request pleroma/pleroma!238
|
2018-07-12 16:48:15 +00:00 |
|
lambda
|
ceffb91065
|
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes #229
See merge request pleroma/pleroma!235
|
2018-07-12 16:47:19 +00:00 |
|
lambda
|
b1fcfcfae1
|
Merge branch 'bugfix/activitypub-object-actor' into 'develop'
activitypub: more robustly handle object-to-actor associations
See merge request pleroma/pleroma!250
|
2018-07-12 16:46:50 +00:00 |
|
William Pitcock
|
590d4df77c
|
activitypub: more robustly handle object-to-actor associations
|
2018-07-12 16:39:03 +00:00 |
|
William Pitcock
|
b832df1e15
|
formatting
|
2018-07-12 16:12:54 +00:00 |
|
William Pitcock
|
f03e57f764
|
twitter api: activity representer: add summary field for testsuite
|
2018-07-12 16:12:16 +00:00 |
|
William Pitcock
|
152a526237
|
twitter api: refactor activity html generation, add support for Articles
|
2018-07-12 16:11:42 +00:00 |
|
William Pitcock
|
3b799f22b7
|
twitterapi: activity view: expose message summary text
|
2018-07-12 16:11:36 +00:00 |
|
lambda
|
b806aa36c8
|
Update nodeinfo_controller.ex
|
2018-07-12 06:00:55 +00:00 |
|
lambda
|
fe4387077a
|
Merge branch 'feature/default-scope' into 'develop'
default scope setting
See merge request pleroma/pleroma!239
|
2018-07-12 05:59:12 +00:00 |
|
lambda
|
4a922305af
|
Merge branch 'feature/article-support' into 'develop'
article support (plume, etc)
See merge request pleroma/pleroma!240
|
2018-07-12 05:58:39 +00:00 |
|
lambda
|
33b0334216
|
Merge branch 'bugfix/status-url-field' into 'develop'
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
Closes #231
See merge request pleroma/pleroma!246
|
2018-07-12 05:55:20 +00:00 |
|
William Pitcock
|
8546551257
|
activitypub: switch to using x509 representation for public keys instead of pkcs#1
|
2018-07-12 03:30:22 +00:00 |
|
Haelwenn (lanodan) Monnier
|
4326cb9920
|
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes: https://git.pleroma.social/pleroma/pleroma/issues/229
|
2018-07-12 02:06:46 +02:00 |
|
Haelwenn (lanodan) Monnier
|
7a351cb36f
|
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
|
2018-07-12 01:57:25 +02:00 |
|
Haelwenn (lanodan) Monnier
|
835345754d
|
/web/* template: Add class system-font
|
2018-07-03 17:26:47 +02:00 |
|
William Pitcock
|
971bb4f2bd
|
activity interpretation: formatting
|
2018-06-27 13:38:19 +00:00 |
|
William Pitcock
|
66819ea784
|
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
|
2018-06-27 13:38:07 +00:00 |
|
William Pitcock
|
ea982e7503
|
mastodon api: add interpreter for Article activity types
|
2018-06-27 13:38:00 +00:00 |
|
William Pitcock
|
121c1f6230
|
twitter api: refactor activity html generation, add support for Articles
|
2018-06-27 13:37:53 +00:00 |
|
William Pitcock
|
bd479606ba
|
utils: make_create_data: add support for Article objects
|
2018-06-27 13:37:35 +00:00 |
|
William Pitcock
|
c42f28b82c
|
transmogrifier: accept Article activities
|
2018-06-27 13:37:26 +00:00 |
|
William Pitcock
|
2f14996d9a
|
twitter api: allow setting default_scope
|
2018-06-27 13:15:55 +00:00 |
|
William Pitcock
|
dcdf7b6686
|
twitter api: user view: show default message scope if known
|
2018-06-27 13:15:50 +00:00 |
|
William Pitcock
|
4f6de34f4f
|
mastodon api: use info["default_scope"] if available for post scope
|
2018-06-27 13:15:42 +00:00 |
|
William Pitcock
|
7c63e70de1
|
activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.
|
2018-06-27 13:08:12 +00:00 |
|
William Pitcock
|
6f4ca7ddf7
|
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
|
2018-06-27 13:08:05 +00:00 |
|
William Pitcock
|
5b240c3b18
|
federator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
|
2018-06-27 13:07:55 +00:00 |
|
William Pitcock
|
bc05548370
|
ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.
|
2018-06-27 13:07:45 +00:00 |
|
William Pitcock
|
49da04c509
|
common api: use Object.normalize() instead of Object.get_by_ap_id() directly.
|
2018-06-27 13:07:35 +00:00 |
|
William Pitcock
|
15d624e077
|
activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.
|
2018-06-27 13:07:29 +00:00 |
|
William Pitcock
|
fb04fecfb4
|
streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.
|
2018-06-27 13:07:23 +00:00 |
|
Haelwenn (lanodan) Monnier
|
beb940a57e
|
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
Related to https://git.pleroma.social/pleroma/mastofe/issues/20
|
2018-06-26 20:48:35 +02:00 |
|
lambda
|
fc012491a5
|
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
|
2018-06-25 08:45:42 +00:00 |
|
lambda
|
dfc96f222c
|
Merge branch 'feature/configurable-blocks' into 'develop'
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
|
2018-06-25 06:12:29 +00:00 |
|
squidboi
|
ea214b8ba6
|
combined outgoing_blocks with statement
|
2018-06-24 23:05:44 -07:00 |
|
Vivian Lim
|
6160a1b3c0
|
mix format
|
2018-06-24 15:24:41 -07:00 |
|
Vivian Lim
|
1299bccc7d
|
return unquoted empty array from /api/qvitter/mutes.json
|
2018-06-23 23:20:30 -07:00 |
|
Vivian Lim
|
6316003946
|
fixes- found that TwitterAPI.Controller adds .json suffix already
|
2018-06-23 23:05:54 -07:00 |
|
Vivian Lim
|
f2badd4424
|
return empty array for api/qvitter/mutes.json queries instead of html
|
2018-06-23 22:21:39 -07:00 |
|
squidboi
|
c4038ede07
|
fix mind-crushingly dumb syntax error
|
2018-06-23 14:32:00 -07:00 |
|