Commit Graph

1141 Commits

Author SHA1 Message Date
geethkokila
4a4349382a Adding the user core changes 2015-05-19 20:45:12 +05:30
Geeth
782b4ac27d Merge pull request #10 from milanperera/master
Fixed issue of get device info function
2015-05-19 19:12:36 +05:30
mharindu
048c175fda Fixed issue of get device info function 2015-05-19 19:08:24 +05:30
Dilshan Edirisuriya
fed104e297 Merge pull request #9 from milanperera/master
Refactored to support device info function
2015-05-19 18:23:04 +05:30
Milan Perera
c068ac88de Update DeviceManagementServiceImpl.java 2015-05-19 17:30:20 +05:30
Milan Perera
7d3bf84d9f Update DeviceManagementServiceProviderImpl.java 2015-05-19 17:26:24 +05:30
Milan Perera
8f00128ab1 Update DeviceManager.java 2015-05-19 17:22:36 +05:30
mharindu
d0819adf6d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-19 17:13:57 +05:30
mharindu
40feabb9df Fixed bug in device disenrollment 2015-05-19 17:13:36 +05:30
geethkokila
1d180c1a1e Adding the policy related new tables 2015-05-19 16:00:49 +05:30
mharindu
847eb073b9 Refactored device info 2015-05-19 15:43:15 +05:30
mharindu
ead4d3be69 Refactored device info 2015-05-19 11:19:41 +05:30
manoj
f25dc65b54 Refractor device mgt user core service 2015-05-18 19:30:16 +05:30
manoj
a4e16b59d8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 19:28:17 +05:30
manoj
c918622cc6 Refractor Email service and change user server feature name
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
2015-05-18 19:27:41 +05:30
prabathabey
1534099f0a Removing staging repository config from the parent pom 2015-05-18 16:57:42 +05:30
mharindu
6b84d65e29 Refactored updateDeviceInfo function 2015-05-18 15:14:14 +05:30
manoj
63b6a5b206 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 15:03:02 +05:30
manoj
6c80688af2 Remove app list from device info update service 2015-05-18 15:02:18 +05:30
mharindu
0f3a981367 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 11:14:11 +05:30
geethkokila
ebc2e669cc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 07:38:53 +05:30
geethkokila
10a585ea6a Moing interfacs to common bundle and fixing test cases 2015-05-18 07:38:35 +05:30
manoj
2d5d0bb4f8 Install APP service 2015-05-18 02:52:38 +05:30
manoj
94fbb56f06 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 02:31:15 +05:30
manoj
3589804ede Installation APP service 2015-05-18 02:31:10 +05:30
geethkokila
be5f161eb5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-17 23:18:31 +05:30
geethkokila
38e09d49bb Fixing bugs and fixing the criteria based policies 2015-05-17 23:18:10 +05:30
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