Commits · 9194e84d95187d4de067200221c4a4f676af837e · normandy / pleroma

Dec 15, 2018
- Merge branch 'feature/mix-task-instance-port-specification' into 'develop' · 9194e84d
  lain authored 6 years ago
  
  Allow port specification in `instance.ex` config generator See merge request pleroma/pleroma!552
  9194e84d
- Allow port specification in instance.ex · 4a895a46
  Rin Toshaka authored 6 years ago
  
  4a895a46
Dec 14, 2018
- Merge branch 'fix/issue_433' into 'develop' · e74f384b
  href authored 6 years ago
  
  [#433] fix markdown formatting See merge request pleroma/pleroma!545
  e74f384b
- Merge branch '114_email_invites' into 'develop' · bfe27c1b
  href authored 6 years ago
  
  [#114] Email invites See merge request !541
  bfe27c1b
- Merge branch 'fix/issue_272' into 'develop' · acec1162
  href authored 6 years ago
  
  [#272] fix tags See merge request pleroma/pleroma!540
  acec1162
- fix case when tags is invalid · ea72ac54
  Maksim authored 6 years ago
  
  ea72ac54
- fix tags · d3ec09bb
  Maksim authored 6 years ago
  
  d3ec09bb
- Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' · 980131b4
  href authored 6 years ago
  
  Improve web push Closes #393, #422, and #452 See merge request pleroma/pleroma!524
  980131b4
- fixed typo · bc6262d2
  Maksim authored 6 years ago
  
  bc6262d2
- Warn if push is disabled.. · 412df2cd
  href authored 6 years ago
  
  Verified
  
  412df2cd
- Update config.md · ef10e08e
  Haelwenn authored 6 years ago
  
  ef10e08e
- fix markdown formatting · baead4ea
  Maksim authored 6 years ago
  
  baead4ea
- Merge branch 'feature/file-size-checking' into 'develop' · 91236c60
  href authored 6 years ago
  
  [#36] Add warnings when file upload fails See merge request pleroma/pleroma!523
  91236c60
- Fix warning · 0b4c61e8
  href authored 6 years ago
  
  Verified
  
  0b4c61e8
- Pleroma.Activity.mastodon_notification_type/1 · ec0e613e
  href authored 6 years ago
  
  Verified
  
  ec0e613e
- Properly disable Web Push if no VAPID key is set · 331396cb
  href authored 6 years ago
  
  Verified
  
  331396cb
- Typos · 68229161
  href authored 6 years ago
  
  Verified
  
  68229161
- Push: respect alerts settings · b1bcd97a
  href authored 6 years ago
  
  Verified
  
  b1bcd97a
- Push: add missing notification_type field · d8984b7b
  href authored 6 years ago
  
  Verified
  
  d8984b7b
- Push.Subscription: convert base64 to base64 urlsafe · 7facbb2b
  href authored 6 years ago
  
  Verified
  
  7facbb2b
- improve push message format (compatibility with mastodon) · 324933a0
  minibikini authored 6 years ago and href committed 6 years ago
  
  Verified
  
  324933a0
- Update config.md · 3b65f316
  lain authored 6 years ago and href committed 6 years ago
  
  Verified
  
  3b65f316
- fix and improve web push; add configuration docs · 658edb16
  minibikini authored 6 years ago and href committed 6 years ago
  
  Verified
  
  658edb16
- [#114] Added `invitesEnabled` to `metadata` of nodeinfo. · 69fd63e2
  Ivan Tashkinov authored 6 years ago
  
  69fd63e2
- [#114] Removed `confirm_email` action stub (to be addressed in a separate MR). · 66380b06
  Ivan Tashkinov authored 6 years ago
  
  66380b06
- [#114 ] Improved tests. · 07e93f99
  Ivan Tashkinov authored 6 years ago
  
  07e93f99
- [#114] Readded `invites_enabled` config setting, updated readme. · 9666376f
  Ivan Tashkinov authored 6 years ago
  
  9666376f
- [#114] Moved email_invite action to AdminAPIController, adjusted tests. · a89e3b4b
  Ivan Tashkinov authored 6 years ago
  
  a89e3b4b
- [#114] Added UserInviteToken creation, adjusted invitation email link to include it. · 3cbf16a5
  Ivan Tashkinov authored 6 years ago
  
  3cbf16a5
- [#114] Naive implementation of email invitations. · cc83d7ff
  Ivan Tashkinov authored 6 years ago
  
  cc83d7ff
- Merge branch '114_user_registration_emails' into 'develop' · 30dc8166
  href authored 6 years ago
  
  [#114] User registration emails Closes #114 See merge request pleroma/pleroma!531
  30dc8166
- [#114] Addressed MR comments. Removed functionality to be extracted to other MRs. · f8121391
  Ivan Tashkinov authored 6 years ago
  
  f8121391
- Merge branch 'fix/double-rt-or-fav' into 'develop' · 262cc6d4
  lain authored 6 years ago
  
  Prevent accidental double RTs or favorites See merge request pleroma/pleroma!542
  262cc6d4
- Merge branch 'fix/qvitter-fav-object' into 'develop' · 82dbd2d6
  lain authored 6 years ago
  
  TwitterAPI: Include favorited post in json Closes #405 See merge request pleroma/pleroma!543
  82dbd2d6
- Merge branch '2018-12-13-update-frontend' into 'develop' · 36b0af76
  lain authored 6 years ago
  
  update frontend See merge request pleroma/pleroma!544
  36b0af76
- TwitterAPI: Include favorited post in json · 61ad2ce4
  eal authored 6 years ago
  
  61ad2ce4
- Prevent accidental double RTs or favorites · 1ca080c8
  eal authored 6 years ago
  
  1ca080c8
Dec 13, 2018
- update frontend · 72945b5b
  lain authored 6 years ago
  
  72945b5b
- Merge branch 'username-underscores' into 'develop' · b19ee622
  lain authored 6 years ago
  
  Allow underscores/dashes in usernames. Closes #429 See merge request pleroma/pleroma!537
  b19ee622
- Merge branch 'fix/mix-tasks-set-user-info' into 'develop' · a5a10988
  lain authored 6 years ago
  
  Fix mix task User See merge request pleroma/pleroma!539
  a5a10988