Commit Graph

6687 Commits

Author SHA1 Message Date
Saad Sahibjan
be1bee9b9a Modify delete device API to have permanentDelete query parameter 2019-06-03 15:18:03 +05:30
Ruwan Yatawara
c7232bba86 Merge branch 'master' into 'master'
Handle StartupOperationConfig in task manager

Closes product-iots#99

See merge request entgra/carbon-device-mgt!116
2019-06-03 09:33:31 +00:00
Saad Sahibjan
b68cc62bc7 Handle StartupOperationConfig which runs only once after the server is started 2019-06-03 12:13:21 +05:30
Saad Sahibjan
c1177a26b2 Handle server version operation in task manager 2019-06-03 12:13:21 +05:30
Inosh Perara
b76784bc90 Merge branch 'master' into 'master'
Query error fix in operation profile

See merge request entgra/carbon-device-mgt!115
2019-06-01 11:28:45 +00:00
inoshperera
301b6ad5c2 Query error fix in operation profile 2019-06-01 16:57:28 +05:30
Inosh Perara
6296b1dd5f Merge branch 'mac-os' into 'mac-os'
Fix mac-os enrollment error due to invalid challenge token

See merge request entgra/carbon-device-mgt!98
2019-06-01 11:17:32 +00:00
Entgra Builder
2d05e04a16 [maven-release-plugin] prepare for next development iteration 2019-05-31 14:13:46 +00:00
Entgra Builder
84df5dd4bf [maven-release-plugin] prepare release v3.2.5 2019-05-31 14:13:39 +00:00
Charitha Goonetilleke
44ab68478f Merge branch 'product-iots-37-new' into 'master'
Modify the Feature Specification Structure and Modify {deviceType}/features API

Closes product-iots#37

See merge request entgra/carbon-device-mgt!63
2019-05-30 06:31:11 +00:00
Madawa Soysa
a285898782 Modify the Feature Specification Structure and Modify {deviceType}/features API
Related to entgra/product-iots#37
2019-05-30 06:31:11 +00:00
Ruwan Yatawara
27214f7b28 Merge branch 'device-inactive-fix' into 'master'
Fix windows device inactive after sync

See merge request entgra/carbon-device-mgt!109
2019-05-28 05:18:05 +00:00
Pahansith Gunathilake
1fc16f9572 Fix windows device inactive after sync 2019-05-28 05:18:05 +00:00
Ruwan Yatawara
c7e51cf0a1 Merge branch 'usercreation-password-fix' into 'master'
Fix user creation password auto generation

See merge request entgra/carbon-device-mgt!108
2019-05-28 04:31:55 +00:00
Charitha Goonetilleke
b05ff6a92d Merge branch 'master' into 'master'
Get Device By ID API

See merge request entgra/carbon-device-mgt!85
2019-05-27 06:25:22 +00:00
Asanka Kumara
b863d2fa5e Get Device By ID API 2019-05-27 06:25:21 +00:00
Charitha Goonetilleke
76524b03ae Merge branch 'ui_issue_fix' into 'master'
Fix drop down color issue

See merge request entgra/carbon-device-mgt!72
2019-05-27 06:22:13 +00:00
Pahansith Gunathilake
a5e471c073 Fix drop down color issue 2019-05-27 06:22:12 +00:00
Charitha Goonetilleke
66174b7c4b Merge branch 'usercreation-password-fix' into 'master'
Fix user creation password auto generation

See merge request entgra/carbon-device-mgt!99
2019-05-27 06:21:14 +00:00
Pahansith Gunathilake
920a66a165 Fix user creation password auto generation 2019-05-27 06:21:14 +00:00
Pahansith
4a7f9bb7ce Fix user creation password auto generation 2019-05-22 14:26:45 +05:30
Saad Sahibjan
2da0a6aa19 Fix macos enrollment error due to invalid challenge token 2019-05-20 11:54:13 +05:30
Saad Sahibjan
a9f19a6afb Merge branch 'master' into 'master'
Add missing permission in v0.9 API

See merge request entgra/carbon-device-mgt!73
2019-05-18 08:00:13 +00:00
Dharmakeerthi Lasantha
8aa2594ee5 Merge branch 'master' into 'master'
Add UI for update enrollment

Closes product-iots#89

See merge request entgra/carbon-device-mgt!81
2019-05-18 07:57:10 +00:00
Saad Sahibjan
f3b580277b Add UI for update enrollment 2019-05-16 10:05:17 +05:30
Saad Sahibjan
5962a24029 Merge branch 'mac-os-dev' into 'mac-os'
init commit for MacOS

See merge request entgra/carbon-device-mgt!92
2019-05-16 04:33:42 +00:00
inoshperera
e98674f9b9 init commit for MacOS 2019-05-10 07:57:39 +05:30
Charitha Goonetilleke
f5725325e0 Merge branch 'master' into 'master'
Fix log issue in test cases

See merge request entgra/carbon-device-mgt!87
2019-05-06 08:46:41 +00:00
Charitha Goonetilleke
ca83635f13 Fix log issue in test cases 2019-05-06 08:46:41 +00:00
charitha
cb7910db62 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2019-05-06 13:48:24 +05:30
charitha
13511a79c4 Fix log issue in test cases 2019-05-06 13:47:56 +05:30
Charitha Goonetilleke
01705ecffc Merge branch 'master' into 'master'
Fix build failure

See merge request entgra/carbon-device-mgt!76
2019-04-25 09:01:37 +00:00
Charitha Goonetilleke
7a16ac7532 Fix build failure 2019-04-25 09:01:37 +00:00
charitha
893328c0ca Fix build failure 2019-04-25 14:27:35 +05:30
charitha
02fc661a9c Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2019-04-25 14:19:56 +05:30
Inosh Perara
f3a04e4baa Merge branch 'master' into 'master'
Add capability to store device type specific platform configurations for any device type

See merge request entgra/carbon-device-mgt!69
2019-04-25 08:47:21 +00:00
Charitha Goonetilleke
0c471fbb0b Add capability to store device type specific platform configurations for any device type 2019-04-25 08:47:20 +00:00
charitha
ec8d6970ed Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2019-04-25 13:34:26 +05:30
lasanthaDLPDS
ba4d73d940 Add missing permission in v0.9 API 2019-04-24 13:17:32 +05:30
Entgra Builder
54b0a0afd0 [maven-release-plugin] prepare for next development iteration 2019-04-23 10:42:17 +00:00
Entgra Builder
6dd8ca9484 [maven-release-plugin] prepare release v3.2.4 2019-04-23 10:42:10 +00:00
charitha
ea4954ba9d Fix policy UI 2019-04-21 17:03:47 +05:30
Saad Sahibjan
80ccaf8fcc Merge branch 'ios-fix' into 'master'
iOS enrollment fix

See merge request entgra/carbon-device-mgt!71
2019-04-20 05:53:45 +00:00
inoshperera
0c304e862b iOS enrollment fix 2019-04-20 10:33:52 +05:30
Charitha Goonetilleke
73368af711 Merge branch 'ui_issue_fix' into 'master'
Fix notification not showing issue - Issue ID #84

See merge request entgra/carbon-device-mgt!70
2019-04-19 08:08:33 +00:00
Pahansith Gunathilake
4aa7987be8 Fix notification not showing issue - Issue ID #84 2019-04-19 08:08:33 +00:00
Entgra Builder
14337bb884 [maven-release-plugin] prepare for next development iteration 2019-04-18 13:58:18 +00:00
Entgra Builder
736ce76df6 [maven-release-plugin] prepare release v3.2.3 2019-04-18 13:58:11 +00:00
Inosh Perara
25a743f8e5 Merge branch 'master' into 'master'
Add an API to update the device owner for given device identifiers.

See merge request entgra/carbon-device-mgt!68
2019-04-18 04:55:48 +00:00
lasanthaDLPDS
12d46550e6 Fix requested changes in the review 2019-04-17 15:40:22 +05:30