Commits · 81412240e6e6ca60a7fcece5eff056722d868d2e · Alex Gleason / pleroma

Aug 01, 2019
- Fix Invalid SemVer version generation · 81412240
  rinpatch authored 5 years ago
  
  when the current branch does not have commits ahead of tag/checked out on a tag
  81412240
Jul 31, 2019
- Merge branch 'chore/changelog-update' into 'develop' · cdfd02e9
  kaniini authored 5 years ago
  
  Add a changelog entry for disallowing locked accounts follows over OStatus See merge request !1513
  cdfd02e9
- Add a changelog entry for disallowing locked accounts follows over OStatus · def0c49e
  rinpatch authored 5 years ago
  
  def0c49e
- Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop' · 6c06529c
  kaniini authored 5 years ago
  
  Disallow following locked accounts over OStatus See merge request !1512
  6c06529c
- Disallow following locked accounts over OStatus · 813c686d
  rinpatch authored 5 years ago
  
  813c686d
- Merge branch 'test/web_common_api_utils' into 'develop' · b431b565
  kaniini authored 5 years ago
  
  test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id See merge request !1510
  b431b565
- test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id · 6eb33e73
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  6eb33e73
- Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop' · 8980c1c7
  kaniini authored 5 years ago
  
  ostatus: explicitly disallow protocol downgrade from activitypub See merge request !1511
  8980c1c7
- ostatus: explicitly disallow protocol downgrade from activitypub · f72e0b7c
  kaniini authored 5 years ago
  
  This closes embargoed bug #1135.
  f72e0b7c
- Merge branch 'test/twitter/util_controller' into 'develop' · 957de9d7
  kaniini authored 5 years ago
  
  tests for TwitterApi/UtilController See merge request !1509
  957de9d7
- tests for TwitterApi/UtilController · 58443d0c
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  58443d0c
Jul 30, 2019
- Merge branch 'admin-changes' into 'develop' · 373a7c67
  kaniini authored 5 years ago
  
  Admin changes See merge request !1489
  373a7c67
- Admin changes · 51b3b6d8
  Alexander Strizhakov authored 5 years ago and kaniini committed 5 years ago
  
  51b3b6d8
Jul 29, 2019
- Merge branch 'security/remote-follow-commonapi' into 'develop' · 677df5ce
  kaniini authored 5 years ago
  
  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 5 years ago
  
  Closes #1138
  38508125
- Merge branch 'revert-83508418 ' into 'develop' · 66575061
  kaniini authored 5 years ago
  
  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 5 years ago
  
  This reverts merge request !1504
  58350692
- Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop' · 83508418
  Haelwenn authored 5 years ago
  
  markdown: clean up html generated by earmark See merge request pleroma/pleroma!1504
  83508418
- markdown: clean up html generated by earmark · 5795a890
  kaniini authored 5 years ago
  
  5795a890
- Merge branch 'refactor/use-constants' into 'develop' · 1dfde415
  lain authored 5 years ago
  
  refactoring: begin to use constants See merge request pleroma/pleroma!1500
  1dfde415
- Merge branch 'mailer-enabled-nodeinfo' into 'develop' · 3b8cd27b
  kaniini authored 5 years ago
  
  Add `mailerEnabled` to the NodeInfo metadata See merge request pleroma/pleroma!1502
  3b8cd27b
- Add `mailerEnabled` to the NodeInfo metadata · 0bee2131
  Eugenij authored 5 years ago and kaniini committed 5 years ago
  
  0bee2131
- Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop' · 8be01540
  kaniini authored 5 years ago
  
  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 5 years ago and kaniini committed 5 years ago
  
  c0e258cf
- Merge branch 'tests/ostatus_controller' into 'develop' · 1f7c8d96
  kaniini authored 5 years ago
  
  added tests for OstatusController See merge request !1501
  1f7c8d96
- added tests for OstatusController · 159bbec5
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  159bbec5
- constants: add as_public constant and use it everywhere · b93498eb
  kaniini authored 5 years ago
  
  b93498eb
- mix: add ex_const dependency · 9d78b3b2
  kaniini authored 5 years ago
  
  9d78b3b2
Jul 28, 2019
- Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop' · b38d2106
  kaniini authored 5 years ago
  
  transmogrifier: use User.delete() instead of handrolled user deletion code for remote users Closes #1104 See merge request !1498
  b38d2106
- transmogrifier: use User.delete() instead of handrolled user deletion code for remote users · 492d854e
  kaniini authored 5 years ago
  
  Closes #1104
  492d854e
- Merge branch 'confirmation-resend' into 'develop' · 44bfff22
  kaniini authored 5 years ago
  
  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 5 years ago and kaniini committed 5 years ago
  
  242f5c58
- Merge branch 'fix/user_update_and_set_cache' into 'develop' · 0d05ec38
  kaniini authored 5 years ago
  
  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 5 years ago and kaniini committed 5 years ago
  
  6a4b8b26
- Merge branch 'develop' into 'develop' · 488c06b6
  kaniini authored 5 years ago
  
  Fix HTTP sig tweak on KeyId See merge request !1496
  488c06b6
- Merge branch 'feature/hackney-303-redirect' into 'develop' · f78390ff
  kaniini authored 5 years ago
  
  Handle 303 redirects Closes #1127 See merge request !1497
  f78390ff
- Handle 303 redirects · 02dc6518
  Sergey Suprunenko authored 5 years ago and kaniini committed 5 years ago
  
  02dc6518
- Fix HTTP sig tweak on KeyId · 961e7785
  Thomas Sileo authored 5 years ago
  
  961e7785
Jul 26, 2019
- Merge branch 'issue/1097' into 'develop' · 08960d50
  rinpatch authored 5 years ago
  
  [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ See merge request !1495
  08960d50
- [#1097 ] added redirect: /pleroma/admin -> /pleroma/admin/ · 6b77a883
  Maksim authored 5 years ago
  
  6b77a883