shibayashi
|
18ad8aaecf
|
Explicitly set 'http_only' to true
|
2018-08-28 22:34:31 +02:00 |
|
shibayashi
|
4656a07e9e
|
Set SameSite flag to 'Strict'
|
2018-08-28 14:03:29 +02:00 |
|
shibayashi
|
0c4493f144
|
Fix formatting
|
2018-08-28 00:47:34 +02:00 |
|
shibayashi
|
b9a642da1e
|
Add Secure and SameSite cookie flags
|
2018-08-28 00:40:58 +02:00 |
|
lambda
|
46c7c2380c
|
Merge branch 'feature/relay' into 'develop'
message relay
Closes #144
See merge request pleroma/pleroma!264
|
2018-08-27 08:29:25 +00:00 |
|
lambda
|
440b459cd1
|
Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
activitypub: filter destination list for announce activities differently than normal (closes #164)
Closes #164
See merge request pleroma/pleroma!227
|
2018-08-27 08:25:27 +00:00 |
|
kaniini
|
63094cfd3e
|
Merge branch 'feature/emoji-in-local-users' into 'develop'
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
|
2018-08-26 23:24:41 +00:00 |
|
William Pitcock
|
bc3c30430e
|
fix formatting
|
2018-08-26 22:46:25 +00:00 |
|
kaniini
|
1ad5cbed51
|
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
common api: properly handle replying to orphaned threads
See merge request pleroma/pleroma!299
|
2018-08-26 22:39:15 +00:00 |
|
William Pitcock
|
741c6ad671
|
common api: handle replying to orphaned threads
|
2018-08-26 22:37:36 +00:00 |
|
kaniini
|
c9e4c45e0e
|
Merge branch 'login-with-email' into 'develop'
When logging in, try treating the login as an email
Closes #245
See merge request pleroma/pleroma!295
|
2018-08-26 21:35:12 +00:00 |
|
kaniini
|
0f5bff8c66
|
Merge branch 'develop' into 'feature/relay'
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
|
2018-08-26 21:06:15 +00:00 |
|
hakabahitoyo
|
946a0769c4
|
remove unused settings from /api/statusnet/config
|
2018-08-26 17:40:15 +09:00 |
|
Ekaterina Vaartis
|
540cce5d10
|
When logging in, try treating the login as an email
Closes #245
|
2018-08-25 23:29:03 +03:00 |
|
William Pitcock
|
aab2bdddf4
|
twitter api: provide object descriptions as attachment description field
|
2018-08-25 00:12:58 +00:00 |
|
kaniini
|
9ded0ee1a5
|
Merge branch 'config/fe-collapse-subject' into 'develop'
fe config: add collapse_message_with_subject fe option
See merge request pleroma/pleroma!289
|
2018-08-24 18:27:43 +00:00 |
|
William Pitcock
|
09cb402203
|
fe config: add collapse_message_with_subject fe option
|
2018-08-24 18:21:42 +00:00 |
|
hakabahitoyo
|
bf9f68b681
|
debug
|
2018-08-23 11:52:18 +09:00 |
|
William Pitcock
|
a909fe45a6
|
formatting
|
2018-08-23 01:34:36 +00:00 |
|
William Pitcock
|
52b44184b4
|
transmogrifier: reject activities lacking a valid ID
|
2018-08-23 01:25:26 +00:00 |
|
Haelwenn (lanodan) Monnier
|
d5bdd55b5d
|
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
|
2018-08-22 01:47:25 +02:00 |
|
Haelwenn (lanodan) Monnier
|
5dde6e4a00
|
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
|
2018-08-22 01:46:26 +02:00 |
|
kaniini
|
f6b06d2ac8
|
Merge branch 'feature/peertube_2' into 'develop'
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
|
2018-08-21 16:58:44 +00:00 |
|
kaniini
|
a6d4cc8917
|
Merge branch 'sanitize-bio' into 'develop'
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
|
2018-08-21 16:56:24 +00:00 |
|
Haelwenn (lanodan) Monnier
|
046741c60d
|
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
|
2018-08-21 18:34:56 +02:00 |
|
Haelwenn (lanodan) Monnier
|
f5b056e3ce
|
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
|
2018-08-21 18:26:12 +02:00 |
|
Haelwenn (lanodan) Monnier
|
3b8ef24532
|
Fix attachement rendering
|
2018-08-21 18:24:10 +02:00 |
|
lain
|
a6b021a52b
|
Render peertube videos in mastodon.
|
2018-08-21 18:24:10 +02:00 |
|
lain
|
c381d0b577
|
Use activitypub to fetch posts.
This falls back to ostatus.
|
2018-08-21 18:24:09 +02:00 |
|
Haelwenn (lanodan) Monnier
|
74c74decf5
|
Basic peertube support.
|
2018-08-21 18:24:09 +02:00 |
|
Haelwenn (lanodan) Monnier
|
ef4f982e2c
|
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)
|
2018-08-21 18:24:06 +02:00 |
|
ensra
|
1495d04789
|
fix test for converting bio \r\n to <br>.
|
2018-08-21 14:51:27 +01:00 |
|
ensra
|
cdb3dd48ab
|
Format
|
2018-08-21 14:12:55 +01:00 |
|
ensra
|
5debd7b5cc
|
Twitter API: Support Mastodon-style bios
(multi-line, with links, and user mentions)
|
2018-08-21 14:03:36 +01:00 |
|
ensra
|
175f0bebbc
|
mastodon api: sanitize the bio HTML
|
2018-08-21 10:53:53 +01:00 |
|
kaniini
|
c1b8a6a73b
|
Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'
formatter: consistent presentation of hashtags and mentions
See merge request pleroma/pleroma!280
|
2018-08-20 18:44:52 +00:00 |
|
William Pitcock
|
c033d2004b
|
formatting
|
2018-08-20 18:40:05 +00:00 |
|
William Pitcock
|
145546e52a
|
common api: format hashtags in the same way as we format mentions
|
2018-08-20 18:39:47 +00:00 |
|
eal
|
f1c407e777
|
Merge branch 'fix/redirect-on-user-fetch' into 'develop'
ActivityPub: follow redirects when fetching user
See merge request pleroma/pleroma!278
|
2018-08-20 12:13:07 +00:00 |
|
eal
|
51a21284c6
|
ActivityPub: follow redirects when fetching user
|
2018-08-20 15:03:25 +03:00 |
|
shadowfacts
|
6698749073
|
Fix typo in app creation response
Mastodon sends redirect_uri (singular), so should Pleroma.
|
2018-08-17 12:48:24 +00:00 |
|
William Pitcock
|
a3ef2ebb35
|
mastodon api controller: client_name, not name
|
2018-08-16 23:50:49 +00:00 |
|
William Pitcock
|
b5a92b1199
|
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
|
2018-08-16 23:40:42 +00:00 |
|
kaniini
|
c004b6ea0a
|
Merge branch 'mastofe/system-font' into 'develop'
Mastodon frontend: Use system font
See merge request pleroma/pleroma!247
|
2018-08-16 15:38:59 +00:00 |
|
kaniini
|
5fbb14f5ec
|
Merge branch 'bugfix/federation-kroeg' into 'develop'
fix federation with kroeg
See merge request pleroma/pleroma!272
|
2018-08-16 15:20:15 +00:00 |
|
kaniini
|
38361e7b5e
|
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175
|
2018-08-16 15:19:46 +00:00 |
|
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 |
|