Dulitha Wijewantha
df09c4bd3c
* Added method to the mobile feature DAO to get features by type
...
* Changed method - getFeaturePropertyOfFeature to accept a string
* Added Device Type to the Feature DAO implementations
* Changed Device Feature properties DAO for Int
* Implemented the get feature by type to android operation manager
2015-01-23 18:39:28 +05:30
Dulitha Wijewantha
f1193b5647
Fixed indentation. UI module changes
2015-01-23 12:47:25 +05:30
Dulitha Wijewantha
ba8f6621a4
Merge branch 'master' of github.com:dulichan/product-mdm
2015-01-23 11:42:11 +05:30
Dulitha Wijewantha
24184b48a7
Reverted changes back to the list implementation. The Map conversion is not properly supported in CXF
2015-01-23 11:40:06 +05:30
Dulitha Wijewantha
dcf222d2c1
Reverted changes back to the list implementation. The Map conversion is not properly supported in CFX
2015-01-23 11:29:33 +05:30
harshanL
2b3ee5e4f2
Added package-info.java
2015-01-22 22:33:26 +05:30
harshanL
ad3f748e0b
Fixed merge conflicts
2015-01-22 22:24:52 +05:30
harshanL
163fe58120
Added new changes in operation management
2015-01-22 22:04:51 +05:30
prabathabey
7fc4244259
Fixing issues in package-info.java
2015-01-22 21:59:36 +05:30
Prabath Abeysekara
4c1d4a01a5
Merge pull request #4 from dulichan/master
...
UI improvements and backend implementations
2015-01-22 21:23:58 +05:30
Dulitha Wijewantha
d5c00a2e1e
Merge branch 'master' of github.com:wso2/product-mdm
2015-01-22 21:20:36 +05:30
Dulitha Wijewantha
9f71408001
* Fixed the JNDI bug
...
* Added a device module method and apis for a single device
* UI improvement to the device page
2015-01-22 21:20:08 +05:30
Geeth Munasinghe
2883f0dda2
Merge branch 'master' of https://github.com/wso2/product-mdm
2015-01-22 19:23:19 +05:30
Geeth Munasinghe
118ee37998
Adding changes of asok
...
Merge branch 'asokaravinda-master'
2015-01-22 19:22:12 +05:30
prabathabey
8e3d4e11e3
Adding org.wso2.carbon.um.ws.service.client.feature.group feature required for API management related dependencies
2015-01-22 19:20:57 +05:30
Geeth Munasinghe
737eee4270
Merge branch 'master' of https://github.com/asokaravinda/product-mdm into asokaravinda-master
2015-01-22 19:16:54 +05:30
asok
2947e6fd21
commiting windows plugin
2015-01-22 19:12:40 +05:30
Geeth
1bf1f5d09d
Merge pull request #2 from dulichan/master
...
Merging left over changes from MDM. Most of the changes are from HarshanL
2015-01-22 19:12:38 +05:30
Geeth Munasinghe
fd814c7e24
Fixing version issues and changing cdm to mdm
2015-01-22 16:41:34 +05:30
Dulitha Wijewantha
90402107f6
Included the UI improvements to cdm jaggery app. Included the sso jaggery module dependency.
2015-01-22 15:51:09 +05:30
Dulitha Wijewantha
99f7cd25e8
Merging left over changes from MDM. Most of the changes are from @harshahL.
2015-01-22 10:43:36 +05:30
Geeth Munasinghe
bc93ff08a4
Changing cdm to mdm
2015-01-21 20:14:55 +05:30
asok
ebe0aa2663
commiting windows plugin
2015-01-21 16:34:03 +05:30
asok
eb52073e37
commiting windows plugin
2015-01-21 16:29:24 +05:30
Geeth Munasinghe
5e3ebc141c
As discussed in the product counsil, the MDM will be the mobile solution built upon CDM framework
2015-01-21 12:44:51 +05:30
prabathabey
715d242b22
Resolving conflicts in README.md and .gitignore
2015-01-20 14:07:50 +05:30
prabathabey
e506ed0cdc
Resolving conflicts in .gitignore
2015-01-20 14:00:56 +05:30
inosh-perera
1f489c8d62
Merge branch 'master' of https://github.com/geethkokila/product-cdm
2015-01-20 13:49:38 +05:30
inosh-perera
2663ee014c
xml element name changes of UI
2015-01-20 13:49:33 +05:30
inosh-perera
8de9a702d7
added authentication response handler, comment fixes
2015-01-20 13:48:20 +05:30
Geeth Munasinghe
77016e614c
Merge branch 'master' of https://github.com/geethkokila/product-cdm
2015-01-20 12:02:21 +05:30
Geeth Munasinghe
4c6d97a30a
Fixing repo conflicts
2015-01-20 12:02:04 +05:30
harshanL
5cb85e2069
Fixed merge conflicts
2015-01-20 11:47:22 +05:30
harshanL
193eca9e2d
Added operation persistance logic & refactored the code
2015-01-20 11:44:31 +05:30
manoj
17457bf6d3
Refactor Agents module
2015-01-20 11:42:32 +05:30
Geeth Munasinghe
9f789af79f
Fixing git repo issues
2015-01-20 11:41:44 +05:30
Geeth Munasinghe
ce3149bc45
Adding partially completed policy evaluation
2015-01-20 11:10:47 +05:30
manoj
dd9bfdb6a7
Refactor Operations
2015-01-20 07:46:13 +05:30
manoj
da0351ebcd
Change device type to device type Id
2015-01-20 07:37:39 +05:30
manoj
72a3df080b
Merge branch 'master' of https://github.com/geethkokila/product-cdm
...
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java
product/pom.xml
2015-01-20 07:29:16 +05:30
manoj
aa50bf96ed
Add License Mgt
2015-01-19 21:39:06 +05:30
manoj
50a17eb33d
Refactor add new mobile service module to as parent to agent module
2015-01-19 21:38:41 +05:30
manoj
6703f590f3
Merge Changes
2015-01-19 21:37:08 +05:30
Dulitha Wijewantha
f340855916
Merge branch 'master' of https://github.com/geethkokila/product-cdm
2015-01-19 17:59:01 +05:30
Dulitha Wijewantha
adebf34ff2
Refactored the device id to integer.
...
Created method to convert dto.device to common.device
Created a bulk method for conversion
Implemented getAllDevices
2015-01-19 17:54:39 +05:30
DilanUA
e093d53b43
Copyright notices of policy-mgt classes were updated.
2015-01-19 15:46:33 +05:30
DilanUA
cbe13288d0
[1] Copyright notices of policy-mgt component classes were updated. [2] Mispelled getJndiLookupDefinition() of org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig was updated.
2015-01-19 15:08:42 +05:30
Dulitha Wijewantha
250c48a258
Fixed an issue of DeviceType and DeviceIdentifier. Implemented the getDeviceType method
2015-01-19 14:32:10 +05:30
maheshika
9f7f3a32a1
Initial commit
2015-01-19 13:06:01 +05:30
maheshika
85f0fb262e
Initial commit
2015-01-19 13:05:10 +05:30