Commit graph

1202 commits

Author SHA1 Message Date
lain 0067c9d2be Only push to still valid websub subscriptions. 2018-03-13 18:32:17 +01:00
lain 71cee07686 Merge branch 'andarna/pleroma-develop' into develop 2018-03-13 14:59:16 +01:00
lain 2b2fa94e94 Move stuff around. 2018-03-13 14:58:49 +01:00
Wim Vanderbauwhede 36f615135f A small patch to show the instance name and favicon in the browser title
bar.
2018-03-13 09:37:55 +00:00
lain 30d65639c1 Fix Mastodon emojis.
Code by Kaniini
2018-03-13 08:05:43 +01:00
lain 312a8783f8 Ignore incoming empty chat messages.
Fixes #62.
2018-03-12 11:30:12 +01:00
lain 368e085144 Don't validate on missing public key. 2018-03-11 14:47:37 +01:00
lain a9f78fe8e0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-03-11 14:43:53 +01:00
lain f29902a241 More signature debugging. 2018-03-11 14:37:23 +01:00
feld 1538835b25 Update README.md 2018-03-10 13:27:10 +00:00
eal 62037690e8 Merge branch 'fix/mastoapi-card' into 'develop'
MastoAPI: Add unimplemented status card endpoint.

See merge request pleroma/pleroma!71
2018-03-09 18:58:55 +00:00
eal 18e1202a3b MastoAPI: Add unimplemented status card endpoint. 2018-03-09 20:58:00 +02:00
lambda c661cf504b Merge branch 'fix/timeline-headers' into 'develop'
Add next and previous headers to user pages and tag timelines.

Closes #72

See merge request pleroma/pleroma!70
2018-03-09 15:06:04 +00:00
eal 2e32012d57 Add next and previous headers to user pages and tag timelines. 2018-03-09 16:54:10 +02:00
lain b0d242cd92 update frontend 2018-03-08 19:50:51 +01:00
lain ff7bc16a7e Restrict activity fixing more.
If we need it for older ones, we can add a task for that later.
2018-03-08 19:09:46 +01:00
lambda 060ac6cb95 Update pleroma.nginx 2018-03-08 18:00:59 +00:00
lambda 460062f2b0 Merge branch 'feature/activitypub' into 'develop'
Feature/activitypub

See merge request pleroma/pleroma!67
2018-03-08 12:29:02 +00:00
lain 611ca385de Merge branch 'develop' into feature/activitypub 2018-03-08 12:37:06 +01:00
lain 8228ae96d8 Only run the fix-up tasks once. 2018-03-07 20:19:48 +01:00
lain a91adb146e add test file. 2018-03-07 15:46:53 +01:00
lain fcf1937a40 Correctly handle unlisted messages coming in through Ostatus. 2018-03-07 15:45:13 +01:00
lain b82637f32d Don't use special query for feed. 2018-03-06 16:04:29 +01:00
lain 0f2bf3eefb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-03-05 09:27:08 +01:00
lain 0e20d5529a Add way to disable federation. 2018-03-05 09:26:24 +01:00
lain d2ad99298e Handle incoming deletes. 2018-03-03 18:38:40 +01:00
lain 1377b2e569 Restrict public by recipients.
This is much faster than going through the json. This does break
unlisted, for which we'll probably have to add another table field.
2018-02-26 10:09:30 +01:00
lain a17ba0ee0d Only return posts in TwAPI user view. 2018-02-26 09:02:14 +01:00
lain 82df16f7c3 Actual real fix. 2018-02-25 22:28:53 +01:00
lain 0d69bbc1fb One more fix. 2018-02-25 22:20:38 +01:00
lain 8c712b3198 Fix context stitching. 2018-02-25 21:42:28 +01:00
lain e1b0ccce77 Mastodon API context fix. 2018-02-25 21:25:33 +01:00
lain e9de04b74b Add support for outgoing update. 2018-02-25 21:08:32 +01:00
lain 5ea6d96dbe Fix signing bug. 2018-02-25 20:15:04 +01:00
lain f61fd00db5 Make likes and announces public. 2018-02-25 18:20:06 +01:00
lain 8a47974217 Fix specs. 2018-02-25 18:11:03 +01:00
lain 4ea2a41014 Fix more specs. 2018-02-25 17:48:31 +01:00
lain d3b0167854 Fix salmon tests. 2018-02-25 17:06:12 +01:00
lain 4d13cc0dc6 Fix specs. 2018-02-25 16:52:33 +01:00
lain 8e7f63afde Fix specs. 2018-02-25 16:40:37 +01:00
lain dfaddeb765 Use update_and_set cache. 2018-02-25 16:34:24 +01:00
lain e3629af4da Handle remote update activities. 2018-02-25 16:14:25 +01:00
lain dd97193311 Set conversation to parent conversation. 2018-02-25 13:35:08 +01:00
lain b76de1ecd3 Some fixes to AP fetching. 2018-02-25 10:56:01 +01:00
lain 0e9bd6d148 Hotfix for tag problems. 2018-02-24 22:28:22 +01:00
lain 7e0ce32f4d Fix external url in twitterapi. 2018-02-24 20:29:57 +01:00
lain 82e34cae95 Unify object representation. 2018-02-24 20:16:41 +01:00
lain 2b5d265954 Don't deliver to local followers. 2018-02-24 19:04:56 +01:00
lain df73a9c6d6 . 2018-02-24 18:50:02 +01:00
lain 5bc7628022 Fix. 2018-02-24 18:49:09 +01:00