ensra
|
e883587cc3
|
this should be looking at the follower's bio, not the user's bio.
fixes test.
|
6 years ago |
|
ensra
|
f533daffdb
|
sync bio sanitization code in tests
|
6 years ago |
|
ensra
|
1495d04789
|
fix test for converting bio \r\n to <br>.
|
6 years ago |
|
ensra
|
cdb3dd48ab
|
Format
|
6 years ago |
|
ensra
|
5debd7b5cc
|
Twitter API: Support Mastodon-style bios
(multi-line, with links, and user mentions)
|
6 years ago |
|
kaniini
|
c1b8a6a73b
|
Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'
formatter: consistent presentation of hashtags and mentions
See merge request pleroma/pleroma!280
|
6 years ago |
|
William Pitcock
|
c033d2004b
|
formatting
|
6 years ago |
|
William Pitcock
|
145546e52a
|
common api: format hashtags in the same way as we format mentions
|
6 years ago |
|
kaniini
|
7266cc67ff
|
Merge branch 'update/pleroma-fe-20180821' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!279
|
6 years ago |
|
William Pitcock
|
d8fb340565
|
update pleroma frontend
|
6 years ago |
|
eal
|
f1c407e777
|
Merge branch 'fix/redirect-on-user-fetch' into 'develop'
ActivityPub: follow redirects when fetching user
See merge request pleroma/pleroma!278
|
6 years ago |
|
eal
|
51a21284c6
|
ActivityPub: follow redirects when fetching user
|
6 years ago |
|
kaniini
|
e0c350db39
|
Merge branch 'update/pleroma-fe-20180820' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!277
|
6 years ago |
|
William Pitcock
|
7a11ea1ceb
|
update pleroma frontend
|
6 years ago |
|
kaniini
|
b46156be92
|
Merge branch 'update/pleroma-fe-20180818' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!276
|
6 years ago |
|
William Pitcock
|
d8bb27970b
|
update pleroma frontend
|
6 years ago |
|
kaniini
|
4ad7531dc0
|
Merge branch 'develop' into 'develop'
Fix typo in app creation response
See merge request pleroma/pleroma!275
|
6 years ago |
|
shadowfacts
|
6698749073
|
Fix typo in app creation response
Mastodon sends redirect_uri (singular), so should Pleroma.
|
6 years ago |
|
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
|
6 years ago |
|
William Pitcock
|
a3ef2ebb35
|
mastodon api controller: client_name, not name
|
6 years ago |
|
William Pitcock
|
b5a92b1199
|
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
|
6 years ago |
|
kaniini
|
03966bb0f7
|
Merge branch 'bugfix/mix-lock' into 'develop'
update mix.lock
See merge request pleroma/pleroma!273
|
6 years ago |
|
William Pitcock
|
0835cf9faa
|
update mix.lock
|
6 years ago |
|
kaniini
|
8c3880f18c
|
Merge branch 'patch-2' into 'develop'
Update mix.exs
See merge request pleroma/pleroma!241
|
6 years ago |
|
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
|
6 years ago |
|
kaniini
|
c004b6ea0a
|
Merge branch 'mastofe/system-font' into 'develop'
Mastodon frontend: Use system font
See merge request pleroma/pleroma!247
|
6 years ago |
|
kaniini
|
05738e7643
|
fix compile
|
6 years ago |
|
kaniini
|
f2fa09c50f
|
Merge branch 'develop' into 'patch-2'
# Conflicts:
# mix.exs
|
6 years ago |
|
kaniini
|
5fbb14f5ec
|
Merge branch 'bugfix/federation-kroeg' into 'develop'
fix federation with kroeg
See merge request pleroma/pleroma!272
|
6 years ago |
|
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
|
6 years ago |
|
kaniini
|
8dc715b30b
|
Merge branch 'fix/normalize-file-extension' into 'develop'
Normalize file extension for uploaded files
Closes #218
See merge request pleroma/pleroma!233
|
6 years ago |
|
William Pitcock
|
8058443674
|
testsuite: add puckipedia test fixture
|
6 years ago |
|
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
|
6 years ago |
|
William Pitcock
|
b8560e5ed5
|
testsuite: formatting
|
6 years ago |
|
William Pitcock
|
7fbcd4caaf
|
test: add kroeg fixtures
|
6 years ago |
|
William Pitcock
|
f446e75577
|
activitypub: transmogrifier: add necessary translations for kroeg
|
6 years ago |
|
lain
|
8c0c930041
|
formatting
|
6 years ago |
|
lain
|
ffd9ad1f0c
|
Fix for elixir 1.7.
|
6 years ago |
|
lain
|
701f5df45c
|
update frontend
|
6 years ago |
|
lain
|
4a612b8c1b
|
Update Mastofe.
|
6 years ago |
|
lambda
|
13440a80e1
|
Merge branch 'feature/invites' into 'develop'
Invites
Closes #108
See merge request pleroma/pleroma!208
|
6 years ago |
|
lambda
|
1e9d152d60
|
Update generate_invite_token.ex
|
6 years ago |
|
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
|
6 years ago |
|
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
|
6 years ago |
|
lambda
|
e81f788cb8
|
Merge branch 'emoji-in-account-view' into 'develop'
Render emoji in user profiles
See merge request pleroma/pleroma!265
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
af30f3f648
|
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
|
6 years ago |
|
lambda
|
afb71b3038
|
Merge branch 'bugfix/fix-gopher-server-i' into 'develop'
fix gopher server informational messages
See merge request pleroma/pleroma!268
|
6 years ago |
|
trqx@goat.si
|
e7b00f202f
|
fix gopher server informational messages
some gopher clients did not accept those lines due to a missing tab
|
6 years ago |
|
eal
|
db5cdfa333
|
Remote follow: don't show confusing error if already following
|
6 years ago |
|
eal
|
37b802682c
|
HTML-sanitize usernames before emojifying.
|
6 years ago |
