Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,946 Commits 1 Branch 0 Tags 222 MiB
ce8c7e77a1
Commit Graph

1946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
lambda
afb71b3038 Merge branch 'bugfix/fix-gopher-server-i' into 'develop' 
fix gopher server informational messages

See merge request pleroma/pleroma!268
 2018-08-10 13:45:39 +00:00
trqx@goat.si
e7b00f202f fix gopher server informational messages 
some gopher clients did not accept those lines due to a missing tab
 2018-08-10 10:45:44 +02:00
eal
db5cdfa333 Remote follow: don't show confusing error if already following 2018-08-09 20:47:29 +03:00
eal
37b802682c HTML-sanitize usernames before emojifying. 2018-08-09 13:07:03 +03:00
eal
ed9738e031 Add tests for emoji in user profiles 
Also use the correct field in TwitterAPI...
 2018-08-08 09:24:50 +03:00
eal
cee63ad3f7 TwitterAPI user view: add screen_name_html and description_html. 2018-08-08 08:38:25 +03:00
eal
c2d1a5e9c4 MastoAPI AccountView: render profile emoji. 2018-08-07 21:56:50 +03:00
lambda
59b42531a3 Merge branch 'bugfix/duplicate-follow-requests' into 'develop' 
user: filter out duplicate follow requests

Closes #228

See merge request pleroma/pleroma!263
 2018-08-06 18:07:27 +00:00
lambda
c957cd98f0 Merge branch 'feature/camelcase-hashtags' into 'develop' 
formatter: preserve case of hashtags

Closes #165

See merge request pleroma/pleroma!262
 2018-08-06 18:07:01 +00:00
William Pitcock
275c42e438 user: filter out duplicate follow requests 2018-08-05 01:11:13 +00:00
William Pitcock
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.
 2018-08-05 00:37:38 +00:00
Hakaba Hitoyo
f72cfada1a add suggestions/web config 2018-08-02 18:03:35 +09:00
lambda
d7368ea272 Merge branch 'bugfix/digest-legacy-compat' into 'develop' 
activitypub: actually send digest header when federating

See merge request pleroma/pleroma!261
 2018-08-01 10:37:28 +00:00
William Pitcock
3be58ad34e activitypub: actually send digest header when federating 
this is needed for backwards compatibility with non-digest pleroma instances
 2018-08-01 10:32:02 +00:00
lambda
ab4b4538ce Merge branch 'security/digest-signature-validation' into 'develop' 
digest signature validation

See merge request pleroma/pleroma!260
 2018-08-01 08:11:28 +00:00