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
harshanL
6489ea1168
Added json response to license.
2014-12-15 09:17:20 +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
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
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
5ec8f20baf
adding device management mobile feature into CDM p2-profile
2014-12-10 16:54:11 +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
harshanL
7c7768101f
Modified Android enrollment APIs and changed isRegistered to isEnrolled
2014-12-10 14:53:15 +05:30
harshanL
7eb5b960a9
Fixed issues in pom file
2014-12-10 14:11:37 +05:30
harshanL
3f0f4ffeae
Fixed issues in pom file & enrollment
2014-12-10 14:10:04 +05:30
harshanL
267d27745d
Merged changes to master
2014-12-09 20:50:44 +05:30
harshanL
d09b37b4ce
merged changes to master
2014-12-09 20:45:37 +05:30
prabathabey
458171952e
Fixing issues in data types
2014-12-09 20:40:12 +05:30
harshanL
c2f5d79b9c
Added Android-REST API implementation changes
2014-12-09 20:37:47 +05:30
prabathabey
ab6c2717c9
fixing Android API util related issues
2014-12-09 20:32:56 +05:30
Geeth Munasinghe
ef515289cc
Fixing pom issues
2014-12-09 19:57:04 +05:30
Geeth Munasinghe
60f8733c86
Adding the cxf runtime
2014-12-09 19:28:11 +05:30
Geeth Munasinghe
6bc84366f2
Fixing starting problems
2014-12-09 18:53:16 +05:30
harshanL
40a4f54b9f
Android-REST API implementation.
2014-12-09 17:34:37 +05:30
manoj
9c04828935
DAO Layer Implementation
...
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
2014-12-08 15:21:32 +05:30
manoj
630c065d4e
DAO Layer Implementation
2014-12-08 15:09:30 +05:30
manoj
23938f5e0b
DAO Layer Impelementation
...
Conflicts:
pom.xml
2014-12-08 15:06:56 +05:30
inosh-perera
85dffe00bd
removed duplicate files
2014-12-05 14:58:11 +05:30
inosh-perera
8464669a23
Merge branch 'master' of https://github.com/geethkokila/product-cdm
2014-12-05 14:46:09 +05:30
inosh-perera
df00f34bb0
andoid registration refactor and jax-rs basic implementation
2014-12-05 14:46:00 +05:30
Geeth Munasinghe
85fc1adc79
Adding featurs for the device mgt
2014-12-05 12:05:48 +05:30
manoj
6e77014e64
Merge branch 'master' of https://github.com/geethkokila/product-cdm
2014-12-05 11:11:48 +05:30