squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,875 Commits 154 Branches 42 Tags 503 MiB
0f1c629d65
Commit Graph

1875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry Jameson
0f1c629d65 better solution, added test. 2018-08-27 17:07:26 +03:00
Henry Jameson
9b046d2a84 fixed notifications API completely breaking if there's a like for 
missing (deleted) post.
 2018-08-22 16:10:59 +03: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
William Pitcock
8da406afa2 activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header 2018-07-31 23:24:30 +00:00
William Pitcock
2890aef9e8 activitypub: add digest header to outbound messages and sign it 2018-07-31 23:24:30 +00:00
lambda
ba72c51a0f Merge branch 'feature/filter_exif' into 'develop' 
Feature/filter exif (  solve #187 )

See merge request pleroma/pleroma!237
 2018-07-25 07:16:50 +00:00
hakabahitoyo
9c1b6f11c5 improve test 2018-07-21 02:57:56 +09:00
hakabahitoyo
908cefd84a debug 2018-07-21 02:19:20 +09:00
hakabahitoyo
9c2afb2e71 improve test 2018-07-21 01:44:35 +09:00
Tristan Mahé
bc2668bb63 Merge remote-tracking branch 'upstream/develop' into feature/filter_exif 2018-07-19 17:44:18 -07:00
Hakaba Hitoyo
cc9c062b55 merge 2018-07-19 17:42:00 +09:00
lambda
41b0ecef95 Merge branch 'tests/plume' into 'develop' 
Articles/Notes with a actor list outside object

See merge request pleroma/pleroma!252
 2018-07-19 07:35:34 +00:00
lambda
54963a6379 Merge branch 'bugfix/activitystreams-notice-urls' into 'develop' 
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.

Closes #206

See merge request pleroma/pleroma!251
 2018-07-19 07:31:33 +00:00
lambda
6f23fb53d3 Merge branch 'feature/fe-configuration' into 'develop' 
serverside frontend configuration

See merge request pleroma/pleroma!256
 2018-07-19 07:31:10 +00:00
lambda
b7001ea9e7 Merge branch 'feature/media-description' into 'develop' 
Feature/media description

Closes #174

See merge request pleroma/pleroma!255
 2018-07-18 08:52:11 +00:00
Hakaba Hitoyo
b12d17d2ce configurable timeout 2018-07-18 13:36:20 +09:00
Hakaba Hitoyo
e4dd58307a better configuration 2018-07-18 09:58:59 +09:00
William Pitcock
2b3f049b06 config: formatting 2018-07-18 00:05:36 +00:00