Commits · 8c9227c1f1fa9c98069b549976be5b9c4ace076e · jeff / pleroma · GitLab

Snippets Groups Projects

Apr 25, 2019
- Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop' · 8c9227c1
  Haelwenn authored 6 years ago
  8c9227c1
- activitypub: transmogrifier: send reject follow if following does not succeed · 0fd0ffcd
  kaniini authored 6 years ago
  
  0fd0ffcd
Apr 23, 2019
- Merge branch 'security/fix-html-class-scrubbing' into 'develop' · 030a7876
  kaniini authored 6 years ago
  030a7876
- html: lock down allowed class attributes to only those related to microformats · f5535e57
  kaniini authored 6 years ago
  
  f5535e57
- Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop' · 37899457
  kaniini authored 6 years ago
  37899457
- Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789 ) · 9dd36e5b
  Sergey Suprunenko authored 6 years ago
  
  9dd36e5b
- Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop' · 10c40e13
  kaniini authored 6 years ago
  10c40e13
- Merge branch 'fix/normalize-activities' into 'develop' · aa9d3789
  kaniini authored 6 years ago
  aa9d3789
- Merge branch 'develop' into 'develop' · 7dcac0ba
  kaniini authored 6 years ago
  7dcac0ba
Apr 22, 2019
- Merge branch 'add-healthcheck-setting-to-config' into 'develop' · 414902cd
  kaniini authored 6 years ago
  414902cd
- Add :emoji settings to config.md · 74ef14b0
  ilja authored 6 years ago
  
  74ef14b0
- added healthcheck setting to instance config · d35246c4
  Alexander Strizhakov authored 6 years ago
  
  d35246c4
- Add shortcode_globs setting to documentation · c876b04a
  ilja authored 6 years ago
  
  c876b04a
- Add a changelog entry for `pleroma.in_reply_to_account_acct` · f4c9b793
  rinpatch authored 6 years ago
  
  f4c9b793
- Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity · f60d072b
  rinpatch authored 6 years ago
  
  f60d072b
- Replace Object.normalize(activity.data[object] with Object.normalize(acitivty)... · d21d921d
  rinpatch authored 6 years ago
  d21d921d
- Merge branch 'fix/emoji-task-docs' into 'develop' · 20deff75
  rinpatch authored 6 years ago
  20deff75
- Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix · 952a4ae6
  rinpatch authored 6 years ago
  952a4ae6
- Merge branch 'get-cached-everywhere' into 'develop' · 0b6d1d92
  kaniini authored 6 years ago
  0b6d1d92
- Use `User.get_cached*` everywhere · b9cdf6d3
  minibikini authored 6 years ago
  
  b9cdf6d3
- Merge branch 'feature/826-healthcheck-endpoint' into 'develop' · 05862ded
  kaniini authored 6 years ago
  05862ded
- Feature/826 healthcheck endpoint · 88f0be96
  Alexander Strizhakov authored 6 years ago
  
  88f0be96
- Merge branch 'rework-emoji-management' into 'develop' · 7fcbda70
  kaniini authored 6 years ago
  7fcbda70
Apr 21, 2019
- Fix emoji.txt / custom_emoji.txt / shortcode_globs handling · 3cefdc62
  vaartis authored 6 years ago
  
  3cefdc62
- Merge branch 'docs/posting_formatted' into 'develop' · 6c0e07b8
  rinpatch authored 6 years ago
  6c0e07b8
- Formatting · ba19ba8a
  vaartis authored 6 years ago
  
  ba19ba8a
- Change the default manifest to pleroma's namespace · 0d6265cf
  vaartis authored 6 years ago
  
  0d6265cf
- Replace MD5 with SHA256 for emoji pack verification · 153f5375
  vaartis authored 6 years ago
  
  153f5375
- Wrap the docstrings to 70 characters · d5c0fd35
  vaartis authored 6 years ago
  
  d5c0fd35
- Merge branch '923_oauth_controller_refactoring_p2' into 'develop' · 5300cd56
  lain authored 6 years ago
  5300cd56
- differences_in_mastoapi_responses.md: `content_type` parameter of post submission · d0863197
  Haelwenn authored 6 years ago
  
  d0863197
- [#923 ] Refactored OAuthController#authorize definitions, added test. · 9256d2d4
  Ivan Tashkinov authored 6 years ago
  
  9256d2d4
- Merge branch 'fix/mastoapi-status-view' into 'develop' · ad157f16
  kaniini authored 6 years ago
  ad157f16
- Set correct values in the MastoAPI reblog status view · 375fd210
  Eugenij authored 6 years ago
  
  375fd210
- Merge branch 'fix/follow-with-reblogs' into 'develop' · 2d54fdcd
  kaniini authored 6 years ago
  2d54fdcd
- Merge branch 'patch-1' into 'develop' · e48848da
  kaniini authored 6 years ago
  e48848da
Apr 20, 2019
- Mention Mastodon 2.8+ follow import fix in changelog · 25fa1049
  Francis Dinh authored 6 years ago
  
  25fa1049
- Remove most finmoji mentions where appropriate · 8f93d4c4
  vaartis authored 6 years ago
  
  8f93d4c4
- Add the emoji packs & finmoji removal to the changelog · 1f3ddb03
  vaartis authored 6 years ago
  
  1f3ddb03
- Fix priv/static/instance/static to be just instance/static · 53a3e610
  vaartis authored 6 years ago
  53a3e610