Commit Graph

8285 Commits

Author SHA1 Message Date
lasanthaDLPDS
dbd21719f1 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-27 23:15:51 +05:30
lasanthaDLPDS
db0b362244 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-27 21:01:50 +05:30
Inosh Perara
1a7806e02d Merge branch 'application-mgt-new' into 'application-mgt-new'
Add UI improvements to APPM

See merge request entgra/carbon-device-mgt!358
2019-10-27 01:57:31 +00:00
Jayasanka
c5bc96d8cc Fix invalid support OS version issue in APPM publisher UI 2019-10-26 19:40:20 +05:30
Jayasanka
9fa4047d07 Merge remote-tracking branch 'upstream/application-mgt-new' into application-mgt-new
# Conflicts:
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js
2019-10-26 17:19:59 +05:30
Jayasanka
9303d37451 Add custom forbidden alerts messages in APPM store UI 2019-10-26 17:06:35 +05:30
Jayasanka
84ad27f299 Add custom forbidden alerts messages in APPM publisher UI 2019-10-26 16:15:55 +05:30
Jayasanka
6245e564a4 Add refresh button to subscription details table 2019-10-26 13:04:02 +05:30
Jayasanka
9dd7444cd7 Add unrestricted roles field to Add new app form 2019-10-26 11:33:03 +05:30
lasanthaDLPDS
6f42f1fdf8 Add new app attribute to identify android enterprise app 2019-10-26 09:06:55 +05:30
Inosh Perara
0e20dcb04a Merge branch 'application-mgt-new' into 'application-mgt-new'
Add new API to perform ent. app installation

See merge request entgra/carbon-device-mgt!351
2019-10-26 03:34:36 +00:00
lasanthaDLPDS
1e3ac362b8 Remove super admin tenant domain from /user API response 2019-10-26 08:06:20 +05:30
lasanthaDLPDS
8feb157bb9 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-26 05:14:30 +05:30
lasanthaDLPDS
7eb3a5d762 Fix issues in APPM subscription flow 2019-10-26 05:13:58 +05:30
Inosh Perara
0250cc1774 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add new API endpoints

See merge request entgra/carbon-device-mgt!356
2019-10-25 22:05:20 +00:00
Inosh Perara
9ccdf298af Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix the mysql based syntax issues

See merge request entgra/carbon-device-mgt!355
2019-10-25 21:57:34 +00:00
charitha
253afa517a Fix transaction handling 2019-10-26 01:42:37 +05:30
charitha
d6845cd40a Add new API endpoints
- Change device status as bulk
- Get total device count
- Add group with different owner
2019-10-26 01:03:44 +05:30
nipunnadeen
35be7cc795 Fix the mysql based syntax issues 2019-10-25 21:49:13 +05:30
Milan Perera
a9a99bb83d Merge branch 'application-mgt-new' into 'application-mgt-new'
fix for corrective policy

See merge request entgra/carbon-device-mgt!354
2019-10-25 12:12:11 +00:00
inoshperera
7f5325b8bb fix for corrective policy 2019-10-25 17:07:21 +05:30
Dharmakeerthi Lasantha
991110be6b Merge branch 'application-mgt-new' into 'application-mgt-new'
Add devicemgt React app UI improvements

See merge request entgra/carbon-device-mgt!353
2019-10-25 10:13:17 +00:00
Shamalka Navod
2c2584bcae Add devicemgt React app UI improvements 2019-10-25 10:13:17 +00:00
Dharmakeerthi Lasantha
1907d57b4e Merge branch 'application-mgt-new' into 'application-mgt-new'
Group create/edit/delete/share functions

See merge request entgra/carbon-device-mgt!352
2019-10-25 05:53:07 +00:00
Shamalka Navod
a78d3e17d4 Group create/edit/delete/share functions 2019-10-25 05:53:07 +00:00
lasanthaDLPDS
4989ac2d0c Add new API to perform ent. app installation 2019-10-25 09:14:32 +05:30
Dharmakeerthi Lasantha
54dc3e4807 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add improvements to APPM UI

See merge request entgra/carbon-device-mgt!350
2019-10-24 15:37:29 +00:00
Jayasanka Weerasinghe
9807a36098 Add ui improvements to APPM Publisher UI
The following changes are with this commit
- View subscription status of devices in release view
- Display server error response in add new app form
2019-10-24 15:37:29 +00:00
lasanthaDLPDS
2757d96c33 Add new service to update APPM DB for enterprise install 2019-10-24 19:24:55 +05:30
Jayasanka
dff6d74c72 Merge remote-tracking branch 'upstream/application-mgt-new' into application-mgt-new
# Conflicts:
#	components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/InstalledDevicesTable.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js
2019-10-24 16:59:55 +05:30
Jayasanka
cd062f0788 Add UI improvements to APPM UI
The following changes are with this commit
- Fix wrong 401 redirection in Subscription details table
- Add pagination to releases list in App Details Drawer
- Show published badge on app icon in apps table and releases list
2019-10-24 16:56:24 +05:30
Saad Sahibjan
b6a2c3fb64 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix error on retrieving device location details

See merge request entgra/carbon-device-mgt!349
2019-10-23 12:24:21 +00:00
shamalka
3cb822efd7 Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-23 17:18:38 +05:30
shamalka
22cd3a09f1 Add tabs on user info modal 2019-10-23 17:18:33 +05:30
shamalka
7dc9fbb04b Fix error on retrieving location 2019-10-23 15:02:32 +05:30
Charitha Goonetilleke
35015471e4 Merge branch 'master' into 'master'
Modify code to limit garbage collectible objects and create method to deploy adapters without custom mapping

See merge request entgra/carbon-device-mgt!316
2019-10-23 08:09:11 +00:00
Dharmakeerthi Lasantha
ba2a9c6a91 Merge branch 'application-mgt-new' into 'application-mgt-new'
Update geo featur UI and date time picker

See merge request entgra/carbon-device-mgt!347
2019-10-23 07:23:40 +00:00
Yohan Avishke
4a3a9b587e Change invalid payload exception responses to bad requests 2019-10-23 11:51:34 +05:30
achala007
e57dd65dd8 Update geo featur UI and date time picker 2019-10-23 09:54:00 +05:30
Yohan Avishke
8bebf2c126 Wrap service level error messages from api level error messages 2019-10-23 06:50:59 +05:30
Dharmakeerthi Lasantha
0f8d4a02d4 Merge branch 'master' into 'application-mgt-new'
Fix apple logo not displaying in UI DEP config

See merge request entgra/carbon-device-mgt!345
2019-10-22 18:37:37 +00:00
Dharmakeerthi Lasantha
6717723d69 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add roles and enrolled devices of users

See merge request entgra/carbon-device-mgt!343
2019-10-22 18:13:54 +00:00
Saad Sahibjan
48ffb02cb4 Fix apple logo not displaying in UI DEP config 2019-10-22 23:40:49 +05:30
Dharmakeerthi Lasantha
84b54c1996 Merge branch 'application-mgt-new' into 'application-mgt-new'
Improve app manager source

See merge request entgra/carbon-device-mgt!344
2019-10-22 17:39:05 +00:00
Dharmakeerthi Lasantha
3789a2d196 Add ui improvements to APPM Publisher UI 2019-10-22 17:32:56 +00:00
Jayasanka Weerasinghe
08860acfba Add ui improvements to APPM Publisher UI
The following changes are with this commit
- View subscription status of devices in release view
- Display server error response in add new app form
2019-10-22 17:32:56 +00:00
shamalka
5436d9dd37 Add roles and enrolled devices of users 2019-10-22 22:56:20 +05:30
lasanthaDLPDS
67f442f1c4 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-22 22:35:59 +05:30
Dharmakeerthi Lasantha
edf9486a6d Merge branch 'application-mgt-new' into 'application-mgt-new'
Add main devicemgt features to dashboard

See merge request entgra/carbon-device-mgt!333
2019-10-22 17:02:24 +00:00
Jayasanka
e762d35a74 Remove subscription type from APPM publisher filter UI 2019-10-22 22:28:44 +05:30