Mutex/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
1919 commits 12 branches 60 tags 294 MiB
Commit graph

1919 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Haelwenn (lanodan) Monnier
d5091c3175
Allow additionnal schemes in the config 2018-08-01 02:52:42 +02: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
Haelwenn (lanodan) Monnier
32a55e9695
[Pleroma.FormatterTest] Add test for XMPP link 2018-07-30 22:01:48 +02:00
Haelwenn (lanodan) Monnier
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
 2018-07-30 22:01:48 +02:00
Haelwenn (lanodan) Monnier
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
 2018-07-30 22:01:48 +02: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
William Pitcock
b23630076f TwitterAPI: present pleroma frontend config in API 2018-07-17 15:46:24 +00:00
William Pitcock
cf219b6add config: make instance description configurable 2018-07-17 15:46:23 +00:00
Hakaba Hitoyo
5b4a21317d correct error message 2018-07-17 17:29:18 +09:00
Hakaba Hitoyo
091b7925d3 debug 2018-07-17 17:20:13 +09:00
Hakaba Hitoyo
8ff336e02a debug 2018-07-17 17:00:14 +09:00
Hakaba Hitoyo
2b7b1b3e6b add suggestionsThirdPartyEngine into /nodeinfo/2.0.json 2018-07-17 16:56:30 +09:00
Hakaba Hitoyo
d76f0d87be do nothing if configuration is skipped 2018-07-17 16:45:18 +09:00
Hakaba Hitoyo
df3233e7e7 improve getting host name 2018-07-17 13:20:58 +09:00