Commit Graph

11124 Commits

Author SHA1 Message Date
manoj
69c730d147 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-15 11:23:33 +05:30
manoj
8fa2f38f37 remove EMM DB scripts file 2014-12-15 11:23:06 +05:30
prabathabey
fceccb3280 Fixing build issues introduced by introducing a static inner class to keep track of device related properties 2014-12-15 11:19:42 +05:30
prabathabey
0543d71f6b Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-15 09:57:39 +05:30
prabathabey
0acf34ae51 Fixing DAOFactory initialzation related issues 2014-12-15 09:57:24 +05:30
harshanL
9f5fb3fb91 Added MobileDeviceDAO classes 2014-12-15 09:47:54 +05:30
harshanL
006b07b399 Fixed issues in build & added COPE to enum 2014-12-15 09:41:54 +05:30
harshanL
6489ea1168 Added json response to license. 2014-12-15 09:17:20 +05:30
manoj
aa2448dd0a Add device list method and chgange getDevice by Id method return type to device 2014-12-12 20:00:57 +05:30
manoj
f16c1b47e2 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-12 19:57:26 +05:30
manoj
18083d2d11 DAO unit tests implementation 2014-12-12 19:56:19 +05:30
manoj
10a05b024f Device DAO unit tests implementation 2014-12-12 19:55:41 +05:30
Geeth Munasinghe
172ab10ac0 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-12 17:49:22 +05:30
Geeth Munasinghe
3996e4b95a Fixing android webapp getting changed by the filtered key word 2014-12-12 17:25:23 +05:30
manoj
6a86ab43c1 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-12 17:23:04 +05:30
manoj
8ad13b6d0a Implement DAO unit tests 2014-12-12 17:22:16 +05:30
manoj
c4e2722586 Unit test framework for DAO tests 2014-12-12 17:21:27 +05:30
Asok
8d67673198 Merge branch 'master' of https://github.com/geethkokila/product-cdm
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-12-12 17:16:43 +05:30
Asok
608e552c07 removing java.nio 2014-12-12 17:15:07 +05:30
Geeth Munasinghe
274d9ec37e Adding the feature management service and android application to webapps 2014-12-12 14:45:24 +05:30
harshanL
d352daf626 Refactored Android-REST API code 2014-12-12 12:07:28 +05:30
Asok
7282465b12 Adding Windows module and pom changes 2014-12-12 11:55:43 +05:30
Asok
9ac8b17be2 Adding windows plugin 2014-12-12 11:44:00 +05:30
harshanL
e45e19c5e8 Fixed issues in device management APIs 2014-12-11 18:29:11 +05:30
harshanL
f091ce70c6 Added new APIs to device management 2014-12-11 17:49:36 +05:30
harshanL
80334ef00d Added new APIs to enrollment 2014-12-11 17:22:32 +05:30
harshanL
dacd16b852 Added validations to json objects in Android-REST apis 2014-12-11 15:48:59 +05:30
harshanL
6d5ea7f586 Added JSON to Device object conversion 2014-12-11 15:21:18 +05:30
Geeth Munasinghe
8cc549d762 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 20:01:12 +05:30
Geeth Munasinghe
fd374b16a1 Fixing datasouce configurations 2014-12-10 20:00:12 +05:30
inosh-perera
13b96d9b93 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 19:39:55 +05:30
Geeth Munasinghe
3b79c98335 Adding the cdm-datasources.xml to bin xml 2014-12-10 18:47:50 +05:30
Geeth Munasinghe
e1c9856e1e Adding cdm-datasources.xml 2014-12-10 18:46:02 +05:30
prabathabey
bd072a1a5c Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 18:07:18 +05:30
prabathabey
f50e9cebdb Fixing issues in reading the SQL script associated with CDM related functionalities 2014-12-10 18:07:01 +05:30
Geeth Munasinghe
487b15575a Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 18:05:23 +05:30
Geeth Munasinghe
14a3429a19 Fixing cdm-config file adding 2014-12-10 18:04:29 +05:30
inosh-perera
ac3bd52260 alert dialogs are invoked from the decleared once in dialog util 2014-12-10 17:59:10 +05:30
prabathabey
f321b133b8 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 17:54:10 +05:30
prabathabey
c199f6fe69 Renaming MobileDeviceManagementServiceComponent.java as MobileDeviceManagementBundleActivator.java and adding missing Bundle-Activator header in org.wso2.carbon.device.mgt.mobile.impl pom 2014-12-10 17:53:54 +05:30
harshanL
9697c1fa99 Added comments to the DeviceManagerService interface 2014-12-10 17:10:12 +05:30
prabathabey
5db7698627 removing duplicate declarations of testng related depdendncies from parent pom 2014-12-10 16:58:57 +05:30
prabathabey
5ec8f20baf adding device management mobile feature into CDM p2-profile 2014-12-10 16:54:11 +05:30
prabathabey
6082f1eaae Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 16:48:47 +05:30
prabathabey
4c727c6a53 adding mobile device management feature 2014-12-10 16:48:39 +05:30
harshanL
efdaf6e7a5 Added parent pom info 2014-12-10 16:41:16 +05:30
harshanL
ac484d06fa Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 15:32:39 +05:30
harshanL
963e426e04 added super-tenant flow 2014-12-10 15:31:44 +05:30
Geeth Munasinghe
1deb634f92 Fixing conflicts issue 2014-12-10 15:09:55 +05:30
Geeth Munasinghe
65433dda57 Fixing pom issues 2014-12-10 15:08:31 +05:30