Commit Graph

8001 Commits

Author SHA1 Message Date
Ace
8086a54a1a Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-19 08:34:58 +05:30
Ace
7838eaf97b Modifying group devices API to retrieve properties 2019-09-19 07:59:45 +05:30
Dharmakeerthi Lasantha
d9999ad5b2 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix image loading issue in tenants

See merge request entgra/carbon-device-mgt!255
2019-09-18 14:17:14 +00:00
lasanthaDLPDS
28b4d52d23 Fix app loading issue 2019-09-18 19:33:26 +05:30
lasanthaDLPDS
c129fb1c41 Fix image loading issue in tenant mode 2019-09-18 19:32:59 +05:30
Dharmakeerthi Lasantha
5e8f6903e5 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add tenant domain to the login form

See merge request tcdlpds/carbon-device-mgt!7
2019-09-18 14:02:50 +00:00
Jayasanka Weerasinghe
27e01e80a8 Fix server starting issue
This issue is occurred as a result of having java8 codes in the source. Hence remove and replace the code.
2019-09-18 14:02:50 +00:00
lasanthaDLPDS
73ec7dd173 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-09-18 08:13:57 +05:30
charitha
2e811aa12b Fix config fetching and device type filtering for tenants 2019-09-18 08:11:20 +05:30
charitha
2c7463a072 Add device transferring across tenants 2019-09-17 20:03:23 +05:30
charitha
30d4a5707a Fix platform config listing 2019-09-17 20:02:50 +05:30
charitha
705f6fbbe4 Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-09-17 09:14:41 +05:30
Dharmakeerthi Lasantha
fd7436eaa6 Merge branch 'application-mgt-new' into 'application-mgt-new'
Handle API error in APPM store

See merge request entgra/carbon-device-mgt!254
2019-09-16 12:14:32 +00:00
Jayasanka Weerasinghe
85fe985a94 Fix server starting issue
This issue is occurred as a result of having java8 codes in the source. Hence remove and replace the code.
2019-09-16 12:14:32 +00:00
Dharmakeerthi Lasantha
1eb70051e0 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add application installation response via pull notification

See merge request entgra/carbon-device-mgt!253
2019-09-16 11:49:35 +00:00
Charitha Goonetilleke
5cf89ec24c Add application installation response via pull notification 2019-09-16 11:49:35 +00:00
charitha
239b1b9bb0 Add application installation response via pull notification 2019-09-16 16:22:24 +05:30
Dharmakeerthi Lasantha
d45b153a9a Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix app-install operation adding issue for custom apps

See merge request entgra/carbon-device-mgt!252
2019-09-16 10:14:48 +00:00
lasanthaDLPDS
34f1b25c84 Fix app-install operation adding issue for custom apps 2019-09-16 15:39:22 +05:30
charitha
919eeab2d8 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-09-16 13:05:47 +05:30
Charitha Goonetilleke
c3490c129a Fix issue in deploying event streams 2019-09-16 06:48:01 +00:00
Dharmakeerthi Lasantha
0a0ac706f3 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix custom app loading issue

See merge request entgra/carbon-device-mgt!249
2019-09-15 17:40:22 +00:00
lasanthaDLPDS
a3e0eb031c Fix custom app loading issue 2019-09-15 23:03:34 +05:30
Dharmakeerthi Lasantha
8ce3318645 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix device type loading issue for custom apps

See merge request entgra/carbon-device-mgt!248
2019-09-15 16:34:10 +00:00
Dharmakeerthi Lasantha
5c92401265 Fix server starting issue
This issue is occurred as a result of having java8 codes in the source. Hence remove and replace the code.
2019-09-15 16:34:10 +00:00
Charitha Goonetilleke
0e22d24e61 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add new application type

See merge request entgra/carbon-device-mgt!247
2019-09-15 15:49:06 +00:00
lasanthaDLPDS
ed557fc510 Fix merge conflicts 2019-09-15 20:37:13 +05:30
Dharmakeerthi Lasantha
6e8d139cbc Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix APPM publisher UI according to custom type app installation feature

See merge request tcdlpds/carbon-device-mgt!5
2019-09-15 14:26:53 +00:00
Jayasanka Weerasinghe
c204e6f9b7 Fix server starting issue
This issue is occurred as a result of having java8 codes in the source. Hence remove and replace the code.
2019-09-15 14:26:53 +00:00
lasanthaDLPDS
cfd0f709ef Add new application type
Add new application type for IoT use cases. Further, it is named as CUSTOM
2019-09-15 18:48:09 +05:30
Ace
fc03c404ad Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-14 13:03:06 +05:30
Dharmakeerthi Lasantha
272077a8d1 Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt!245
2019-09-13 03:00:41 +00:00
lasanthaDLPDS
bf67894924 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-09-13 07:39:50 +05:30
Saad Sahibjan
0af060f5b8 Merge branch 'master' into 'master'
Fix server starting issue

See merge request entgra/carbon-device-mgt!244
2019-09-12 16:54:34 +00:00
lasanthaDLPDS
cebc18bef6 Fix server starting issue
This issue is occurred as a result of having java8 codes in the source. Hence remove and replace the code.
2019-09-12 22:20:55 +05:30
Ace
def206d17e Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-11 16:18:27 +05:30
Ace
82447ef865 Fixing issues with query-devices 2019-09-11 16:18:13 +05:30
Charitha Goonetilleke
11e6e11714 Merge branch 'master' into 'master'
Sort device analytics data

Closes product-iots#140

See merge request entgra/carbon-device-mgt!238
2019-09-11 06:23:21 +00:00
Dharmakeerthi Lasantha
5f4abf8ff5 Merge branch 'application-mgt-new' into 'application-mgt-new'
Improve error messages logging

See merge request entgra/carbon-device-mgt!242
2019-09-11 01:27:35 +00:00
lasanthaDLPDS
7a48f72f6b Improve error messages logging 2019-09-11 03:55:11 +05:30
Dharmakeerthi Lasantha
65c462bcd3 Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt!240
2019-09-10 15:29:30 +00:00
lasanthaDLPDS
b3860d502e Fix build failure 2019-09-10 20:15:55 +05:30
lasanthaDLPDS
a41b5313a0 Fix merge conflicts 2019-09-10 19:11:37 +05:30
Turcy
e33f28bf8a Sort device analytics data 2019-09-09 23:49:24 +05:30
Charitha Goonetilleke
71488410d4 Merge branch 'master' into 'master'
Rest api to deploy DAS components

See merge request entgra/carbon-device-mgt!226
2019-09-09 15:03:49 +00:00
Charitha Goonetilleke
12e19b9862 Merge branch 'master' into 'master'
Make device analytics timestamp human-readable

Closes product-iots#139

See merge request entgra/carbon-device-mgt!234
2019-09-09 14:46:01 +00:00
Yohan Avishke
234c2ee104 Resolve issue with wrong license header 2019-09-09 20:08:33 +05:30
Yohan Avishke
3dff9fef80 Create Endpoints to deploy DAS artifacts as Strings
Four new endpoints were created to deploy DAS artifacts. These apis will accept JSON payloads and convert them to Strings and will use those to deploy artifacts. These endpoints are different from the existing endpoints due to accepting different payloads and using different stubs to deploy.
2019-09-09 19:51:40 +05:30
Milan Perera
299ae580ee Merge branch '3.7.0-fixes' into 'master'
Add DM_DEVICE_CERTIFICATE table script to main DB scripts

Closes product-iots#63

See merge request entgra/carbon-device-mgt!236
2019-09-08 20:01:27 +00:00
milanperera
1cc5209c4e Add certificate mgt table creation 2019-09-08 21:58:17 +02:00