Commit Graph

176 Commits

Author SHA1 Message Date
harshanL
c4b255b751 Changed the archetype readme to add prerequisites 2015-01-27 09:06:16 +05:30
harshanL
5b49fd0976 Added the maven archetype to create android mdm-agent project 2015-01-26 18:30:13 +05:30
Geeth Munasinghe
3017d53432 Adding saml sso feature 2015-01-23 23:49:16 +05:30
inosh-perera
6a74d401e1 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:55:33 +05:30
Geeth Munasinghe
6ac5cb1438 fixing cdm jaggery app not ddploying issue 2015-01-23 22:52:07 +05:30
inosh-perera
53c2abd574 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:48:30 +05:30
inosh-perera
8e4e434d0d added adroid code from old repository, oauth basic login fixed 2015-01-23 22:46:43 +05:30
Geeth Munasinghe
5883944e23 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:34:53 +05:30
prabathabey
19adb9482f Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:31:47 +05:30
prabathabey
95e538c324 Fixing issues related to copying API manager publisher and store related jaggery webapps 2015-01-23 22:31:34 +05:30
Geeth Munasinghe
38b839a4a9 Merge branch 'master' of https://github.com/dulichan/product-mdm 2015-01-23 22:31:17 +05:30
Geeth Munasinghe
c93f99d970 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 22:22:31 +05:30
Geeth Munasinghe
57482a7ae3 Merge branch 'master' of https://github.com/manojgunayadev/product-mdm 2015-01-23 22:19:19 +05:30
prabathabey
dec7419e41 Fixing self-registration feature installation related issues 2015-01-23 22:17:26 +05:30
prabathabey
fb72682da0 Adding API Publisher and Store Features to p2-profile 2015-01-23 22:06:06 +05:30
Dulitha Wijewantha
5b68949c41 Merge branch 'master' of github.com:wso2/product-mdm 2015-01-23 22:03:18 +05:30
Dulitha Wijewantha
3f7b93163b * Added a description to the feature implementation
* Added the feature insert, changed the feature_id to int and added device_type to features
* Included the updated database file
* Developed the feature to view device features
* Developed the implementation to call the Operation Manager from the UI
2015-01-23 22:03:01 +05:30
Geeth Munasinghe
7fb84d4a04 Merge branch 'master' of https://github.com/wso2/product-mdm 2015-01-23 21:37:27 +05:30
Geeth Munasinghe
9a89aa8112 Adding the sso features and changing the filter.properties 2015-01-23 21:37:16 +05:30
prabathabey
f296fb763e Configuring product.name and product.version variables to be replaced with appropriate filter properties 2015-01-23 21:36:02 +05:30
manoj
7dc6a987c7 Remove license rxt file from MDM 2015-01-23 21:19:26 +05:30
manoj
bdb522d0e5 Delete license rxt 2015-01-23 21:18:54 +05:30
prabathabey
b17b514d11 Resolving conflicts 2015-01-23 21:08:58 +05:30
prabathabey
da34270a61 Fixing API Manager related issues 2015-01-23 20:53:50 +05:30
harshanL
e40424c758 Added copying mobile db scripts to bin.xml & refactored code 2015-01-23 19:44:16 +05:30
Geeth Munasinghe
1cdbfd84e0 Merge branch 'master' of https://github.com/manojgunayadev/product-mdm 2015-01-23 18:55:03 +05:30
manoj
329f956f3d License Management 2015-01-23 18:19:21 +05:30
Geeth Munasinghe
cf8eaaef41 Merge branch 'master' of https://github.com/dulichan/product-mdm 2015-01-23 14:13:54 +05:30
manoj
40489f986d Merge remote-tracking branch 'upstream/master' 2015-01-23 13:54:27 +05:30
manoj
4974d49320 License Management 2015-01-23 13:49:27 +05:30
Dulitha Wijewantha
f1193b5647 Fixed indentation. UI module changes 2015-01-23 12:47:25 +05:30
Geeth Munasinghe
20a228992f Adding org.wso2.carbon.identity.self.registration.server.feature to p2 profile gen 2015-01-23 12:29:17 +05:30
manoj
b702a72b2f Merge remote-tracking branch 'upstream/master' 2015-01-23 11:04:05 +05:30
manoj
b96d561ef0 License Manaproduct/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.javagement 2015-01-23 11:02:25 +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
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
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