diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-18 09:25:47 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-18 09:25:47 -0700 |
commit | cdf813f07b207c14bb9fa03f38d734b45e40823e (patch) | |
tree | 109c6cefb3580b9ed9b314ce40bd130728d587ff /web/react | |
parent | 1aa4913c44ba9a342d240e5e1ca9d5e89929e499 (diff) | |
parent | 5a436fd447753124b3f7705ecb123ecf5762bc24 (diff) | |
download | chat-cdf813f07b207c14bb9fa03f38d734b45e40823e.tar.gz chat-cdf813f07b207c14bb9fa03f38d734b45e40823e.tar.bz2 chat-cdf813f07b207c14bb9fa03f38d734b45e40823e.zip |
merging
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/user_settings_security.jsx | 11 | ||||
-rw-r--r-- | web/react/stores/browser_store.jsx | 7 | ||||
-rw-r--r-- | web/react/utils/text_formatting.jsx | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/web/react/components/user_settings_security.jsx b/web/react/components/user_settings_security.jsx index 6ccd09cb1..c10d790ae 100644 --- a/web/react/components/user_settings_security.jsx +++ b/web/react/components/user_settings_security.jsx @@ -251,6 +251,17 @@ export default class SecurityTab extends React.Component { <div className='divider-dark first'/> {passwordSection} <div className='divider-dark'/> + <ul + className='section-min' + > + <li className='col-sm-10 section-title'>{'Version ' + global.window.config.Version}</li> + <li className='col-sm-7 section-describe'> + <div className='text-nowrap'>{'Build Number: ' + global.window.config.BuildNumber}</div> + <div className='text-nowrap'>{'Build Date: ' + global.window.config.BuildDate}</div> + <div className='text-nowrap'>{'Build Hash: ' + global.window.config.BuildHash}</div> + </li> + </ul> + <div className='divider-dark'/> <br></br> <a data-toggle='modal' diff --git a/web/react/stores/browser_store.jsx b/web/react/stores/browser_store.jsx index e1ca52746..d2dedb271 100644 --- a/web/react/stores/browser_store.jsx +++ b/web/react/stores/browser_store.jsx @@ -9,9 +9,6 @@ function getPrefix() { return UserStore.getCurrentId() + '_'; } -// Also change model/utils.go ETAG_ROOT_VERSION -var BROWSER_STORE_VERSION = '.5'; - class BrowserStoreClass { constructor() { this.getItem = this.getItem.bind(this); @@ -25,9 +22,9 @@ class BrowserStoreClass { this.isLocalStorageSupported = this.isLocalStorageSupported.bind(this); var currentVersion = localStorage.getItem('local_storage_version'); - if (currentVersion !== BROWSER_STORE_VERSION) { + if (currentVersion !== global.window.config.Version) { this.clear(); - localStorage.setItem('local_storage_version', BROWSER_STORE_VERSION); + localStorage.setItem('local_storage_version', global.window.config.Version); } } diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index 2025e16da..54d010dbf 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -56,7 +56,7 @@ function autolinkUrls(text, tokens) { const linkText = match.getMatchedText(); let url = linkText; - if (!url.lastIndexOf('http', 0) === 0) { + if (url.lastIndexOf('http', 0) !== 0) { url = `http://${linkText}`; } |