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 |
|
eal
|
92caa2632b
|
Use Image type for emoji icons.
|
6 years ago |
|
eal
|
1ed1ff17a4
|
ActivityPub user view: include tag if present.
|
6 years ago |
|
eal
|
f9d13558c8
|
CommonAPI: add emoji to user source data on update
|
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 |
|
eal
|
ed9738e031
|
Add tests for emoji in user profiles
Also use the correct field in TwitterAPI...
|
6 years ago |
|
eal
|
cee63ad3f7
|
TwitterAPI user view: add screen_name_html and description_html.
|
6 years ago |
|
eal
|
c2d1a5e9c4
|
MastoAPI AccountView: render profile emoji.
|
6 years ago |
|
lambda
|
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 |
|
lambda
|
c957cd98f0
|
Merge branch 'feature/camelcase-hashtags' into 'develop'
formatter: preserve case of hashtags
Closes #165
See merge request pleroma/pleroma!262
|
6 years ago |
|
William Pitcock
|
3026177206
|
test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed
|
6 years ago |
|
William Pitcock
|
d91fd48edf
|
user: do not leak virtuals in account search
|
6 years ago |
|
William Pitcock
|
ecfd4b2106
|
user: hide virtual actors from statistics queries
|
6 years ago |
|
William Pitcock
|
de6be63b1b
|
activitypub: do not show observable effects of non-public boosts
|
6 years ago |
|
William Pitcock
|
aea23468c6
|
test: nickname is no longer a required field
|
6 years ago |
|
William Pitcock
|
5202d4ce10
|
relay: do not relay in test mode
|
6 years ago |
|
William Pitcock
|
0ca9b9ff96
|
run mix format
|
6 years ago |
|
William Pitcock
|
5abf9ad602
|
relay: reintroduce @allow_relay
|
6 years ago |
|
William Pitcock
|
1e1a29f084
|
activitypub: relay: fix up AS2 actor object
|
6 years ago |
|
William Pitcock
|
e49131bb72
|
relay: move to /relay endpoint from / due to webapp issues
|
6 years ago |
|
William Pitcock
|
2b628f2341
|
relay: only relay create activities
|
6 years ago |
|
William Pitcock
|
ae3cb652b6
|
user: set up a valid followers address to use
|
6 years ago |
|
William Pitcock
|
56dc8db582
|
activitypub: relay: add relay following/followers collection URLs
|
6 years ago |
|
William Pitcock
|
1c40a631e8
|
federator: actually relay the public activities
|
6 years ago |
|
William Pitcock
|
f9b0fc4ddb
|
relay: remove @allow_relay for the moment
|
6 years ago |
|
William Pitcock
|
266b314051
|
relay: fix invoking federator, use a timer to sleep the mix task to force a context switch
|
6 years ago |
|
William Pitcock
|
99be3d3dcc
|
relay: add relay follow/unfollow tasks
|
6 years ago |
|
William Pitcock
|
1c90f88393
|
user: remote actors can have no nickname if they are virtual services
|
6 years ago |
