hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4504 commits 4 branches 0 tags 44 MiB
Commit graph

4504 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Felder
d899d06973 Use a centralized fallback for missing values and use instance.federating instead of 
instance.federation.enabled
 2019-12-12 15:29:50 -06:00
Mark Felder
8d14036a23 Add fallback in case BE does not report federating status in nodeinfo 2019-12-12 15:17:23 -06:00
Mark Felder
0743fbb28b The value we are looking for is federationPolicy.enabled, not federationPolicy.federating 
Also the || true fallback does not work and always becomes true
 2019-12-12 13:56:07 -06:00
Mark Felder
2514dc183f Logic should be to hide TWKN if not federating OR if instance is not public 
Private instances should not show any timelines
 2019-12-12 13:51:50 -06:00
Mark Felder
7ddd5af081 Finally trust eslint 2019-12-12 13:46:07 -06:00
Mark Felder
afe5b3a82d More lint 2019-12-12 13:41:52 -06:00
Mark Felder
211d25cd5a More lint 2019-12-12 13:39:18 -06:00
Mark Felder
3eeb3dc572 Lint 2019-12-12 13:37:32 -06:00
Mark Felder
821a2bcc68 Merge branch 'develop' into feature/lockdown-timelines-private-mode 2019-12-12 13:32:52 -06:00
feld
051b9703df Merge branch 'nav-icons' into 'develop' 
Add icons to nav panel

See merge request pleroma/pleroma-fe!1016
 2019-12-12 19:15:14 +00:00
Maksim Pechnikov
addacf36d1 mfa: removed unused code 2019-12-12 21:19:13 +03:00
Henry Jameson
51e5487acc Merge branch 'streaming' into shigusegubu 
* streaming:
  fix desktop notifications not working with streaming
 2019-12-12 18:54:36 +02:00
Henry Jameson
2faf54bf8d Revert "debug" 
This reverts commit e7e12b3c1e.
 2019-12-12 18:54:31 +02:00
Henry Jameson
585702b1ce fix desktop notifications not working with streaming 2019-12-12 18:53:36 +02:00
Henry Jameson
e7e12b3c1e debug 2019-12-12 18:49:02 +02:00
Henry Jameson
7390651b37 Merge branch 'streaming' into shigusegubu 
* streaming:
  fix deletes causing errors
 2019-12-12 18:00:21 +02:00
taehoon
a412b53801 increase icon width a little bit in the nav panel 2019-12-12 10:42:27 -05:00
taehoon
7fa294f11c add icons to nav panel 2019-12-12 10:42:27 -05:00
Ivan Tashkinov
341416b0e0 Revert "Merge branch 'revert-96cab6d8' into 'develop'" 
This reverts merge request !1032
 2019-12-12 14:43:48 +00:00
HJ
c7376b8325 Merge branch 'support-native-captcha' into 'develop' 
Support "native" captcha

See merge request pleroma/pleroma-fe!1033
 2019-12-12 12:24:35 +00:00
HJ
a621382a3f Merge branch 'load-button-fix' into 'develop' 
Fix css runtime loading issue

Closes #734

See merge request pleroma/pleroma-fe!1030
 2019-12-12 12:23:01 +00:00
Egor Kislitsyn
ed3144eb11 Support "native" captcha 2019-12-12 18:19:46 +07:00
lain
c2c48ec25c Merge branch 'revert-96cab6d8' into 'develop' 
Revert "Merge branch 'oauth-extra-scopes' into 'develop'"

See merge request pleroma/pleroma-fe!1032
 2019-12-12 09:42:41 +00:00
lain
b399235848 Revert "Merge branch 'oauth-extra-scopes' into 'develop'" 
This reverts merge request !1024
 2019-12-12 09:38:24 +00:00
seven
b973ee5915 must use h in higher babel-plugin-transform-vue-jsx 2019-12-12 12:13:31 +05:00
Maksim Pechnikov
f70fe28f64 mfa: fix login and recovery form 2019-12-12 08:42:21 +03:00
seven
386719b0d0 fix css runtime loading issue 2019-12-12 08:33:40 +05:00
seven
d7bc1aff1d fix babelrc plugin config 2019-12-12 06:35:48 +05:00
Henry Jameson
63a5f50e7c fix deletes causing errors 2019-12-11 18:20:43 +02:00
HJ
3cc6f80628 Merge branch 'hideSitename' into 'develop' 
Hide instance url/link/text in header using hideSitename instance option

See merge request pleroma/pleroma-fe!1018
 2019-12-11 15:59:46 +00:00
taehoon
fee3226705 add documentation for new instance option 2019-12-11 10:14:31 -05:00
taehoon
d0c78989aa hide instance url/link/text in header using hideSitename option 2019-12-11 10:14:30 -05:00
rinpatch
abb6747f43 Merge branch 'fix/mfa_routes' into 'develop' 
fixed typo

See merge request pleroma/pleroma-fe!1027
 2019-12-11 13:14:40 +00:00
Maksim Pechnikov
d6dc2bad1f fixed typo 2019-12-11 15:59:29 +03:00
rinpatch
96cab6d811 Merge branch 'oauth-extra-scopes' into 'develop' 
OAuth 'push' and 'admin' scopes support

See merge request pleroma/pleroma-fe!1024
 2019-12-11 09:57:32 +00:00
kPherox
c3e7806acb
remove unused fallback 2019-12-11 18:48:18 +09:00
kPherox
b4acbf5311
Add user migrates filter to interactions 2019-12-11 18:30:26 +09:00
kPherox
e8333fff8d
change the expression of move 2019-12-11 18:30:23 +09:00
seven
cb92865dac upgrade babel-register 2019-12-11 14:22:11 +05:00
seven
e6d5b9c0bb update babelrc 2019-12-11 14:21:06 +05:00
seven
424e78891a upgrade babel-plugin-transform-runtime 2019-12-11 14:19:56 +05:00
seven
773fa454be upgrade babel-plugin-lodash 2019-12-11 14:02:51 +05:00
seven
c141c7a753 babel-plugin-add-module-exports is not necessary for babel v7 2019-12-11 14:01:53 +05:00
seven
d79dfb9495 upgrade babel-plugin-transform-vue-jsx 2019-12-11 14:00:36 +05:00
seven
a5cce10a7d update babelrc presets config 2019-12-11 13:56:53 +05:00
seven
4f9aba1a7c upgrade babel preset 2019-12-11 13:56:08 +05:00
seven
1af536d68f upgrade Babel core to v7 2019-12-11 13:52:03 +05:00
Henry Jameson
46fc537c22 Merge branch 'streaming' into shigusegubu 
* streaming:
  Option to enable streaming
  better wrapper for websocket
  Updated streaming and improved error-handling, some more refactoring to api
  improved initial notifications fetching
  initial streaming work
  Backend Interactor service overhaul, removed the need for copypasting
 2019-12-10 23:08:50 +02:00
Henry Jameson
b6b7bc5852 Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop: (24 commits)
  Remove whitespace hack on empty post content
  Change output directory of fontello
  add html-webpack-plugin to karma config
  use another fork of fontello-webpack-plugin
  add animate-spin class
  remove needless code
  use another approach for versioning font files
  versioning the font resources through webpack
  fix "can't find property of undefined" errors in mrf transparency panel
  move mention button right next to mute button
  restore muted users collapsing logic on other user’s profiles
  [i18n] Improve easy/pedantic Japanese switching
  Normalize profile fields
  backend interactor service: implement startFetchingFollowRequest
  show badge visibility user setting checkbox only if needed
  Use kana+kanji as default for Japanese translation
  Remove outdated changelog file
  Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)
  use yarn, try to restart pipeline
  tests + updates
  ...
 2019-12-10 23:08:45 +02:00
Henry Jameson
6acd889589 Option to enable streaming 2019-12-10 21:30:27 +02:00