Commit Graph

6869 Commits

Author SHA1 Message Date
Inosh Perara
cfd30f87fd Add APIs for Google Enterprise
This commit will add API needed for devices to communicate with the server to get a token and also adds back Android plugin DB access to communicate with Android plugin related database.
2019-10-04 12:31:22 +00:00
Dharmakeerthi Lasantha
21c094eeb8 Fix build failure 2019-10-04 12:30:33 +00:00
achala piyarathna
cb446acc16 Fix build failure 2019-10-04 12:30:33 +00:00
Charitha Goonetilleke
2053a97479 Bump android agent version 2019-10-04 11:45:24 +00:00
Dharmakeerthi Lasantha
09febbd2e7 Merge branch 'tmp2' into 'application-mgt-new'
Device location history view feature

See merge request entgra/carbon-device-mgt-plugins!88
2019-10-03 16:33:33 +00:00
achala piyarathna
bebf47981d Device location history view feature 2019-10-03 16:33:33 +00:00
Saad Sahibjan
43d855ec09 Merge branch 'master' into 'master'
Fix incorrect device view issue in android.

See merge request entgra/carbon-device-mgt-plugins!87
2019-10-03 10:08:49 +00:00
lasanthaDLPDS
1960c01462 Fix incorrect device view issue in android. 2019-10-03 11:04:55 +05:30
Dharmakeerthi Lasantha
c9c19308e0 Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync master branch in to application-mgt-new

See merge request entgra/carbon-device-mgt-plugins!85
2019-10-01 04:58:15 +00:00
charitha
752af2ca41 FIx test failure 2019-10-01 09:30:30 +05:30
charitha
958712970e Merge branches 'application-mgt-new' and 'master' of https://gitlab.com/entgra/carbon-device-mgt-plugins into application-mgt-new 2019-10-01 09:22:22 +05:30
Dharmakeerthi Lasantha
8e3fe481a1 Add QR code generate capability to enroll android agent 2019-09-26 10:30:37 +00:00
sandaru daminda
97a1b805d9 Add QR code generate capability to enroll android agent. 2019-09-26 10:30:37 +00:00
Dharmakeerthi Lasantha
f23bd5e2f1 Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with master branch

See merge request entgra/carbon-device-mgt-plugins!84
2019-09-22 06:51:02 +00:00
charitha
5f274bdc19 Merge with upstream/master 2019-09-20 14:21:15 +05:30
Dharmakeerthi Lasantha
80b76c95d6 Fix test failure and improve disenrolling API 2019-09-19 21:38:41 +00:00
Amanda Randombage
f89a6d9fb8 Fix test failure and improve disenrolling API
-Remove query param from disenrolling API
2019-09-19 21:38:41 +00:00
charitha
4ca700d873 Fix test failures 2019-09-17 20:05:25 +05:30
Dharmakeerthi Lasantha
d03dc54e8d Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt-plugins!81
2019-09-13 03:04:56 +00:00
lasanthaDLPDS
90f7d1045f Fix merge conflicts 2019-09-13 07:51:21 +05:30
Ruwan Yatawara
f5ce222701 Merge branch 'master' into 'master'
Bump app manger version

See merge request entgra/carbon-device-mgt-plugins!79
2019-09-12 02:37:04 +00:00
lasanthaDLPDS
326b09b000 Bump app manger version 2019-09-11 18:49:49 +05:30
Charitha Goonetilleke
7c441ccea6 Merge branch 'master' into 'master'
Fix websocket event stream validation

See merge request entgra/carbon-device-mgt-plugins!78
2019-09-09 17:38:06 +00:00
Turcy
35a302e306 Fix websocket event stream validation 2019-09-09 22:46:41 +05:30
Madawa Soysa
9bbf54fdf4 Merge branch 'master' into 'master'
Fix build failure

See merge request entgra/carbon-device-mgt-plugins!76
2019-09-09 03:54:22 +00:00
lasanthaDLPDS
e0113824c0 Fix build failure 2019-09-06 19:14:11 +05:30
Charitha Goonetilleke
136b6c7add Merge branch 'device-config-api' into 'master'
CDM version change to 3.2.9-SNAPSHOT

See merge request entgra/carbon-device-mgt-plugins!73
2019-08-30 04:55:01 +00:00
Pahansith
d4f3e87c3b CDM version change to 3.2.9-SNAPSHOT 2019-08-30 10:00:53 +05:30
Inosh Perara
b6ae9e2c12 Merge branch 'application-mgt-new' into 'application-mgt-new'
Modify enrollment app install android policy to support new app manager

See merge request entgra/carbon-device-mgt-plugins!72
2019-08-29 08:40:21 +00:00
Saad Sahibjan
51f74d7744 Modify enrollment app install android policy to support new app manager 2019-08-29 13:13:38 +05:30
Charitha Goonetilleke
41fe269e46 Merge branch 'device-config-api' into 'master'
Add test case for newly added method on DeviceManagementProviderService

See merge request entgra/carbon-device-mgt-plugins!64
2019-08-29 06:55:07 +00:00
Milan Perera
2c043363db Merge branch 'master' into 'master'
Fix ent.app install issue when installing via roles

See merge request entgra/carbon-device-mgt-plugins!71
2019-08-28 08:11:28 +00:00
lasanthaDLPDS
ba24c1a03e Fix ent.app install issue when installing via roles 2019-08-28 13:06:22 +05:30
Pahansith
bc38a4a6d6 Fix test fail due to not overriding getDeviceConfiguration method 2019-08-27 23:37:22 +05:30
Dharmakeerthi Lasantha
b83c8806af Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt-plugins!67
2019-08-22 13:14:37 +00:00
lasanthaDLPDS
7d04c04045 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt-plugins into application-mgt-new 2019-08-22 17:59:20 +05:30
Pahansith
48c89b06b9 Add test case for newly added method on DeviceManagementProviderService 2019-08-14 08:59:29 +05:30
Saad Sahibjan
d0466fb79a Merge branch 'master' into 'master'
Fix https://gitlab.com/entgra/product-iots/issues/125

Closes product-iots#125

See merge request entgra/carbon-device-mgt-plugins!63
2019-08-08 09:38:33 +00:00
inoshperera
c1184167df Fix https://gitlab.com/entgra/product-iots/issues/125 2019-08-08 14:54:47 +05:30
Dharmakeerthi Lasantha
7062d9add5 Merge branch 'application-mgt-new' into 'application-mgt-new'
Merge with upstream master

See merge request entgra/carbon-device-mgt-plugins!62
2019-07-21 21:11:24 +00:00
Milan Perera
20a89a8105 Merge branch 'master' into 'master'
Fix the issue with android device view tooltip

See merge request entgra/carbon-device-mgt-plugins!61
2019-07-18 09:48:47 +00:00
Saad Sahibjan
2ed5948916 Fix the issue with android device view tooltip 2019-07-18 15:03:45 +05:30
lasanthaDLPDS
088eba6b22 Merge with master branch to remove windows plugin 2019-07-17 18:33:39 +05:30
lasanthaDLPDS
02d4d5d7ac Merge with master branch 2019-07-17 18:27:53 +05:30
Dharmakeerthi Lasantha
8b0d92ed1c Merge branch 'remove-windows-feature' into 'master'
Remove windows plugin

See merge request entgra/carbon-device-mgt-plugins!60
2019-07-17 12:55:22 +00:00
Saad Sahibjan
3c3ec490b7 Remove windows plugin 2019-07-15 14:09:57 +05:30
Milan Perera
ed3b4c979a Merge branch 'fix-windows-operations' into 'master'
Add missing type attribute to windows.xml

See merge request entgra/carbon-device-mgt-plugins!59
2019-07-11 12:30:18 +00:00
Pahansith Gunathilake
681ad5ed2f Add missing type attribute to windows.xml 2019-07-11 12:30:18 +00:00
Entgra Builder
ccb2d48390 [maven-release-plugin] prepare for next development iteration 2019-07-05 10:53:26 +00:00
Entgra Builder
b90fbfe104 [maven-release-plugin] prepare release v4.2.8 2019-07-05 10:53:16 +00:00