ensra
|
e883587cc3
|
this should be looking at the follower's bio, not the user's bio.
fixes test.
|
2018-08-21 15:25:21 +01:00 |
|
ensra
|
f533daffdb
|
sync bio sanitization code in tests
|
2018-08-21 15:24:06 +01: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 |
|
kaniini
|
7266cc67ff
|
Merge branch 'update/pleroma-fe-20180821' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!279
|
2018-08-20 18:17:05 +00:00 |
|
William Pitcock
|
d8fb340565
|
update pleroma frontend
|
2018-08-20 18:10:29 +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 |
|
kaniini
|
e0c350db39
|
Merge branch 'update/pleroma-fe-20180820' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!277
|
2018-08-20 04:50:27 +00:00 |
|
William Pitcock
|
7a11ea1ceb
|
update pleroma frontend
|
2018-08-20 04:45:34 +00:00 |
|
kaniini
|
b46156be92
|
Merge branch 'update/pleroma-fe-20180818' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!276
|
2018-08-18 18:24:33 +00:00 |
|
William Pitcock
|
d8bb27970b
|
update pleroma frontend
|
2018-08-18 18:19:11 +00:00 |
|
kaniini
|
4ad7531dc0
|
Merge branch 'develop' into 'develop'
Fix typo in app creation response
See merge request pleroma/pleroma!275
|
2018-08-17 16:03:52 +00: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 |
|
kaniini
|
bdb6811f6f
|
Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'
mastodon api: add undocumented fields to json response, return app id as string…
See merge request pleroma/pleroma!274
|
2018-08-16 23:59:34 +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
|
03966bb0f7
|
Merge branch 'bugfix/mix-lock' into 'develop'
update mix.lock
See merge request pleroma/pleroma!273
|
2018-08-16 23:35:39 +00:00 |
|
William Pitcock
|
0835cf9faa
|
update mix.lock
|
2018-08-16 23:27:09 +00:00 |
|
kaniini
|
8c3880f18c
|
Merge branch 'patch-2' into 'develop'
Update mix.exs
See merge request pleroma/pleroma!241
|
2018-08-16 15:45:12 +00:00 |
|
kaniini
|
183ccd1812
|
Merge branch 'dev-lanodan-url-regex' into 'develop'
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
|
2018-08-16 15:41:16 +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
|
05738e7643
|
fix compile
|
2018-08-16 15:37:58 +00:00 |
|
kaniini
|
f2fa09c50f
|
Merge branch 'develop' into 'patch-2'
# Conflicts:
# mix.exs
|
2018-08-16 15:23:04 +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 |
|
kaniini
|
8dc715b30b
|
Merge branch 'fix/normalize-file-extension' into 'develop'
Normalize file extension for uploaded files
Closes #218
See merge request pleroma/pleroma!233
|
2018-08-16 15:17:17 +00:00 |
|
William Pitcock
|
8058443674
|
testsuite: add puckipedia test fixture
|
2018-08-16 15:10:57 +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
|
b8560e5ed5
|
testsuite: formatting
|
2018-08-14 17:15:33 +00:00 |
|
William Pitcock
|
7fbcd4caaf
|
test: add kroeg fixtures
|
2018-08-14 17:09:17 +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 |
|
lain
|
701f5df45c
|
update frontend
|
2018-08-12 18:16:19 +02:00 |
|
lain
|
4a612b8c1b
|
Update Mastofe.
|
2018-08-12 18:02:43 +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
|
1e9d152d60
|
Update generate_invite_token.ex
|
2018-08-12 11:11:08 +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 |
|
lambda
|
ae9c4983d7
|
Merge branch 'bugfix/gopher-empty-lines' into 'develop'
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
See merge request pleroma/pleroma!270
|
2018-08-12 10:55:21 +00:00 |
|
lambda
|
e81f788cb8
|
Merge branch 'emoji-in-account-view' into 'develop'
Render emoji in user profiles
See merge request pleroma/pleroma!265
|
2018-08-12 10:41:30 +00:00 |
|
Haelwenn (lanodan) Monnier
|
af30f3f648
|
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
|
2018-08-10 18:01:42 +02:00 |
|