Commit Graph

4264 Commits

Author SHA1 Message Date
harshanl
db2065435b Added getAllDevicesOfUser and getAllDevicesOfRole methods with user feature 2015-05-17 17:56:44 +05:30
Dilshan Edirisuriya
fc0dc162ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-16 12:10:20 +05:30
Dilshan Edirisuriya
a15970d0e3 Changes to repo url 2015-05-16 12:10:05 +05:30
geethkokila
f83d919ed1 Merge branch 'master' of https://github.com/wso1/carbon-device-mgt 2015-05-15 20:25:11 +05:30
geethkokila
53c22fe9fe Adding criteria based policy 2015-05-15 20:25:04 +05:30
mharindu
c892c0b783 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-15 15:12:18 +05:30
manoj
1b1b66fc29 Handle DB close within rollback transaction 2015-05-15 15:04:13 +05:30
manoj
f4b8e4bb74 Remove delete device type from DB when un register plugin 2015-05-15 12:04:01 +05:30
mharindu
aeb9c6e5aa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-15 11:49:08 +05:30
manoj
a774bc89aa Device Type not present in DB, return null instead of dummy object 2015-05-15 02:43:41 +05:30
mharindu
937530087d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-14 22:14:07 +05:30
mharindu
f83897708c Merged 2015-05-14 22:13:57 +05:30
prabathabey
5eed51c3dc Fixing issues surfaced while logging into the management console of the product as a result of an anomaly in the webapp authenticator framework 2015-05-14 18:13:24 +05:30
manoj
bf62561b00 Change Next operations method to accept parameter device id 2015-05-13 23:34:03 +05:30
Dulitha Wijewantha
86813aac52 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-05-13 22:36:47 +05:30
prabathabey
d5cafe843d Fixing issues related to webapp-authenticator-config.xml not getting copied into the MDM distribution 2015-05-13 22:36:03 +05:30
Dulitha Wijewantha
a572374d28 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-05-13 22:27:29 +05:30
prabathabey
afbf6a9bf8 Fixing issues related to webapp-authenticator-config.xml not getting copied into the MDM distribution 2015-05-13 22:14:50 +05:30
Dulitha Wijewantha
946409de84 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-05-13 22:04:45 +05:30
Dulitha Wijewantha
acc159d132 * Refactored addPolicy 2015-05-13 22:04:15 +05:30
prabathabey
d76501cf15 Fixing startup issues caused by not properly updating the Carbon-commons version in the parent pom of carbon-devicemgt repository 2015-05-13 20:14:26 +05:30
Prabath Abeysekara
8c5a792eb1 Merge pull request #8 from wso2/branch-java8
Making components in carbon-devicemgt repository use Carbon kernel 4.…
2015-05-13 19:57:15 +05:30
prabathabey
2b195618c6 Making components in carbon-devicemgt repository use Carbon kernel 4.4.0 based dependencies 2015-05-13 19:54:23 +05:30
Dulitha Wijewantha
c703b5070f Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-05-13 19:19:20 +05:30
manoj
9b5f6bc171 Change next operations to join profile operations 2015-05-13 18:25:52 +05:30
mharindu
8d16b031ce Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-13 18:24:09 +05:30
mharindu
9c96718d40 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-13 18:07:51 +05:30
manoj
76c697453e Change platforms to lower case 2015-05-13 17:44:54 +05:30
Dulitha Wijewantha
64cabb1407 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-05-13 13:15:12 +05:30
mharindu
96237997a3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-13 11:47:45 +05:30
manoj
3f78271847 Refractor application bean 2015-05-13 11:39:11 +05:30
manoj
58a7964b34 Refractor Application bean 2015-05-13 11:31:03 +05:30
manoj
3df761bba6 Refractor Application bean 2015-05-13 11:30:40 +05:30
manoj
696ab3554c Refractor Application bean 2015-05-13 11:30:26 +05:30
manoj
6c452433de Correct copy right text 2015-05-12 21:02:26 +05:30
manoj
9cf2d33c59 Correct copy right text 2015-05-12 21:00:16 +05:30
mharindu
af18323f4e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-12 19:50:49 +05:30
Prabath Abeysekara
00e8076a9d Merge pull request #7 from milanperera/master
Fixed a bug in update Operation
2015-05-12 19:33:45 +05:30
Dulitha Wijewantha
5a3dcda993 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-05-12 18:19:15 +05:30
Dulitha Wijewantha
dcf0f5039d * Increased field length* Increased field length* Increased field length* Increased field length* Increased field length* Increased field length* Increased field length* Increased field length 2015-05-12 18:18:46 +05:30
geethkokila
2abfff5c36 Removing policy saving after the evaluation. 2015-05-12 18:12:50 +05:30
Dulitha Wijewantha
c277a5988a Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-05-12 16:30:19 +05:30
Dulitha Wijewantha
89a12a5660 * Added xml annotations to Policy and Profile
* Added methods to Policy Administrator Point
2015-05-12 16:26:20 +05:30
geethkokila
73b185e1e6 Removing feature implementation from the policy, adding criteria based policy 2015-05-12 16:20:18 +05:30
prabathabey
a4485af0c9 Completing JAX-RS authentication framework implementation 2015-05-11 15:53:20 +05:30
manoj
60f50a9242 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-11 12:32:37 +05:30
mharindu
6eb1af110c Merge https://github.com/wso2/carbon-device-mgt 2015-05-11 12:31:50 +05:30
manoj
3a7c4b77b8 APP Manager Integration 2015-05-11 12:31:12 +05:30
mharindu
7617f59e6b Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt 2015-05-11 12:30:08 +05:30
manoj
2ae89bef59 APP Manager Integration 2015-05-11 12:30:07 +05:30