Egor Kislitsyn
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07:00
Egor Kislitsyn
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
2019-01-31 15:07:49 +07:00
Ivan Tashkinov
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
Egor Kislitsyn
55affbca7f
add a job queue
2019-01-28 22:17:17 +07:00
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged upstream/develop
.
2019-01-28 15:39:14 +03:00
Ivan Tashkinov
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
2019-01-28 11:03:52 +03:00
href
71bb90073b
/notice/:id - send the FE index even if 404
...
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
2019-01-27 22:51:50 +01:00
kaniini
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
2019-01-25 05:00:47 +00:00
Ivan Tashkinov
8654a591f0
[ #534 ] Updating external instances reachability on incoming federation.
2019-01-24 17:37:23 +03:00
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
2019-01-21 08:00:41 +01:00
rinpatch
44693fbf6e
Formating
2019-01-20 01:28:46 +03:00
rinpatch
afd83db0d7
Provide local og:url for remote activities
2019-01-19 10:58:27 +03:00
rinpatch
1b1af4798a
Use object instead of activity for metadata
2019-01-18 09:32:52 +03:00
rinpatch
dd1432d695
Disable previews for any activity, but create
2019-01-16 09:42:24 +03:00
rinpatch
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
2019-01-15 20:00:21 +03:00
rinpatch
e4dc3f71ae
Resolve merge conflict
2019-01-13 13:38:28 +03:00
sxsdv1
20c0dd1e24
Support activity+json request for activity
2019-01-09 09:33:30 +01:00
William Pitcock
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
href
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
2018-12-17 22:50:59 +01:00
raeno
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
2018-12-14 19:55:40 +01:00
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
raeno
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
2018-12-13 22:21:14 +01:00
raeno
9b3a6cdb07
Extract opengraph/oembed into separate module
2018-12-13 22:17:53 +01:00
raeno
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
2018-12-13 22:17:53 +01:00
raeno
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
2018-12-13 22:17:53 +01:00
raeno
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
2018-12-13 22:17:53 +01:00
Maksim Pechnikov
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
href
bcecdc3ab1
Various runtime configuration fixes
2018-11-19 10:09:24 +01:00
William Pitcock
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
2018-11-17 22:10:15 +00:00
href
6fe23c5458
Runtime configured router
2018-11-05 15:19:03 +01:00
William Pitcock
0899588e4d
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
2018-07-12 17:15:47 +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
Rachel H
fa0c2727d8
Fix users lookup/return type
...
* Allow viewing user in frontend by id on pageload
2018-06-07 23:18:45 -07:00
lain
8073af6e10
Better error handling for OstatusController.
2018-06-03 21:04:44 +02:00
lain
06439f64d0
Better error handling for ActivityPubController
2018-06-03 19:58:59 +02:00
lain
5e76adb07e
Fix url guessing attacks.
2018-05-30 20:00:45 +02:00
Mark Felder
636f0fa402
Clean up unused aliases and imports
2018-05-04 21:25:31 +00:00
lain
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
lain
46f63ea8af
Fix atom feed pagination.
2018-03-26 09:51:43 +02:00
lain
b82637f32d
Don't use special query for feed.
2018-03-06 16:04:29 +01:00
lain
b331cb449a
Merge branch 'develop' into feature/activitypub
2018-02-12 10:24:15 +01:00
Hakaba Hitoyo
7124f12a94
introduce max_id parameter in feed.atom (debug)
2018-02-09 21:46:05 +09:00
Hakaba Hitoyo
9c61f60558
introduce max_id parameter in feed.atom
2018-02-09 21:41:30 +09:00
Lain Iwakura
64330d9455
ActivityPub: Add object routes / controller.
2017-12-11 18:21:33 +01:00
Roger Braun
5599c5920c
Basic incoming AP support.
2017-12-11 10:37:22 +01:00
Lain Iwakura
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01:00
Thog
59770c3f5c
Fix all compilation warnings
2017-11-19 02:22:07 +01:00
Roger Braun
41b8a76e96
Re-fetch user data on salmon decode error.
2017-11-09 08:32:54 +01:00
Roger Braun
678dd4c8ec
Use desc id to sort instead of desc inserted_at
...
Should mean the same and is indexed.
2017-09-17 11:16:08 +02:00