nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2132 commits 2 branches 0 tags 272 MiB
Commit graph

2132 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Pitcock 255f46d7ab html: new module providing a configurable markup scrubbing policy 2018-09-10 00:13:57 +00:00
kaniini 3f64ba5fc8 Merge branch 'bugfix/test-circular-reference' into 'develop' 
test: user enabled plug tests: fix circular reference

See merge request pleroma/pleroma!336
 2018-09-09 13:06:17 +00:00
William Pitcock a4fe14de02 tests: break the cycle using pleroma.factory 2018-09-09 12:56:25 +00:00
William Pitcock fc92bb28b4 tests: try breaking the cycle a different way 2018-09-09 12:43:58 +00:00
William Pitcock 33a5294fad test: user enabled plug tests: fix circular reference 2018-09-09 12:23:48 +00:00
kaniini f55ffc7893 Merge branch 'update/pleroma-fe-20180909' into 'develop' 
update pleroma frontend

See merge request pleroma/pleroma!335
 2018-09-09 12:15:14 +00:00
William Pitcock e5546c282f update pleroma frontend 2018-09-09 12:14:34 +00:00
kaniini b564c23d92 Merge branch 'suggestion-api-restriction' into 'develop' 
Make limit for /api/v1/suggestions

See merge request pleroma/pleroma!334
 2018-09-09 11:38:33 +00:00
Hakaba Hitoyo 4e1bb7bccb make limit for /api/v1/suggestions 2018-09-09 13:57:23 +09:00
lambda 045953225e Merge branch 'moonman/pleroma-sha512-crypt' into 'develop' 
auth overhaul and legacy GS auth

See merge request pleroma/pleroma!331
 2018-09-08 09:20:34 +00:00
kaniini 530561a091 Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop' 
Add Secure and SameSite cookie flags

See merge request pleroma/pleroma!302
 2018-09-07 23:55:42 +00:00
kaniini b0ec4f33e6 Merge branch 'improve-server-config-examples' into 'develop' 
Improve server config examples

See merge request pleroma/pleroma!307
 2018-09-07 23:55:01 +00:00
kaniini 3e4f39116b Merge branch 'feature/custom_media_url' into 'develop' 
[Pleroma.Uploaders.Local]: Add configuration for custom url path

See merge request pleroma/pleroma!318
 2018-09-07 23:49:36 +00:00
kaniini 14a762a213 Merge branch 'fix/tusk' into 'develop' 
Fix signin and initial loading with Tusk

See merge request pleroma/pleroma!333
 2018-09-07 23:47:43 +00:00
Martin Kühl c1d07da4e1 Mastodon API: Fake support for loading filters 2018-09-07 16:12:44 +02:00
Martin Kühl 619f67768a Mastodon API: Add unsupported attributes to relationship responses 
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
 2018-09-07 16:12:44 +02:00
lambda 403f9d118d Merge branch 'fix/test-failure-due-to/306' into 'develop' 
Fix the tests

See merge request pleroma/pleroma!332
 2018-09-06 06:50:15 +00:00
lain d22af29bb4 Fix warning. 2018-09-05 22:42:50 +02:00
lain 70163aec9b Add LegacyAuthenticationPlug to router. 2018-09-05 22:31:57 +02:00
lain 44b094908c Update legacy passwords automatically. 2018-09-05 22:30:14 +02:00
Martin Kühl ff38ffd9f8 Fix the tests 2018-09-05 22:20:59 +02:00
lain c0e067c74e Update Mix.lock 2018-09-05 22:00:41 +02:00
lain 3aba585e7a Add Plugs to router. 2018-09-05 21:57:56 +02:00
lain e601165426 Add UserEnabledPlug. 2018-09-05 21:53:53 +02:00
lain 5ce1ebb179 Add SetUserSessionIdPlug. 2018-09-05 21:42:42 +02:00
Haelwenn 4a3dbd9d4e Merge branch 'fix/sign-in-with-toot' into 'develop' 
Fix sign-in and sign-out with Toot!

See merge request pleroma/pleroma!306
 2018-09-05 18:20:26 +00:00
lain 636ad3e155 Add new plugs to router. 2018-09-05 19:13:53 +02:00
lain 12bc73dd28 Add EnsureUserKeyPlug, smaller fixes 2018-09-05 19:06:28 +02:00
lain 32465b9939 Simplify AuthenticationPlug 2018-09-05 18:53:38 +02:00
lain 9a96c93be7 Add SessionAuthenticationPlug. 2018-09-05 18:37:02 +02:00
lain a3f54fca4d Add LegacyAuthenticationPlug 2018-09-05 18:17:33 +02:00
lain 3cf17dc402 Add EnsureAuthenticatedPlug 2018-09-05 17:59:19 +02:00
lain faf5347748 Add UserFetcherPlug. 2018-09-05 17:44:38 +02:00
lain 42bd985e66 Add BasicAuthDecoderPlug 2018-09-05 17:30:05 +02:00
Moon Man 75bc68dbc1 pinned crypt dependency to specific commit 2018-09-05 02:29:19 -04:00
Moon Man 8b020e03a6 change cond to if else 2018-09-05 01:37:48 -04:00
Moon Man 1a8bc26e52 auth against sha512-crypt password hashes, upgrade to pbkdf2 2018-09-05 00:21:44 -04:00
shibayashi 8a4e2f48bf
installation/pleroma-apache.conf: OCSP stapling needs to be outside of the virtualhost directive 2018-09-03 21:41:21 +02:00
kaniini 8143251f06 Merge branch 'feature/staff-discovery-api' into 'develop' 
staff discovery api

See merge request pleroma/pleroma!326
 2018-09-03 15:00:56 +00:00
kaniini 76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api' 
# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
 2018-09-03 14:55:42 +00:00
William Pitcock d3f6814feb tests: add test for staffAccounts presence in nodeinfo 2018-09-03 14:48:36 +00:00
William Pitcock 9a21ff5f61 nodeinfo: add staffAccounts field to metadata 2018-09-03 14:48:31 +00:00
kaniini 1c9e539b47 Merge branch 'feature/mastodon_api_2.4.x' into 'develop' 
Add/Fix Mastodon endpoints for 2.4.3 compatibility

See merge request pleroma/pleroma!266
 2018-09-03 12:33:36 +00:00
kaniini 8fdddc255c Merge branch 'report-chat-and-gopher-support' into 'develop' 
Report chat and gopher support at /nodeinfo/2.0.json

See merge request pleroma/pleroma!327
 2018-09-03 12:32:19 +00:00
Hakaba Hitoyo b1124f1605 report chat and gopher support at /nodeinfo/2.0.json 2018-09-03 21:13:30 +09:00
William Pitcock b61430163b user: add moderator_user_query() 2018-09-03 12:03:23 +00:00
William Pitcock cf5d1302aa migrations: add is_moderator index for users table 2018-09-03 11:55:12 +00:00
kaniini 7ca2a2ddea Merge branch 'nil-bio-emojis' into 'develop' 
add nil clause for Formatter.get_emoji/1 to return an empty result

Closes #274

See merge request pleroma/pleroma!315
 2018-09-03 05:54:11 +00:00
Haelwenn 072e965015 Merge branch 'patch-2' into 'develop' 
Render notification IDs as strings, not numbers

See merge request pleroma/pleroma!325
 2018-09-03 02:03:51 +00:00
shadowfacts 35515cfa66 Update mastodon_api_controller.ex 2018-09-03 01:58:55 +00:00