8c3880f18c
Merge branch 'patch-2' into 'develop'
...
Update mix.exs
See merge request pleroma/pleroma!241
6 years ago
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
c004b6ea0a
Merge branch 'mastofe/system-font' into 'develop'
...
Mastodon frontend: Use system font
See merge request pleroma/pleroma!247
6 years ago
05738e7643
fix compile
6 years ago
f2fa09c50f
Merge branch 'develop' into 'patch-2'
...
# Conflicts:
# mix.exs
6 years ago
5fbb14f5ec
Merge branch 'bugfix/federation-kroeg' into 'develop'
...
fix federation with kroeg
See merge request pleroma/pleroma!272
6 years ago
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
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
8058443674
testsuite: add puckipedia test fixture
6 years ago
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
b8560e5ed5
testsuite: formatting
6 years ago
7fbcd4caaf
test: add kroeg fixtures
6 years ago
f446e75577
activitypub: transmogrifier: add necessary translations for kroeg
6 years ago
8c0c930041
formatting
6 years ago
ffd9ad1f0c
Fix for elixir 1.7.
6 years ago
701f5df45c
update frontend
6 years ago
4a612b8c1b
Update Mastofe.
6 years ago
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
1e9d152d60
Update generate_invite_token.ex
6 years ago
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
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
e81f788cb8
Merge branch 'emoji-in-account-view' into 'develop'
...
Render emoji in user profiles
See merge request pleroma/pleroma!265
6 years ago
af30f3f648
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
6 years ago
afb71b3038
Merge branch 'bugfix/fix-gopher-server-i' into 'develop'
...
fix gopher server informational messages
See merge request pleroma/pleroma!268
6 years ago
e7b00f202f
fix gopher server informational messages
...
some gopher clients did not accept those lines due to a missing tab
6 years ago
db5cdfa333
Remote follow: don't show confusing error if already following
6 years ago
37b802682c
HTML-sanitize usernames before emojifying.
6 years ago
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
6 years ago
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
6 years ago
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
6 years ago
59b42531a3
Merge branch 'bugfix/duplicate-follow-requests' into 'develop'
...
user: filter out duplicate follow requests
Closes #228
See merge request pleroma/pleroma!263
6 years ago
c957cd98f0
Merge branch 'feature/camelcase-hashtags' into 'develop'
...
formatter: preserve case of hashtags
Closes #165
See merge request pleroma/pleroma!262
6 years ago
275c42e438
user: filter out duplicate follow requests
6 years ago
0ee29994a5
formatter: preserve case of hashtags
...
when generating hashtag links, we used the casefolded version that we use in
the link URLs, instead of the original version.
accordingly, adjust the formatter to use the original text for the links, while
keeping the casefolded version for the URLs.
6 years ago
f72cfada1a
add suggestions/web config
6 years ago
d7368ea272
Merge branch 'bugfix/digest-legacy-compat' into 'develop'
...
activitypub: actually send digest header when federating
See merge request pleroma/pleroma!261
6 years ago
3be58ad34e
activitypub: actually send digest header when federating
...
this is needed for backwards compatibility with non-digest pleroma instances
6 years ago
ab4b4538ce
Merge branch 'security/digest-signature-validation' into 'develop'
...
digest signature validation
See merge request pleroma/pleroma!260
6 years ago
d5091c3175
Allow additionnal schemes in the config
6 years ago
8da406afa2
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header
6 years ago
2890aef9e8
activitypub: add digest header to outbound messages and sign it
6 years ago
32a55e9695
[Pleroma.FormatterTest] Add test for XMPP link
6 years ago
1a2255ef7e
[Pleroma.FormatterTest]: .add_links: Add a space before the dot
...
A dot is legal in the url, even at the end, so I moved it for the test
6 years ago
3623504e5d
[Pleroma.Formatter]: Add support for non-HTTP schemes in URIs
...
The call to the regex in add_links is there just to be sure it’s a legal URI, it can be removed if you want to get more performance.
The URI Schemes list is sorted, but with http(s) at the start (in case it might make it faster for common links).
Closes: https://git.pleroma.social/pleroma/pleroma/issues/127
6 years ago
ba72c51a0f
Merge branch 'feature/filter_exif' into 'develop'
...
Feature/filter exif ( solve #187 )
See merge request pleroma/pleroma!237
6 years ago
9c1b6f11c5
improve test
6 years ago
908cefd84a
debug
6 years ago
9c2afb2e71
improve test
6 years ago
bc2668bb63
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
cc9c062b55
merge
6 years ago
kaniini