Commit Graph

4645 Commits

Author SHA1 Message Date
sandarudr
13620d5c11 Add operation to enable/disable lock-task mode 2019-10-18 18:50:08 +05:30
Inosh Perara
d6267328c6 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix 415 error in delete endpoints of Android Enterprise API

See merge request entgra/carbon-device-mgt-plugins!96
2019-10-17 10:12:00 +00:00
Jayasanka
8f9b7164cc Fix 415 error in delete endpoints of Android Enterprise API 2019-10-17 15:28:19 +05:30
Dharmakeerthi Lasantha
c938757ff6 Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt-plugins!94
2019-10-16 07:01:24 +00:00
lasanthaDLPDS
1f2287d39d Integrate with correct device mgt version 2019-10-16 11:58:39 +05:30
lasanthaDLPDS
8c4ce5da3a Merge with upstream master 2019-10-15 13:33:30 +05:30
Entgra Builder
e4faf915f4 [maven-release-plugin]prepare for next development iteration 2019-10-15 07:13:51 +00:00
Entgra Builder
94006d3d14 [maven-release-plugin]prepare release v4.2.12 2019-10-15 07:13:43 +00:00
milanperera
3aa1692aec Bump versions for 370-rc3 2019-10-15 08:12:50 +02:00
Entgra Builder
af0c696415 [maven-release-plugin]prepare for next development iteration 2019-10-14 14:32:33 +00:00
Entgra Builder
196cd2ade8 [maven-release-plugin]prepare release v4.2.11 2019-10-14 14:32:27 +00:00
milanperera
392fbbf50f Bump versions for 370-rc3 2019-10-14 16:27:16 +02:00
Dharmakeerthi Lasantha
708aafd3a1 Merge branch 'application-mgt-new' into 'application-mgt-new'
Change logger level to warn when Android Enterprise is not configured

See merge request entgra/carbon-device-mgt-plugins!93
2019-10-14 08:53:04 +00:00
Jayasanka
40bfb2175c Change logger level to warn when Android Enterprise is not configured 2019-10-14 12:27:47 +05:30
Dharmakeerthi Lasantha
bc167bd963 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add null and empty check for device location related values

See merge request entgra/carbon-device-mgt-plugins!92
2019-10-10 13:46:50 +00:00
Saad Sahibjan
6901747aeb Add null and empty check for device location related values 2019-10-10 15:55:45 +05:30
Entgra Builder
2500127c62 [maven-release-plugin] prepare for next development iteration 2019-10-09 11:18:13 +00:00
Entgra Builder
6c9bd30d11 [maven-release-plugin] prepare release v4.2.10 2019-10-09 11:18:07 +00:00
milanperera
459747d167 Bump versions for 370-rc2 2019-10-09 13:13:38 +02:00
Entgra Builder
8c64732aa5 [maven-release-plugin]prepare for next development iteration 2019-10-05 14:38:18 +00:00
Entgra Builder
e702fe9438 [maven-release-plugin]prepare release v4.2.9 2019-10-05 14:38:12 +00:00
Milan Perera
6c87b75ee1 Merge branch 'master' into 'master'
Bump versions for 370 release

See merge request entgra/carbon-device-mgt-plugins!91
2019-10-05 14:09:33 +00:00
milanperera
db9498e0a9 Bump versions for 370 release 2019-10-05 15:32:14 +02:00
Dharmakeerthi Lasantha
e3018971d0 Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt-plugins!90
2019-10-04 13:00:29 +00:00
lasanthaDLPDS
cbc37c47d2 Sync with upstream master 2019-10-04 18:17:11 +05:30
Dharmakeerthi Lasantha
8ff1eb4751 Add APIs for Google Enterprise 2019-10-04 12:31:23 +00:00
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