community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved Conflicts

Browse Source
This commit is contained in:
Menaka Jayawardena 2017-10-06 13:03:33 +05:30
parent 87aaeca85f
commit 6056a433d5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
View File

@ -33,6 +33,7 @@ import AuthHandler from "../../api/authHandler";
* When the wizard is completed, data will be arranged and sent to the api. * When the wizard is completed, data will be arranged and sent to the api.
* */ * */
class ApplicationListing extends Component { class ApplicationListing extends Component {
constructor() { constructor() {
super(); super();
this.searchApplications = this.searchApplications.bind(this); this.searchApplications = this.searchApplications.bind(this);

2
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.js
View File

@ -21,7 +21,7 @@ import Publisher from './App';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import 'bootstrap/dist/css/bootstrap.css'; import 'bootstrap/dist/css/bootstrap.css';
import registerServiceWorker from './registerServiceWorker'; import registerServiceWorker from './registerServiceWorker';
import {IntlProvider, addLocaleData, defineMessages} from 'react-intl'; import {addLocaleData, defineMessages, IntlProvider} from 'react-intl';
import Axios from 'axios'; import Axios from 'axios';
import Constants from './common/constants'; import Constants from './common/constants';
import Configuration from './common/configuration'; import Configuration from './common/configuration';