summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-03-31CommonAPI: DRY up a bit.lain
2020-03-31Validator Test: Small refactor.lain
2020-03-31Validators: ObjectID is an http uri.lain
2020-03-31Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.exlain
2020-03-26Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into re...lain
2020-03-26Apply suggestion to lib/pleroma/web/activity_pub/pipeline.exlain
2020-03-26Validators: Use correct type for IDs.lain
2020-03-26Bump copyright dates.lain
2020-03-26Refactors.lain
2020-03-26Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into re...lain
2020-03-26Apply suggestion to lib/pleroma/web/activity_pub/object_validator.exlain
2020-03-26ActivityPub: Small refactor.lain
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.exrinpatch
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/pipeline.exlain
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_val...lain
2020-03-20NotificationController: Fix test.lain
2020-03-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-03-20Merge branch 'feature/1635-notifications-include-types' into 'develop'lain
2020-03-20include_types parameter in /api/v1/notificationsAlexander Strizhakov
2020-03-19Merge branch 'fix-testing' into 'develop'lain
2020-03-19Fix linting.lain
2020-03-19Merge branch 'remake-remodel' into developlain
2020-03-19remove federated testingstwf
2020-03-18Merge branch 'feature/1530-removing-with_move' into 'develop'rinpatch
2020-03-16Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
2020-03-16removing with_move parameterAlexander Strizhakov
2020-03-16Improve documentation of mrf_object_ageMark Felder
2020-03-16Merge branch 'feat/templates' into 'develop'rinpatch
2020-03-16gitlab: create templates for bug reports and release MRsrinpatch
2020-03-16Merge branch 'fix-warnings-in-tests' into 'develop'rinpatch
2020-03-16warnings fixAlexander Strizhakov
2020-03-16Merge branch 'removing-deprecated' into 'develop'rinpatch
2020-03-16removing from descriptions.exs deprecated settingsAlexander Strizhakov
2020-03-15Merge branch 'bugfix/earmark_renderer_test' into 'develop'rinpatch
2020-03-15Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
2020-03-15static_fe: Sanitize HTML in usersHaelwenn (lanodan) Monnier
2020-03-15mix.lock: [minor] last hash appendedHaelwenn (lanodan) Monnier
2020-03-15static_fe: Sanitize HTML in postsHaelwenn (lanodan) Monnier
2020-03-15Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'lain
2020-03-15Merge branch 'f' into 'develop'Haelwenn
2020-03-15test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.exHaelwenn (lanodan) Monnier
2020-03-15Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'Haelwenn
2020-03-15rip out fetch_initial_postsrinpatch
2020-03-15Merge branch 'bugfix/pleroma_conversation_api' into 'develop'rinpatch
2020-03-15pleroma_api_controller.ex: Improve conversations error reportingHaelwenn (lanodan) Monnier
2020-03-14Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federatin...Ivan Tashkinov
2020-03-14Merge branch 'update/admin-fe-20200312' into 'develop'rinpatch
2020-03-14Merge branch 'fix/cache-control-headers' into 'develop'rinpatch
2020-03-13uploaded media plug: do not inject compile-time params on every requestrinpatch
2020-03-13Merge branch 'feature/mastofe-admin-scope' into 'develop'rinpatch