Commits · cde7711b12d64081f16e88a3f3ac93c811471d61 · jeff / pleroma

Apr 16, 2019
- Merge branch 'bugfix/relax-spam-protection' into 'develop' · cde7711b
  Haelwenn authored 5 years ago
  
  activitypub: allow indirect messages from users being followed at a personal inbox See merge request pleroma/pleroma!1069
  cde7711b
- Merge branch 'patch-2' into 'develop' · 6ddaeb14
  kaniini authored 5 years ago
  
  Add supervisord configuration See merge request pleroma/pleroma!1066
  6ddaeb14
- Merge branch 'fix/follow-imports' into 'develop' · 5f31e7ec
  kaniini authored 5 years ago
  
  Handle new-style mastodon follow lists Closes #814 See merge request pleroma/pleroma!1067
  5f31e7ec
- Handle new-style mastodon follow lists · d4a749cf
  Normandy authored 5 years ago
  
  Fixes pleroma/pleroma#814
  d4a749cf
- activitypub: allow indirect messages from users being followed at a personal inbox · 750b369d
  kaniini authored 5 years ago
  
  750b369d
- Merge branch 'deps/bump-exdoc' into 'develop' · 0d4afdc6
  rinpatch authored 5 years ago
  
  Bump ex_doc to 20.2 See merge request pleroma/pleroma!1068
  0d4afdc6
- Bump ex_doc · 37da0349
  rinpatch authored 5 years ago
  
  37da0349
- Add supervisord configuration · 498c96d4
  Dominik V. Salonen authored 5 years ago
  
  498c96d4
Apr 15, 2019
- Merge branch 'remove-footguns' into 'develop' · 776f1e3b
  rinpatch authored 5 years ago
  
  Remove ambiguous documentation regarding emoji and config.exs See merge request pleroma/pleroma!1064
  776f1e3b
- Custom Emoji docs: Make it clear that config.exs is not for lewd. · 088f3784
  lain authored 5 years ago
  
  088f3784
- Config.exs: Add big warning so that nobody ever edits it. · 4fecd6f9
  lain authored 5 years ago
  
  4fecd6f9
- Merge branch 'fix/status-reblogged' into 'develop' · 56956de6
  lain authored 5 years ago
  
  Assign reblogged in the Mastodon reblog status view Closes #812 See merge request !1057
  56956de6
- Merge branch 'unfollow-oneself' into 'develop' · f358295c
  lain authored 5 years ago
  
  Consistent response for self follow/unfollow Closes #819 See merge request pleroma/pleroma!1061
  f358295c
- Merge branch 'refactor/remove-inReplyToStatusId' into 'develop' · f8966993
  lain authored 5 years ago
  
  Remove inReplyToStatusId See merge request pleroma/pleroma!1062
  f8966993
- Use User.get_cached_by* · 27d78dc5
  Eugenij authored 5 years ago
  
  27d78dc5
- oops · fd2e31af
  rinpatch authored 5 years ago
  
  fd2e31af
- Remove inReplyToStatusId · 5d73dca0
  rinpatch authored 5 years ago
  
  5d73dca0
- Handle follow/unfollow directed to themselves · 507e7821
  Eugenij authored 5 years ago
  
  507e7821
Apr 14, 2019
- Merge branch 'bugfix/registration-email-pattern' into 'develop' · 8c6d5a6b
  rinpatch authored 5 years ago
  
  fix pattern match on user registration See merge request pleroma/pleroma!1058
  8c6d5a6b
- Revert "Assert on the success of enqueue before returning" · e513504e
  Sadposter authored 5 years ago
  
  This reverts commit 16d8c8b3. Because it breaks everything
  e513504e
- Assert on the success of enqueue before returning · 16d8c8b3
  Sadposter authored 5 years ago
  
  16d8c8b3
- Always return {atom, _} from try_send_confirmation · 5e455577
  Sadposter authored 5 years ago
  
  5e455577
- fix pattern match on user registration · ec42b639
  Sadposter authored 5 years ago
  
  deliver_async will return a single atom
  ec42b639
- Assign reblogged in the Mastodon reblog status view · 679a8ef6
  Eugenij authored 5 years ago
  
  679a8ef6
- Merge branch 'docs/archlinux-odbc' into 'develop' · 7304e0ce
  kaniini authored 5 years ago
  
  docs/installation/arch_linux_en.md: Remove useless ODBC See merge request pleroma/pleroma!1055
  7304e0ce
Apr 13, 2019
- docs/installation/arch_linux_en.md: Remove useless ODBC · 48982169
  Haelwenn authored 5 years ago
  
  See [1] for confirmation. 1: pleroma/pleroma!1050 (comment 24402)
  Verified
  
  48982169
- Merge branch 'docs/changelog' into 'develop' · 050339c2
  Haelwenn authored 5 years ago
  
  Add a changelog See merge request pleroma/pleroma!1053
  050339c2
- Put an actual description of the vulnerability and add **Breaking:** to breaking changes · 3018d81d
  rinpatch authored 5 years ago
  
  3018d81d
Apr 12, 2019
- Add a changelog · 3a805cc3
  rinpatch authored 5 years ago
  
  3a805cc3
- Merge branch 'improve-formatter' into 'develop' · 334b2d78
  Haelwenn authored 5 years ago
  
  Improve formatter and update `auto_linker` Closes #795 See merge request pleroma/pleroma!1036
  334b2d78
- Revert "simplify mentions escape" · f9af90c5
  minibikini authored 5 years ago and Haelwenn committed 5 years ago
  
  This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
  f9af90c5
- Merge branch 'bugfix/pleroma-email-naming' into 'develop' · 184ae60b
  lain authored 5 years ago
  
  Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029
  184ae60b
- Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' · 0a09692c
  lain authored 5 years ago
  
  Features: mastoapi-2.6.0 `min_id` pagination Closes #351 See merge request pleroma/pleroma!976
  0a09692c
- Merge branch 'fix/732-password-align' into 'develop' · 57d5ff57
  lain authored 5 years ago
  
  password reset page labels align See merge request pleroma/pleroma!986
  57d5ff57
- Merge branch 'ssl_trusted_cert' into 'develop' · 1b4c4d29
  lain authored 5 years ago
  
  ssl_trusted_certificate should point to chain.pem if we're demonstrating... See merge request pleroma/pleroma!996
  1b4c4d29
- Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop' · 30a4318e
  kaniini authored 5 years ago
  
  adding destroy multiple for mastofe See merge request pleroma/pleroma!1046
  30a4318e
- adding destroy multiple for mastofe · 711ade96
  Alexander Strizhakov authored 5 years ago
  
  711ade96
- Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop' · 9825a943
  kaniini authored 5 years ago
  
  in_reply_to_id - null See merge request pleroma/pleroma!1037
  9825a943
- in_reply_to_id - null · e03d24af
  Alexander Strizhakov authored 5 years ago
  
  e03d24af
Apr 11, 2019

Merge branch 'fix/hackney_max_body_param' into 'develop' · 31c06dba

kaniini authored 5 years ago

Add `with_body: true` to requests relying on `max_body: val`

Closes #778

See merge request pleroma/pleroma!1049

31c06dba