kaniini
|
8eed5938d5
|
Merge branch 'update-pleroma-frontend' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!344
|
6 years ago |
|
kaniini
|
c2650f0ffb
|
Merge branch 'feature/html-scrub-policy' into 'develop'
html scrub policy
See merge request pleroma/pleroma!339
|
6 years ago |
|
hakabahitoyo
|
f829b18273
|
update-pleroma-frontend
|
6 years ago |
|
Haelwenn
|
90661e20cf
|
Merge branch 'patch-3' into 'develop'
Add visible_in_picker to status emojis
See merge request pleroma/pleroma!342
|
6 years ago |
|
shadowfacts
|
85b8590109
|
Update status_view_test.exs
|
6 years ago |
|
shadowfacts
|
39aed5348a
|
Add visible_in_picker to status emojis
|
6 years ago |
|
kaniini
|
da3f930543
|
Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'
activitypub: transmogrifier: allow profile updates from bots
See merge request pleroma/pleroma!341
|
6 years ago |
|
William Pitcock
|
d3248e13e3
|
activitypub: transmogrifier: allow profile updates from bots
|
6 years ago |
|
kaniini
|
b0a5637254
|
Merge branch 'refactor/mrf-pattern-matching' into 'develop'
MRF: significant refactoring
See merge request pleroma/pleroma!340
|
6 years ago |
|
William Pitcock
|
e0b8c0ccba
|
MRF: reject non-public: use pattern match to remove unnecessary if block
|
6 years ago |
|
William Pitcock
|
88094c266d
|
MRF: simple policy: refactor module to use guards and pattern matching
|
6 years ago |
|
William Pitcock
|
97253df3ee
|
MRF: simple policy: contain media removal/nsfw ops to create activities only
|
6 years ago |
|
William Pitcock
|
e82ce2a4b3
|
formatting
|
6 years ago |
|
William Pitcock
|
358f88e10a
|
html: allow inline images by default (because of custom emoji)
|
6 years ago |
|
William Pitcock
|
40e2f6e500
|
html: add default scrubbing profile and configuration knobs
|
6 years ago |
|
William Pitcock
|
ac486fc59b
|
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
|
6 years ago |
|
William Pitcock
|
255f46d7ab
|
html: new module providing a configurable markup scrubbing policy
|
6 years ago |
|
kaniini
|
7b96d20328
|
Merge branch 'bugfix/missing-url-encoding-oauth-token-redirect' into 'develop'
Add missing URL encoding in create authorization redirect
See merge request pleroma/pleroma!338
|
6 years ago |
|
Dominique Feyer
|
801d645c6b
|
TASK: Fix formatting
|
6 years ago |
|
Dominique Feyer
|
b79c126ee0
|
Add missing URL encoding in create authorization redirect
|
6 years ago |
|
kaniini
|
3f64ba5fc8
|
Merge branch 'bugfix/test-circular-reference' into 'develop'
test: user enabled plug tests: fix circular reference
See merge request pleroma/pleroma!336
|
6 years ago |
|
William Pitcock
|
a4fe14de02
|
tests: break the cycle using pleroma.factory
|
6 years ago |
|
William Pitcock
|
fc92bb28b4
|
tests: try breaking the cycle a different way
|
6 years ago |
|
William Pitcock
|
33a5294fad
|
test: user enabled plug tests: fix circular reference
|
6 years ago |
|
kaniini
|
f55ffc7893
|
Merge branch 'update/pleroma-fe-20180909' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!335
|
6 years ago |
|
William Pitcock
|
e5546c282f
|
update pleroma frontend
|
6 years ago |
|
kaniini
|
b564c23d92
|
Merge branch 'suggestion-api-restriction' into 'develop'
Make limit for /api/v1/suggestions
See merge request pleroma/pleroma!334
|
6 years ago |
|
Hakaba Hitoyo
|
4e1bb7bccb
|
make limit for /api/v1/suggestions
|
6 years ago |
|
lambda
|
045953225e
|
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
|
6 years ago |
|
kaniini
|
530561a091
|
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
|
6 years ago |
|
kaniini
|
b0ec4f33e6
|
Merge branch 'improve-server-config-examples' into 'develop'
Improve server config examples
See merge request pleroma/pleroma!307
|
6 years ago |
|
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
|
6 years ago |
|
kaniini
|
14a762a213
|
Merge branch 'fix/tusk' into 'develop'
Fix signin and initial loading with Tusk
See merge request pleroma/pleroma!333
|
6 years ago |
|
Martin Kühl
|
c1d07da4e1
|
Mastodon API: Fake support for loading filters
|
6 years ago |
|
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.
|
6 years ago |
|
lambda
|
403f9d118d
|
Merge branch 'fix/test-failure-due-to/306' into 'develop'
Fix the tests
See merge request pleroma/pleroma!332
|
6 years ago |
|
lain
|
d22af29bb4
|
Fix warning.
|
6 years ago |
|
lain
|
70163aec9b
|
Add LegacyAuthenticationPlug to router.
|
6 years ago |
|
lain
|
44b094908c
|
Update legacy passwords automatically.
|
6 years ago |
|
Martin Kühl
|
ff38ffd9f8
|
Fix the tests
|
6 years ago |
|
lain
|
c0e067c74e
|
Update Mix.lock
|
6 years ago |
|
lain
|
3aba585e7a
|
Add Plugs to router.
|
6 years ago |
|
lain
|
e601165426
|
Add UserEnabledPlug.
|
6 years ago |
|
lain
|
5ce1ebb179
|
Add SetUserSessionIdPlug.
|
6 years ago |
|
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
|
6 years ago |
|
lain
|
636ad3e155
|
Add new plugs to router.
|
6 years ago |
|
lain
|
12bc73dd28
|
Add EnsureUserKeyPlug, smaller fixes
|
6 years ago |
|
lain
|
32465b9939
|
Simplify AuthenticationPlug
|
6 years ago |
|
lain
|
9a96c93be7
|
Add SessionAuthenticationPlug.
|
6 years ago |
|
lain
|
a3f54fca4d
|
Add LegacyAuthenticationPlug
|
6 years ago |
