Commit Graph

8373 Commits

Author SHA1 Message Date
Turcy
c34f3cf4c7 Correct error message reference 2019-11-15 19:15:52 +05:30
Dharmakeerthi Lasantha
3cc68f761e Merge branch 'master' into 'master'
Fix app manager permissions not being displayed

Closes product-iots#281

See merge request entgra/carbon-device-mgt!393
2019-11-15 08:18:04 +00:00
Dharmakeerthi Lasantha
8ddd50f1ed Merge branch 'master' into 'master'
Fix HTTP Error 500 issue on the role edit page

See merge request entgra/carbon-device-mgt!387
2019-11-15 08:17:37 +00:00
Ruwan Liyanage
d5976deed8 Fix HTTP Error 500 issue on the role edit page 2019-11-15 08:17:37 +00:00
Saad Sahibjan
7cf86d5b60 Fix app manager permissions not being displayed 2019-11-14 19:05:45 +05:30
Dharmakeerthi Lasantha
369a6def21 Merge branch 'master' into 'master'
Fix users not loading during policy creation

Closes product-iots#280

See merge request entgra/carbon-device-mgt!388
2019-11-12 15:31:57 +00:00
Saad Sahibjan
666aaf58f0 Fix users not loading during policy creation 2019-11-07 17:59:53 +05:30
Dharmakeerthi Lasantha
c97d633577 Merge branch 'master' into 'master'
Fix web clip uninstallation issues in ios

Closes product-iots#276

See merge request entgra/carbon-device-mgt!386
2019-11-07 11:20:52 +00:00
Saad Sahibjan
7437545b0d Fix web clip uninstallation issues in ios 2019-11-06 19:31:48 +05:30
Entgra Builder
bea11b7d81 [maven-release-plugin]prepare for next development iteration 2019-11-06 11:02:35 +00:00
Entgra Builder
2aa50223e0 [maven-release-plugin]prepare release v4.1.4 2019-11-06 11:02:28 +00:00
Charitha Goonetilleke
c0fc88054c Merge branch 'master' into 'master'
Returning status when retrieving groups

See merge request entgra/carbon-device-mgt!385
2019-11-06 10:47:09 +00:00
Ace
f9b851dc1e Returning group ID when retrieving groups 2019-11-06 15:37:30 +05:30
Milan Perera
d4c996cce1 Merge branch 'master' into 'master'
Fix MS sql Blob storing and sql error

See merge request entgra/carbon-device-mgt!384
2019-11-06 09:59:56 +00:00
inoshperera
b0f7cfdf61 Refactoring and formatting 2019-11-06 14:51:37 +05:30
inoshperera
e3aca342ad Google enterprise unenrollment fix 2019-11-06 14:40:03 +05:30
Entgra Builder
252a3f2edc [maven-release-plugin]prepare for next development iteration 2019-11-06 07:20:39 +00:00
Entgra Builder
74c6eb6be7 [maven-release-plugin]prepare release v4.1.4 2019-11-06 07:20:32 +00:00
Dharmakeerthi Lasantha
dad04e73e7 Merge branch 'master' into 'master'
Fix minor issues in app installing functionality.

See merge request entgra/carbon-device-mgt!383
2019-11-05 20:22:15 +00:00
lasanthaDLPDS
f330bdd3d1 Fix SQL syntax issue in getSubscribedDevices method 2019-11-06 00:22:04 +05:30
lasanthaDLPDS
d7fbddf78d Fix app uninstall-operation-mapping table updating issue 2019-11-06 00:15:54 +05:30
inoshperera
2e84e4d01f Fix MS sql Blob storing and sql error 2019-11-05 22:48:57 +05:30
Entgra Builder
555ea6a808 [maven-release-plugin]prepare for next development iteration 2019-11-05 14:15:27 +00:00
Entgra Builder
347180a321 [maven-release-plugin]prepare release v4.1.3 2019-11-05 14:15:20 +00:00
Dharmakeerthi Lasantha
5e3c07c40d Merge branch 'master' into 'master'
Improve app manager app installing functionality.

See merge request entgra/carbon-device-mgt!378
2019-11-05 13:53:29 +00:00
Dharmakeerthi Lasantha
406b79a7e8 Improve app manager app installing functionality. 2019-11-05 13:53:29 +00:00
Saad Sahibjan
66db919702 Merge branch 'master' into 'master'
Fix uninstall device list retrieving issue

See merge request entgra/carbon-device-mgt!382
2019-11-05 13:52:58 +00:00
Saad Sahibjan
15abfa218d Fix uninstall device list retrieving issue 2019-11-05 19:17:37 +05:30
Dharmakeerthi Lasantha
b529ffc418 Merge branch 'master' into 'master'
Add new user function for device-mgt react app

See merge request entgra/carbon-device-mgt!375
2019-11-05 10:42:11 +00:00
Kaveesha Mihirangi
5c06b1b0ab Add new user function for device-mgt react app 2019-11-05 10:42:11 +00:00
Saad Sahibjan
76ff05d153 Merge branch 'application-mgt-new' into 'master'
Fix device loading issue in APPM store app view

See merge request entgra/carbon-device-mgt!381
2019-11-05 10:08:22 +00:00
Jayasanka Weerasinghe
97a03a1aa1 Add minor UI fixes to APPM UI
The following changes are with this commit
- Display wrong credentials error in Login form
- Display tags and categories in APPM store release view
2019-11-05 10:08:22 +00:00
Dharmakeerthi Lasantha
701ebb0db7 Merge branch 'master' into 'master'
Fix web clips installation not working for iOS

See merge request entgra/carbon-device-mgt!380
2019-11-05 06:44:34 +00:00
Saad Sahibjan
d2f8b6e160 Fix web clips installation not working for iOS 2019-11-05 11:12:35 +05:30
Dharmakeerthi Lasantha
6c885bb023 Merge branch 'master' into 'master'
Set the correct count value of the subscribers retrieving API

See merge request entgra/carbon-device-mgt!377
2019-11-05 02:35:06 +00:00
Nipun Nadeen De Silva
3f582db051 Set the correct count value of the subscribers retrieving API 2019-11-05 02:35:06 +00:00
Dharmakeerthi Lasantha
f01636a2b0 Change helper texts in APPM Publisher app upload form 2019-11-04 17:50:34 +00:00
Jayasanka Weerasinghe
c7a9da41c5 Change helper texts in APPM Publisher app upload form 2019-11-04 17:50:34 +00:00
Dharmakeerthi Lasantha
cfb45fb4a8 Merge branch 'application-mgt-new' into 'master'
Add helper texts to APPM Publisher UI

See merge request entgra/carbon-device-mgt!376
2019-11-04 12:02:46 +00:00
Jayasanka Weerasinghe
85890e9036 Add minor UI fixes to APPM UI
The following changes are with this commit
- Display wrong credentials error in Login form
- Display tags and categories in APPM store release view
2019-11-04 12:02:46 +00:00
Charitha Goonetilleke
a2ceef5e84 Merge branch 'master' into 'master'
Fix device group related issues

See merge request entgra/carbon-device-mgt!374
2019-11-04 07:59:49 +00:00
charitha
e6ea2175cd Add review suggestions 2019-11-04 12:39:15 +05:30
charitha
efff1e2cfd Fix device group related issues
- Create group - Not working when group properties are not available
- Delete group - SQL error
- Get devices of group - Database connection management issue
2019-11-03 23:51:54 +05:30
Entgra Builder
8d8c3cce16 [maven-release-plugin]prepare for next development iteration 2019-11-02 07:16:43 +00:00
Entgra Builder
f596f3ef81 [maven-release-plugin]prepare release v4.1.2 2019-11-02 07:16:36 +00:00
Saad Sahibjan
495534ce5f Merge branch 'master' into 'master'
Fix corrective policy UI loading intermittent issue

See merge request entgra/carbon-device-mgt!373
2019-11-01 14:20:21 +00:00
Saad Sahibjan
a8e0bbce7a Fix corrective policy UI loading intermittent issue 2019-11-01 19:41:29 +05:30
Dharmakeerthi Lasantha
f603ed0f97 Merge branch 'master' into 'master'
Fix app installing issue in kiosk

See merge request entgra/carbon-device-mgt!372
2019-11-01 13:11:12 +00:00
Dharmakeerthi Lasantha
3ca303cdb5 Fix app installing issue in kiosk 2019-11-01 13:11:11 +00:00
Dharmakeerthi Lasantha
1e7f075ec0 Merge branch 'application-mgt-new' into 'master'
Add minor UI fixes to APPM UI

See merge request entgra/carbon-device-mgt!371
2019-11-01 12:50:42 +00:00