summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-17activitypub: factor out AP object fetching to it's own function and add ↵William Pitcock
ID-based containment
2018-11-17Web.AdminAPI.AdminAPIController: Change right to permission group (except ↵Haelwenn (lanodan) Monnier
for function names)
2018-11-17lib/mix/tasks/relay_{un,}follow.ex: Use a with blockHaelwenn (lanodan) Monnier
2018-11-17lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of ↵Haelwenn (lanodan) Monnier
Relay.{un,}follow
2018-11-17lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}followHaelwenn (lanodan) Monnier
2018-11-17Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it ↵Haelwenn (lanodan) Monnier
worked, :error if it didn’t
2018-11-17lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not ↵Haelwenn (lanodan) Monnier
admin.”
2018-11-17lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin ↵Haelwenn (lanodan) Monnier
themselves
2018-11-17Pleroma.Web.AdminAPI.AdminAPIController: user_create statement formatHaelwenn (lanodan) Monnier
2018-11-17Add get endpoints for rights [AdminAPI]Haelwenn (lanodan) Monnier
2018-11-17Fix connection returns make generic right endpoint [AdminAPI]Haelwenn (lanodan) Monnier
2018-11-17admin_api_controller.ex: fix remaining params at onceHaelwenn (lanodan) Monnier
2018-11-17admin_api_controller.ex: Add documentation, fix get_invite_tokenHaelwenn (lanodan) Monnier
2018-11-17admin_api_controller.ex: get_password_reset: fix params and responseHaelwenn (lanodan) Monnier
2018-11-17lib/pleroma/web/admin_api/admin_api_controller.ex: ↵Haelwenn (lanodan) Monnier
Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController
2018-11-17[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, ↵Haelwenn (lanodan) Monnier
fix error reporting
2018-11-17lib/mix/tasks/make_admin.ex: New taskHaelwenn (lanodan) Monnier
2018-11-17lib/pleroma/plugs/user_is_admin_plug.ex: CreateHaelwenn (lanodan) Monnier
2018-11-17admin_api_controller: Have some basic codeHaelwenn (lanodan) Monnier
2018-11-17admin_api_controller.ex: CreateHaelwenn (lanodan) Monnier
2018-11-17Merge branch 'security/actor-containment' into 'develop'lambda
security hotfix: actor containment See merge request pleroma/pleroma!460
2018-11-17tests: add a second spoofing variantWilliam Pitcock
2018-11-17activitypub: fetch_object_from_id(): prefer `actor` over `attributedTo` to ↵William Pitcock
avoid spoofing
2018-11-17test: fix more test defectsWilliam Pitcock
2018-11-17tests: add additional spoofing testsWilliam Pitcock
2018-11-17transmogrifier tests: fix defective spoofing testWilliam Pitcock
2018-11-17test: httpoison mock: add second spoofing activity testWilliam Pitcock
2018-11-17Merge branch 'feature/uploader-mdii' into 'develop'kaniini
Feature / MDII Uploader See merge request pleroma/pleroma!454
2018-11-17fallbacking into local uploaderhakabahitoyo
2018-11-17better config readinghakabahitoyo
2018-11-16Merge branch 'bugfix/dm-timeline-scope' into 'develop'kaniini
TwitterAPI: Fix dm_timeline displaying only half of the conversation. See merge request pleroma/pleroma!457
2018-11-16TwitterAPI: Fix dm_timeline displaying only half of the conversation.lain
2018-11-16Merge branch 'feature/pleromafe-usersearch' into 'develop'lambda
Add Twitter / Pleroma API user search See merge request pleroma/pleroma!452
2018-11-16Merge branch 'bugfix/csp-remove-form-action' into 'develop'kaniini
http security: remove form-action from CSP definitions Closes #379 See merge request pleroma/pleroma!456
2018-11-16http security: remove form-action from CSP definitionsWilliam Pitcock
2018-11-16Add better test for user search functionlity.lain
2018-11-16Merge branch 'fix/test' into 'develop'lambda
Reset http security settings to fix plug test See merge request pleroma/pleroma!455
2018-11-17Reset http security settings to fix plug testAkiraFukushima
2018-11-16better confighakabahitoyo
2018-11-16better extension detectionhakabahitoyo
2018-11-15debughakabahitoyo
2018-11-15formathakabahitoyo
2018-11-15debufHakaba Hitoyo
2018-11-15omplement mdii uploaderHakaba Hitoyo
2018-11-15add mdii uploaderHakaba Hitoyo
2018-11-15Merge remote-tracking branch 'official/develop' into developHakaba Hitoyo
2018-11-15Revert "update pleroma frontend"Hakaba Hitoyo
This reverts commit 025301546702a6fe9167e49453c3a9b44607fb75.
2018-11-14Format.lain
2018-11-14Add Pleroma user search api for PleromaFE.lain
2018-11-14Merge branch 'fix-media-proxy-filename' into 'develop'lambda
media_proxy: use path only to retrieve filename See merge request pleroma/pleroma!450