Commits · 6eb33e73035789fd9160e697617feb30a3070589 · Pleroma / pleroma

31 Jul, 2019 5 commits
- test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id · 6eb33e73
  Maksim authored Jul 31, 2019 and kaniini committed Jul 31, 2019
  
  6eb33e73
- Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop' · 8980c1c7
  kaniini authored Jul 31, 2019
```
ostatus: explicitly disallow protocol downgrade from activitypub

See merge request pleroma/pleroma!1511
```
  8980c1c7
- ostatus: explicitly disallow protocol downgrade from activitypub · f72e0b7c
  kaniini authored Jul 31, 2019
```
This closes embargoed bug #1135.
```
  f72e0b7c
- Merge branch 'test/twitter/util_controller' into 'develop' · 957de9d7
  kaniini authored Jul 31, 2019
```
tests for TwitterApi/UtilController

See merge request pleroma/pleroma!1509
```
  957de9d7
- tests for TwitterApi/UtilController · 58443d0c
  Maksim authored Jul 31, 2019 and kaniini committed Jul 31, 2019
  
  58443d0c
30 Jul, 2019 2 commits
- Merge branch 'admin-changes' into 'develop' · 373a7c67
  kaniini authored Jul 30, 2019
```
Admin changes

See merge request pleroma/pleroma!1489
```
  373a7c67
- Admin changes · 51b3b6d8
  Alexander Strizhakov authored Jul 30, 2019 and kaniini committed Jul 30, 2019
  
  51b3b6d8
29 Jul, 2019 15 commits
- Merge branch 'security/remote-follow-commonapi' into 'develop' · 677df5ce
  kaniini authored Jul 29, 2019
```
twitter api: utils: rework do_remote_follow() to use CommonAPI

Closes #1138

See merge request !1506
```
  677df5ce
- twitter api: utils: rework do_remote_follow() to use CommonAPI · 38508125
  kaniini authored Jul 29, 2019
```
Closes #1138
```
  38508125
- Merge branch 'revert-83508418' into 'develop' · 66575061
  kaniini authored Jul 29, 2019
```
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

See merge request !1505
```
  66575061
- Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" · 58350692
  kaniini authored Jul 29, 2019
```
This reverts merge request !1504
```
  58350692
- Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop' · 83508418
  Haelwenn authored Jul 29, 2019
```
markdown: clean up html generated by earmark

See merge request pleroma/pleroma!1504
```
  83508418
- markdown: clean up html generated by earmark · 5795a890
  kaniini authored Jul 29, 2019
  
  5795a890
- Merge branch 'refactor/use-constants' into 'develop' · 1dfde415
  lain authored Jul 29, 2019
```
refactoring: begin to use constants

See merge request pleroma/pleroma!1500
```
  1dfde415
- Merge branch 'mailer-enabled-nodeinfo' into 'develop' · 3b8cd27b
  kaniini authored Jul 29, 2019
```
Add `mailerEnabled` to the NodeInfo metadata

See merge request pleroma/pleroma!1502
```
  3b8cd27b
- Add `mailerEnabled` to the NodeInfo metadata · 0bee2131
  Eugenij authored Jul 29, 2019 and kaniini committed Jul 29, 2019
  
  0bee2131
- Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop' · 8be01540
  kaniini authored Jul 29, 2019
```
Redirect not logged-in users to the MastoFE login page on private instances

Closes #1045

See merge request pleroma/pleroma!1503
```
  8be01540
- Redirect not logged-in users to the MastoFE login page on private instances · c0e258cf
  Sergey Suprunenko authored Jul 29, 2019 and kaniini committed Jul 29, 2019
  
  c0e258cf
- Merge branch 'tests/ostatus_controller' into 'develop' · 1f7c8d96
  kaniini authored Jul 29, 2019
```
added tests for OstatusController

See merge request pleroma/pleroma!1501
```
  1f7c8d96
- added tests for OstatusController · 159bbec5
  Maksim authored Jul 29, 2019 and kaniini committed Jul 29, 2019
  
  159bbec5
- constants: add as_public constant and use it everywhere · b93498eb
  kaniini authored Jul 29, 2019
  
  b93498eb
- mix: add ex_const dependency · 9d78b3b2
  kaniini authored Jul 29, 2019
  
  9d78b3b2
28 Jul, 2019 10 commits
- Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop' · b38d2106
  kaniini authored Jul 28, 2019
```
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users

Closes #1104

See merge request pleroma/pleroma!1498
```
  b38d2106
- transmogrifier: use User.delete() instead of handrolled user deletion code for remote users · 492d854e
  kaniini authored Jul 28, 2019
```
Closes #1104
```
  492d854e
- Merge branch 'confirmation-resend' into 'develop' · 44bfff22
  kaniini authored Jul 28, 2019
```
add account confirmation email resend in mastodon api

See merge request !1492
```
  44bfff22
- add account confirmation email resend in mastodon api · 242f5c58
  Sachin Joshi authored Jul 28, 2019 and kaniini committed Jul 28, 2019
  
  242f5c58
- Merge branch 'fix/user_update_and_set_cache' into 'develop' · 0d05ec38
  kaniini authored Jul 28, 2019
```
fixed User.update_and_set_cache for stale user

See merge request !1493
```
  0d05ec38
- fixed User.update_and_set_cache for stale user · 6a4b8b26
  Maksim authored Jul 28, 2019 and kaniini committed Jul 28, 2019
  
  6a4b8b26
- Merge branch 'develop' into 'develop' · 488c06b6
  kaniini authored Jul 28, 2019
```
Fix HTTP sig tweak on KeyId

See merge request !1496
```
  488c06b6
- Merge branch 'feature/hackney-303-redirect' into 'develop' · f78390ff
  kaniini authored Jul 28, 2019
```
Handle 303 redirects

Closes #1127

See merge request !1497
```
  f78390ff
- Handle 303 redirects · 02dc6518
  Sergey Suprunenko authored Jul 28, 2019 and kaniini committed Jul 28, 2019
  
  02dc6518
- Fix HTTP sig tweak on KeyId · 961e7785
  Thomas Sileo authored Jul 28, 2019
  
  961e7785
26 Jul, 2019 4 commits
- Merge branch 'issue/1097' into 'develop' · 08960d50
  rinpatch authored Jul 26, 2019
```
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/

See merge request pleroma/pleroma!1495
```
  08960d50
- [#1097 ] added redirect: /pleroma/admin -> /pleroma/admin/ · 6b77a883
  Maksim authored Jul 26, 2019
  
  6b77a883
- Merge branch 'changelog/1484-base_url-remove-media' into 'develop' · 46e8b680
  Haelwenn authored Jul 26, 2019
```
Changelog: !1484 base_url removed /media/

See merge request !1494
```
  46e8b680
- CHANGELOG.md: Add entry for !1484 · 7c8abbcb
  Haelwenn authored Jul 26, 2019
```
Related to: !1484

[ci skip]
```
  7c8abbcb
25 Jul, 2019 2 commits
- Merge branch 'tests/filter_dedupe' into 'develop' · d1e89106
  kaniini authored Jul 25, 2019
```
fixed test for elixir 1.7.4

See merge request pleroma/pleroma!1487
```
  d1e89106
- fixed test for elixir 1.7.4 · 03c38661
  Maksim authored Jul 25, 2019 and kaniini committed Jul 25, 2019
  
  03c38661
24 Jul, 2019 2 commits
- Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop' · 19835be0
  kaniini authored Jul 24, 2019
```
Fix remote follow from /ostatus_subscribe

Closes #1103

See merge request !1472
```
  19835be0
- Merge branch 'fix/put-correct-activity-url' into 'develop' · 931c4974
  kaniini authored Jul 24, 2019
```
Show the url advertised in the Activity in the Status JSON response

Closes #1077

See merge request !1485
```
  931c4974