diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-18 12:22:57 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-18 12:22:57 -0400 |
commit | 5a436fd447753124b3f7705ecb123ecf5762bc24 (patch) | |
tree | d0b37402b2eead725bf0e3d1de37727f64c01315 /web/react | |
parent | 7caef4a7a7287433ed274c4f20d3593ea4065b66 (diff) | |
parent | c63da249640e50b1c93c5c5ff7b5d598aa737b1e (diff) | |
download | chat-5a436fd447753124b3f7705ecb123ecf5762bc24.tar.gz chat-5a436fd447753124b3f7705ecb123ecf5762bc24.tar.bz2 chat-5a436fd447753124b3f7705ecb123ecf5762bc24.zip |
Merge pull request #699 from mattermost/PLT-92
PLT-92 Adding server side versioning to the binary
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 |
2 files changed, 13 insertions, 5 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); } } |