Commit Graph

7472 Commits

Author SHA1 Message Date
Dharmakeerthi Lasantha
1e7bf6c04c Merge branch 'application-mgt-new' into 'application-mgt-new'
Merge with master branch

See merge request entgra/carbon-device-mgt!50
2019-03-14 08:18:34 +00:00
lasanthaDLPDS
30f4c6ff4d Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-03-14 13:44:19 +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
14f57e8490 Merge branch 'application-mgt-new' into 'application-mgt-new'
Application mgt new

See merge request entgra/carbon-device-mgt!48
2019-03-13 07:14:20 +00:00
lasanthaDLPDS
98d14b0815 Fix merge conflicts 2019-03-13 12:09:29 +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
Dharmakeerthi Lasantha
73a8ed8b95 Merge branch 'application-mgt-new' into 'application-mgt-new'
APPM publisher UI deploying as web app

See merge request entgra/carbon-device-mgt!47
2019-03-12 21:41:40 +00:00
lasanthaDLPDS
49c1279dd5 APPM publisher UI deploying as web app 2019-03-13 03:06:52 +05:30
Saad Sahibjan
625fb7d07e Allow webclips installation via enrollment app install policy 2019-03-12 22:00:49 +05:30
Dharmakeerthi Lasantha
cd60f25b76 Merge branch 'application-mgt-new' into 'application-mgt-new'
Deploy app manager publisher UI as .war

See merge request entgra/carbon-device-mgt!45
2019-03-12 12:48:03 +00:00
lasanthaDLPDS
5a3f3a3d27 Modify .gitignore file 2019-03-12 18:11:55 +05:30
lasanthaDLPDS
4d4507aff5 Deploy react app as war file
This is WIP code
2019-03-12 18:10:42 +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
lasanthaDLPDS
fbcb1d0e32 Add modification to application creating logic 2019-03-05 02:48:17 +05:30
Inosh Perara
b06e6ee711 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix application installing issue

See merge request entgra/carbon-device-mgt!42
2019-03-04 16:15:57 +00:00
lasanthaDLPDS
0cb26066c5 Fix lifecycle instance initiating issue 2019-03-04 19:07:50 +05:30
Saad Sahibjan
0d084242d0 Increase length of VALUE_FIELD column in DM_DEVICE_INFO table 2019-03-04 16:35:39 +05:30
lasanthaDLPDS
911bc6f9a0 Fix application getting issue 2019-03-04 10:25:13 +05:30
lasanthaDLPDS
e2acb5c4c8 Fix application installing issue 2019-03-04 02:57:08 +05:30
Inosh Perara
bc3e2fc899 Merge branch 'application-mgt-new' into 'application-mgt-new'
Merge latest source with upstream

See merge request entgra/carbon-device-mgt!41
2019-03-03 03:13:38 +00:00
lasanthaDLPDS
a7a8a9c6df Improve APPM publisher functionality and add UI source 2019-03-03 08:36:20 +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
Charitha Goonetilleke
169e13061f Limit deploy phase only to entgra repos 2019-01-29 04:55:29 +00:00
lasanthaDLPDS
f92ae35e4b Fix the task running issue in tenant mode
If a run time error encountered while sending a notification(e.g:- Push Notification ) to a device when the task is running for tenants, it terminates the task running and notifications won't be sending to devices which are enrolled to other tenants as well. Hence cath the exception in sendNotification method and log.

Further, since this is critical path, added few debug logs as well.
2019-01-28 11:56:49 +05:30
Inosh Perara
ecd35c34e4 Merge branch 'master' into 'master'
Add enrollment notification sending feature

See merge request entgra/carbon-device-mgt!38
2019-01-28 05:48:01 +00:00
charitha
96a0a3c975 Change docker image for CI/CD 2019-01-26 08:26:36 +05:30
charitha
f4d62df8db Change builder to Entgra 2019-01-25 23:38:32 +05:30
lasanthaDLPDS
7975563530 Improve the payload of enrollment notification 2019-01-24 17:41:53 +05:30
lasanthaDLPDS
c4c92f0faa Adding application management initial pub UI 2019-01-23 14:26:16 +05:30
charitha
2380a22d53 Commit transaction after changing status 2019-01-21 15:36:42 +05:30
lasanthaDLPDS
e852c62663 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt 2019-01-21 10:54:37 +05:30
lasanthaDLPDS
b90766b5a4 Add enrollment notification sending feature 2019-01-18 08:04:40 +05:30
charitha
026bd175e9 Reformat & fix API publishing issue to Gateway 2019-01-17 22:46:32 +05:30
charitha
8b34253bc1 Optimize functionality 2019-01-17 15:28:12 +05:30
charitha
3d42175bea Merge branch 'master' of https://gitlab.com/ruwany.ace/carbon-device-mgt into entgra-master 2019-01-17 14:00:22 +05:30
Ace
18078c51e8 bug fixes 2019-01-17 13:53:42 +05:30
Ace
59186155d0 Adding new apis to update devices status/get count/get list based on status 2019-01-17 12:35:06 +05:30
charitha
e78a2a1279 Merge remote-tracking branch 'entgra/master' into entgra-master 2019-01-14 15:24:15 +05:30
charitha
75dd9321af Add methods to get device count based on status and device type 2019-01-14 15:24:01 +05:30
Dharmakeerthi Lasantha
b90f188e9b Merge branch 'master' into 'master'
Enrollment application install feature for policy

See merge request entgra/carbon-device-mgt!37
2019-01-01 08:19:53 +00:00
Saad Sahibjan
ae9dd807cc Enrollment application install feature for policy 2019-01-01 08:19:53 +00:00
Madawa Soysa
b902763eac Merge branch 'fix-advance-search' into 'master'
Fix issue with advanced search to pick the correct enrollment

Closes product-iots#14 and product-iots#13

See merge request entgra/carbon-device-mgt!36
2018-12-19 09:58:42 +00:00
Madawa Soysa
6f80d1993d Move private constants to a public constant class 2018-12-13 20:21:59 +11:00
Madawa Soysa
eea040f391 Remove redundant authorization check and fix the test 2018-12-09 14:01:45 +11:00
Madawa Soysa
001649e5fd Fix issue with advanced search to pick the correct enrollment
This commit addresses following two issues,

1. Advanced search feature returns the oldest enrollment instance

This issue occurs when the same device is enrolled for multiple users. The cause of the issue is filtering the devices by device identifier which is a unique property for a device. This commit fixes the issue by filtering the devices from enrollment id and owner instead of the device identifier.

2. All devices do not return for privileged users when searched through advanced-search

The cause of the issue is not considering the user permissions when filtering the devices. This commit fixes the issue by validating the permissions of the logged in user before filtering.

Fixes entgra/product-iots#13
Fixes entgra/product-iots#14
2018-12-04 23:04:25 +11:00