Commit Graph

6607 Commits

Author SHA1 Message Date
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
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
charitha
3565e03c1b Fix test cases 2019-04-17 09:21:27 +05:30
Charitha Goonetilleke
b11a0e8443 Merge branch 'master' into 'master'
Change Product Version to 3.5.0

See merge request entgra/carbon-device-mgt!67
2019-04-16 21:06:03 +00:00
Pahansith Gunathilake
2a6b960e80 Change Product Version to 3.5.0 2019-04-16 21:06:03 +00:00
charitha
fbaf21adc6 Add device type specific platform config UIs 2019-04-17 02:18:16 +05:30
lasanthaDLPDS
cc989148d6 Add an API to update the device owner for given device identifiers.
Further, add an API to get device activities without passing the username. Username is retrieved from the carbon context.
2019-04-16 20:11:02 +05:30
charitha
c1118363d8 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2019-04-16 12:29:23 +05:30
charitha
e71c362309 Add device type specific platform config endpoint 2019-04-14 15:58:51 +05:30
Entgra Builder
65eb70139b [maven-release-plugin] prepare for next development iteration 2019-04-10 19:04:25 +00:00
Entgra Builder
6bbbbdc18b [maven-release-plugin] prepare release v3.2.2 2019-04-10 19:04:19 +00:00
Charitha Goonetilleke
19808371ff Merge branch 'master' into 'master'
Whitelabel UI

See merge request entgra/carbon-device-mgt!66
2019-04-10 17:29:06 +00:00
Pahansith Gunathilake
b075688d91 Whitelabel UI 2019-04-10 17:29:05 +00:00
Charitha Goonetilleke
59e6334a3b Merge branch 'master' into 'master'
Fix device information reduction issue

See merge request entgra/carbon-device-mgt!65
2019-04-09 09:22:50 +00:00
Milan Perera
89e3c91fe6 Fix device information reduction issue 2019-04-09 14:38:06 +05:30
Inosh Perara
b2f225a7f8 Merge branch 'master' into 'master'
Fix Authentication Handler Issue

See merge request entgra/carbon-device-mgt!64
2019-04-09 08:52:36 +00:00
Milan Perera
a7e40db75b Fix AuthenticationHandler Test Failure 2019-04-09 13:54:05 +05:30
Milan Perera
20a4fb7b01 Fix Authentication Handler Issue
Replaced the invalid value in the AuthenticationHandler file to support mutual SSL.
2019-04-09 13:33:16 +05:30
Saad Sahibjan
35071ed27b Merge branch 'master' into 'master'
Add handlebar helper to convert JSON to string

See merge request entgra/carbon-device-mgt!60
2019-03-28 13:08:42 +00:00
Saad Sahibjan
d64edd8cf9 Add handlebar helper to convert json to string 2019-03-28 14:26:07 +05:30
charitha
6e365333ab Fix incorrect type for tenant id in pgsql 2019-03-23 00:45:04 +05:30
Dharmakeerthi Lasantha
255002720b Merge branch 'master' into 'master'
Rename synapse API to UserManagementValidateUser

See merge request entgra/carbon-device-mgt!49
2019-03-14 08:13:48 +00:00
Saad Sahibjan
84cbf64b3b Rename synapse API to UserManagementValidateUser 2019-03-14 12:41:07 +05:30
Dharmakeerthi Lasantha
c1d6462e7d Merge branch 'enrollment-app-install-webclip' into 'master'
Allow web clips installation via enrollment app install policy

Closes product-iots#61

See merge request entgra/carbon-device-mgt!46
2019-03-13 05:48:18 +00:00
Saad Sahibjan
625fb7d07e Allow webclips installation via enrollment app install policy 2019-03-12 22:00:49 +05:30
Milan Perera
20ffbdc36d Merge branch 'validate-token-user' into 'master'
Validate User API

See merge request entgra/carbon-device-mgt!44
2019-03-12 10:33:13 +00:00
Saad Sahibjan
a9a01c045e Add copy commands to copy UserValidateManagement and OAuth2TokenManagement synapse APIs to IoTs pack 2019-03-12 10:33:13 +00:00
Milan Perera
120f4cb8d4 Merge branch 'master' into 'master'
Increase length of VALUE_FIELD column in DM_DEVICE_INFO table

See merge request entgra/carbon-device-mgt!43
2019-03-07 08:13:26 +00:00
Saad Sahibjan
0d084242d0 Increase length of VALUE_FIELD column in DM_DEVICE_INFO table 2019-03-04 16:35:39 +05:30
Milan Harindu
71d4292f05 Merge branch 'master' into 'master'
fix License text loading inconsistency in tenants

See merge request entgra/carbon-device-mgt!40
2019-02-02 12:52:51 +00:00
inoshperera
a39d567e85 fix License text loading inconsistency in tenants 2019-02-02 18:20:11 +05:30
Charitha Goonetilleke
e39478c0d2 Merge branch 'master' into 'master'
Fix the task running issue in tenant mode

See merge request entgra/carbon-device-mgt!39
2019-01-29 17:53:29 +00:00