Commits · 3018d81d870f64b2d0bc988d49b9eb4f9ff7c228 · Pleroma / pleroma

13 Apr, 2019 1 commit
- Put an actual description of the vulnerability and add **Breaking:** to breaking changes · 3018d81d
  rinpatch authored Apr 13, 2019
  
  3018d81d
12 Apr, 2019 9 commits
- Add a changelog · 3a805cc3
  rinpatch authored Apr 13, 2019
  
  3a805cc3
- Merge branch 'bugfix/pleroma-email-naming' into 'develop' · 184ae60b
  lain authored Apr 12, 2019
```
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 Apr 12, 2019
```
Features: mastoapi-2.6.0 `min_id` pagination

Closes #351

See merge request !976
```
  0a09692c
- Merge branch 'fix/732-password-align' into 'develop' · 57d5ff57
  lain authored Apr 12, 2019
```
password reset page labels align

See merge request !986
```
  57d5ff57
- Merge branch 'ssl_trusted_cert' into 'develop' · 1b4c4d29
  lain authored Apr 12, 2019
```
ssl_trusted_certificate should point to chain.pem if we're demonstrating...

See merge request !996
```
  1b4c4d29
- Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop' · 30a4318e
  kaniini authored Apr 12, 2019
```
adding destroy multiple for mastofe

See merge request !1046
```
  30a4318e
- adding destroy multiple for mastofe · 711ade96
  Alexander Strizhakov authored Apr 12, 2019
  
  711ade96
- Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop' · 9825a943
  kaniini authored Apr 12, 2019
```
in_reply_to_id - null

See merge request !1037
```
  9825a943
- in_reply_to_id - null · e03d24af
  Alexander Strizhakov authored Apr 12, 2019
  
  e03d24af
11 Apr, 2019 4 commits
- Merge branch 'fix/hackney_max_body_param' into 'develop' · 31c06dba
  kaniini authored Apr 11, 2019
```
Add `with_body: true` to requests relying on `max_body: val`

Closes #778

See merge request !1049
```
  31c06dba
- Add `with_body: true` to requests relying on `max_body: val` · 4615e562
  Roman Chvanikov authored Apr 12, 2019
  
  4615e562
- Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop' · 42d2c8d9
  lain authored Apr 11, 2019
```
Update Mastodon Frontend to 2019-04-11 bundle

See merge request !1044
```
  42d2c8d9
- Update Mastodon Frontend to 2019-04-11 bundle · 51c97d71
  Haelwenn authored Apr 11, 2019
```
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11

[ci skip]
```
  51c97d71
10 Apr, 2019 10 commits
- Merge branch 'feature/767-multiple-use-invite-token' into 'develop' · e5d553aa
  lain authored Apr 10, 2019
```
Feature/767 multiple use invite token

See merge request !1032
```
  e5d553aa
- Merge branch 'feature/user-status-subscriptions' into 'develop' · 6504b43f
  lain authored Apr 10, 2019
```
Add ability to subscribe to users

See merge request !1024
```
  6504b43f
- Merge branch 'develop' into feature/user-status-subscriptions · be8350ba
  Sadposter authored Apr 10, 2019
  
  be8350ba
- Merge branch 'fix/emoji-api-nonsense' into 'develop' · c8440b5e
  lain authored Apr 10, 2019
```
Change response format of /api/pleroma/emoji so it makes sense

See merge request !1038
```
  c8440b5e
- s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ · 9c1b3685
  Haelwenn authored Apr 10, 2019
  
  9c1b3685
- s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ · cae02317
  Haelwenn authored Apr 10, 2019
  
  cae02317
- s/Pleroma.Mailer/Pleroma.Emails.Mailer/ · 1791ee8e
  Haelwenn authored Apr 10, 2019
  
  1791ee8e
- Merge branch 'hotfix/fix_undefined_summary' into 'develop' · 0ab563d3
  kaniini authored Apr 10, 2019
```
transmogrifier.ex: Add fix_summary/1

See merge request pleroma/pleroma!1039
```
  0ab563d3
- Merge branch 'notification-pleroma-settings' into 'develop' · 97395e01
  kaniini authored Apr 10, 2019
```
Notification controls

Closes #738

See merge request pleroma/pleroma!988
```
  97395e01
- transmogrifier.ex: Add fix_summary/1 · cf9ba8fe
  Haelwenn authored Apr 10, 2019
```
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
```
  cf9ba8fe
09 Apr, 2019 4 commits
- Change response format of /api/pleroma/emoji to the one that actually makes sense · b57b4302
  rinpatch authored Apr 09, 2019
  
  b57b4302
- Merge branch 'mastoapi/plaintext-statuses' into 'develop' · 144648de
  rinpatch authored Apr 09, 2019
```
Provide plaintext representations of content/cw in MastoAPI

Closes #787

See merge request pleroma/pleroma!1035
```
  144648de
- Merge branch 'bugfix/follower_count' into 'develop' · 0a02ed7a
  lain authored Apr 09, 2019
```
update the follower count when a follower is blocked

See merge request pleroma/pleroma!1033
```
  0a02ed7a
- update the follower count when a follower is blocked · 07afb9b5
  Sachin Joshi authored Apr 08, 2019
  
  07afb9b5
08 Apr, 2019 12 commits
- Used cached user resources in subscriptions · 589629cf
  Sadposter authored Apr 08, 2019
  
  589629cf
- removing not needed invite update · fee50636
  Alexander Strizhakov authored Apr 08, 2019
  
  fee50636
- fix for elixir 1.7.4 · d0696fdf
  Alexander Strizhakov authored Apr 08, 2019
  
  d0696fdf
- Use Pleroma.Config instead of Application.get_env · 87a01f9e
  Sadposter authored Apr 08, 2019
  
  87a01f9e
- Merge branch 'use-jobs-in-webpush' into 'develop' · 4977e96f
  lain authored Apr 08, 2019
```
Use PleromaJobQueue in Pleroma.Web.Push

See merge request pleroma/pleroma!1023
```
  4977e96f
- Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush · 9abf832b
  minibikini authored Apr 08, 2019
  
  9abf832b
- Sever subscription in case of block · 13ff312c
  Sadposter authored Apr 08, 2019
  
  13ff312c
- Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' · e19590c9
  lain authored Apr 08, 2019
```
Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019
```
  e19590c9
- Merge branch 'twitter_oauth' into 'develop' · fd45cab9
  lain authored Apr 08, 2019
```
OAuth consumer (sign in / sign up with external provider)

See merge request !923
```
  fd45cab9
- Merge branch 'feature/697-language-tag-metadata' into 'develop' · ff929083
  lain authored Apr 08, 2019
```
adding language tag

See merge request !1034
```
  ff929083
- adding language tag · 36c0a10f
  Alexander Strizhakov authored Apr 08, 2019 and lain committed Apr 08, 2019
  
  36c0a10f
- test for valid_invite? · f0ca0696
  Alexander Strizhakov authored Apr 08, 2019
  
  f0ca0696