Commit Graph

8801 Commits (51fc504705c1ab337b1202d6e407a9578e67a9e9)
 

Author SHA1 Message Date
lain 51fc504705 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain 288f2b5a7c Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain 0be1fa0a86 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain 057438a657 CommonAPI: DRY up a bit.
5 years ago
lain aebec1bac9 Validator Test: Small refactor.
5 years ago
lain 643f15e77b Validators: ObjectID is an http uri.
5 years ago
lain f6835333be Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain 29ab1d9f8d Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain 69fc1dd69f Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
lain 0c60c0a76a Validators: Use correct type for IDs.
5 years ago
lain 0adaab8e75 Bump copyright dates.
5 years ago
lain eaacc64839 Refactors.
5 years ago
lain ee979dd6d7 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain d7aa0b645b Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
5 years ago
lain 4cf1007a7d ActivityPub: Small refactor.
5 years ago
rinpatch f316882464 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
lain aaf00f1ff5 Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
lain 74560e888e Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
5 years ago
lain 6c1232b486 NotificationController: Fix test.
5 years ago
lain 1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain d63dca8d99 Merge branch 'feature/1635-notifications-include-types' into 'develop'
5 years ago
Alexander Strizhakov 98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
lain 952cb589f4 Merge branch 'fix-testing' into 'develop'
5 years ago
lain 9b9d67bbec Fix linting.
5 years ago
lain 3c2c32b460 Merge branch 'remake-remodel' into develop
5 years ago
stwf a8c6933ca0 remove federated testing
5 years ago
rinpatch 69341cbcba Merge branch 'feature/1530-removing-with_move' into 'develop'
5 years ago
Haelwenn e4380afc18 Merge branch 'docs/mrf_object_age' into 'develop'
5 years ago
Alexander Strizhakov f3791add99
removing with_move parameter
5 years ago
Mark Felder 8dd01b24d2 Improve documentation of mrf_object_age
5 years ago
rinpatch b80958d4e3 Merge branch 'feat/templates' into 'develop'
5 years ago
rinpatch 7829de6da4 gitlab: create templates for bug reports and release MRs
5 years ago
rinpatch ac5c2b66b9 Merge branch 'fix-warnings-in-tests' into 'develop'
5 years ago
Alexander Strizhakov dc2ec84c0f
warnings fix
5 years ago
rinpatch c2527b8c63 Merge branch 'removing-deprecated' into 'develop'
5 years ago
Alexander Strizhakov ba90a6d3e5
removing from descriptions.exs deprecated settings
5 years ago
rinpatch 34fd1c2c9d Merge branch 'bugfix/earmark_renderer_test' into 'develop'
5 years ago
rinpatch df2608ebf8 Merge branch 'features/staticfe-sanitization' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 8176ca9e40 static_fe: Sanitize HTML in users
5 years ago
Haelwenn (lanodan) Monnier acb016397e mix.lock: [minor] last hash appended
5 years ago
Haelwenn (lanodan) Monnier 0ac6e29654 static_fe: Sanitize HTML in posts
5 years ago
lain fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
5 years ago
Haelwenn d84670b9e1 Merge branch 'f' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier dca21cd1d6 test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
5 years ago
Haelwenn 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
5 years ago
rinpatch e87a32bcd7 rip out fetch_initial_posts
5 years ago
rinpatch 85ac909160 Merge branch 'bugfix/pleroma_conversation_api' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 8f7bc07ebc pleroma_api_controller.ex: Improve conversations error reporting
5 years ago
Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
rinpatch 14ebf8f1e5 Merge branch 'update/admin-fe-20200312' into 'develop'
5 years ago