|
bd33a7ac8f
|
Remove stuff I don't need to stay closer to upstream
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-12 16:07:29 +01:00 |
|
|
3b498061ed
|
Merge remote-tracking branch 'rebased/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-16 21:24:22 +02:00 |
|
marcin mikołajczak
|
0312f6770c
|
Merge branch 'develop' into 'edits'
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
|
2022-09-03 14:14:25 +00:00 |
|
|
8d5592ef9d
|
Update @context
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-29 11:45:46 +02:00 |
|
|
322e00e45a
|
Revert "Merge branch 'revert-f6e02270' into 'develop'"
This reverts commit 5b8ad6bc91 , reversing
changes made to f6e02270c3 .
|
2022-08-18 23:06:18 +02:00 |
|
marcin mikołajczak
|
4de58c2b2c
|
Revert "Merge branch 'polls' into 'develop'"
This reverts merge request !152
|
2022-08-18 06:38:03 +00:00 |
|
|
9ffb4d055a
|
Handle voters count correctly
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-12 23:49:20 +02:00 |
|
|
538a210f70
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-09 15:30:34 +02:00 |
|
|
0412cdcb32
|
Merge remote-tracking branch 'soapbox/develop' into edits
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-08 17:01:48 +02:00 |
|
|
b4575815ed
|
Add entry to @context, tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-08 10:45:43 +02:00 |
|
|
3a6274f29a
|
wip events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-28 11:07:21 +02:00 |
|
|
f073443c79
|
Merge remote-tracking branch 'tusooa/from/upstream-develop/tusooa/edits' into edits
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-17 19:54:14 +02:00 |
|
Tusooa Zhu
|
5e8aac0e07
|
Record edit history for Note and Question Updates
|
2022-05-29 13:54:16 -04:00 |
|
Alex Gleason
|
4883b996ad
|
Actually, don't send _misskey_quote anymore
|
2022-01-28 17:53:19 -06:00 |
|
Alex Gleason
|
b73a53ec69
|
Handle Fedibird's new quoteUri field
|
2022-01-28 15:55:52 -06:00 |
|
Alex Gleason
|
ac3426cbca
|
Transmogrifier: federate quotes with _misskey_quote field
|
2022-01-28 14:06:32 -06:00 |
|
Alex Gleason
|
93a340668f
|
Merge remote-tracking branch 'origin/develop' into quote-post
|
2022-01-25 11:57:04 -06:00 |
|
Alex Gleason
|
4f51c41f9f
|
@context: add quoteUrl
|
2022-01-22 23:29:55 -06:00 |
|
|
b108b05650
|
Birth dates, birthday reminders API, allow instance admins to require minimum age
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-18 14:57:48 +01:00 |
|
lain
|
208baf157a
|
ActivityPub: Add new 'capabilities' to user.
|
2020-07-06 11:38:40 +02:00 |
|
lain
|
8289ec67a8
|
Litepub: Add acceptsChatMessages to schema.
|
2020-07-03 13:39:21 +02:00 |
|
lain
|
1d6338f2d3
|
Litepub: Add ChatMessage.
|
2020-04-22 12:52:39 +02:00 |
|
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
2020-02-06 18:09:57 +01:00 |
|
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
2019-11-14 16:39:45 +07:00 |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-11-08 13:27:11 +01:00 |
|
Egor Kislitsyn
|
b777083f3f
|
Add also_known_as field to Pleroma.User
|
2019-10-25 19:14:18 +07:00 |
|
Ariadne Conill
|
c9280b9730
|
rework to use properties instead of compound typing, per SocialCG
|
2019-10-19 23:21:37 +00:00 |
|
lain
|
e8395bedd2
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
|
2019-10-07 12:10:27 +00:00 |
|
Ariadne Conill
|
19962d2022
|
clean up bundled litepub schema (closes #1303)
|
2019-10-07 11:33:58 +00:00 |
|
lain
|
0aef18bcf4
|
Litepub Context: Add EmojiReaction.
|
2019-09-30 14:26:59 +02:00 |
|
kaniini
|
26f66fb70a
|
Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
|
2019-09-30 11:21:49 +00:00 |
|
Hakaba Hitoyo
|
5fb72170a7
|
Revert "add _discoverable_ keyword into ActivityPub @context"
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
|
2019-09-26 02:57:41 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5820dc40fc
|
litepub-0.1.jsonld: Add uploadMedia
|
2019-09-24 19:00:31 +02:00 |
|
Egor Kislitsyn
|
04f18a144b
|
Add listMessage to to the JSON-LD context
|
2019-07-15 14:29:13 +07:00 |
|
William Pitcock
|
dd989962e6
|
litepub schema: add oauthRegistrationEndpoint [ci skip]
|
2019-02-13 19:34:43 +00:00 |
|
William Pitcock
|
75bb663749
|
litepub schema: add litepub:directMessage flag
|
2019-01-20 02:27:48 +00:00 |
|
Haelwenn (lanodan) Monnier
|
934125695d
|
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
|
2018-11-08 20:21:45 +01:00 |
|