Commits · 54f692622ad4fe6c427ae6d67816be93a7644ac8 · Ilja / pleroma-fe

Dec 15, 2019
- wire up staff accounts with correct store data · 54f69262
  Tae Hoon authored 5 years ago
  
  54f69262
- Merge branch 'fix-sticker-height' into 'develop' · b739edb5
  HJ authored 5 years ago
  
  fix sticker picker height in emojo picker See merge request !1022
  b739edb5
- use flex for stickers · 32d7a49b
  absturztaube authored 5 years ago
  
  32d7a49b
Dec 14, 2019
- Merge branch 'revert-c2c48ec2 ' into 'develop' · c1a0e239
  HJ authored 5 years ago
  
  Reinstate `push` and `admin` scopes See merge request !1034
  c1a0e239
Dec 13, 2019
- Merge branch 'i18b/update-ja_easy' into 'develop' · 36910935
  feld authored 5 years ago
  
  i18n/update-ja_easy See merge request pleroma/pleroma-fe!1002
  36910935
- i18n/update-ja_easy · 1cba6c56
  Hakaba Hitoyo authored 5 years ago and feld committed 5 years ago
  
  1cba6c56
- Merge branch 'issue_124' into 'develop' · 749a3999
  feld authored 5 years ago
  
  Change 403 messaging See merge request pleroma/pleroma-fe!1020
  749a3999
- Merge branch 'feature/lockdown-timelines-private-mode' into 'develop' · 0b49e798
  feld authored 5 years ago
  
  interaction with BE private mode See merge request !989
  0b49e798
- Merge branch 'upgrade-babel' into 'develop' · 766a674a
  HJ authored 5 years ago
  
  Upgrade babel to v7 Closes #733 See merge request pleroma/pleroma-fe!1029
  766a674a
- Merge branch 'mfa/login_form' into 'develop' · 9789123b
  HJ authored 5 years ago
  
  mfa: fix login and recovery form See merge request !1031
  9789123b
Dec 12, 2019
- Use a centralized fallback for missing values and use instance.federating instead of · d899d069
  feld authored 5 years ago
  
  instance.federation.enabled
  d899d069
- Add fallback in case BE does not report federating status in nodeinfo · 8d14036a
  feld authored 5 years ago
  
  8d14036a
- The value we are looking for is federationPolicy.enabled, not federationPolicy.federating · 0743fbb2
  feld authored 5 years ago
  
  Also the || true fallback does not work and always becomes true
  0743fbb2
- Logic should be to hide TWKN if not federating OR if instance is not public · 2514dc18
  feld authored 5 years ago
  
  Private instances should not show any timelines
  2514dc18
- Finally trust eslint · 7ddd5af0
  feld authored 5 years ago
  
  7ddd5af0
- More lint · afe5b3a8
  feld authored 5 years ago
  
  afe5b3a8
- More lint · 211d25cd
  feld authored 5 years ago
  
  211d25cd
- Lint · 3eeb3dc5
  feld authored 5 years ago
  
  3eeb3dc5
- Merge branch 'develop' into feature/lockdown-timelines-private-mode · 821a2bcc
  feld authored 5 years ago
  
  821a2bcc
- Merge branch 'nav-icons' into 'develop' · 051b9703
  feld authored 5 years ago
  
  Add icons to nav panel See merge request !1016
  051b9703
- mfa: removed unused code · addacf36
  Maksim authored 5 years ago
  
  addacf36
- increase icon width a little bit in the nav panel · a412b538
  Tae Hoon authored 5 years ago
  
  a412b538
- add icons to nav panel · 7fa294f1
  Tae Hoon authored 5 years ago
  
  7fa294f1
- Revert "Merge branch 'revert-96cab6d8 ' into 'develop'" · 341416b0
  Ivan Tashkinov authored 5 years ago
  
  This reverts merge request !1032
  341416b0
- Merge branch 'support-native-captcha' into 'develop' · c7376b83
  HJ authored 5 years ago
  
  Support "native" captcha See merge request pleroma/pleroma-fe!1033
  c7376b83
- Merge branch 'load-button-fix' into 'develop' · a621382a
  HJ authored 5 years ago
  
  Fix css runtime loading issue Closes #734 See merge request !1030
  a621382a
- Support "native" captcha · ed3144eb
  minibikini authored 5 years ago
  
  ed3144eb
- Merge branch 'revert-96cab6d8 ' into 'develop' · c2c48ec2
  lain authored 5 years ago
  
  Revert "Merge branch 'oauth-extra-scopes' into 'develop'" See merge request !1032
  c2c48ec2
- Revert "Merge branch 'oauth-extra-scopes' into 'develop'" · b3992358
  lain authored 5 years ago
  
  This reverts merge request !1024
  b3992358
- must use h in higher babel-plugin-transform-vue-jsx · b973ee59
  seven authored 5 years ago
  
  b973ee59
- mfa: fix login and recovery form · f70fe28f
  Maksim authored 5 years ago
  
  f70fe28f
- fix css runtime loading issue · 386719b0
  seven authored 5 years ago
  
  386719b0
- fix babelrc plugin config · d7bc1aff
  seven authored 5 years ago
  
  d7bc1aff
Dec 11, 2019
- Merge branch 'hideSitename' into 'develop' · 3cc6f806
  HJ authored 5 years ago
  
  Hide instance url/link/text in header using hideSitename instance option See merge request !1018
  3cc6f806
- add documentation for new instance option · fee32267
  Tae Hoon authored 5 years ago
  
  fee32267
- hide instance url/link/text in header using hideSitename option · d0c78989
  Tae Hoon authored 5 years ago
  
  d0c78989
- Merge branch 'fix/mfa_routes' into 'develop' · abb6747f
  rinpatch authored 5 years ago
  
  fixed typo See merge request !1027
  abb6747f
- fixed typo · d6dc2bad
  Maksim authored 5 years ago
  
  d6dc2bad
- Merge branch 'oauth-extra-scopes' into 'develop' · 96cab6d8
  rinpatch authored 5 years ago
  
  OAuth 'push' and 'admin' scopes support See merge request !1024
  96cab6d8
- upgrade babel-register · cb92865d
  seven authored 5 years ago
  
  cb92865d