Commit Graph

959 Commits

Author SHA1 Message Date
manoj
7364345a0f Refractor API publish end points 2015-05-21 19:44:23 +05:30
prabathabey
abf1e3d2ea Fixing build failures 2015-05-21 19:16:40 +05:30
prabathabey
7942fb4cbb Fixing issues surfaced when a proper authentication scheme is not defined for certain resources 2015-05-21 18:53:02 +05:30
mharindu
6e11c8e112 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 17:54:30 +05:30
geethkokila
a9d3d15438 Adding pofile operations 2015-05-21 17:46:57 +05:30
mharindu
1904264c0d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 17:39:56 +05:30
geethkokila
0638ec2357 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 17:27:31 +05:30
geethkokila
548ce6873f Changing the get effective policy method to store the policy as a operation, and adding ownership type to the policy database 2015-05-21 17:27:17 +05:30
manoj
a7eb74cb82 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 17:10:42 +05:30
manoj
880c08885a Add uninstall and install app end points to api publisher 2015-05-21 17:10:05 +05:30
mharindu
30edad0529 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 17:08:15 +05:30
Dulitha Wijewantha
341abb47ab Fixes to the timestamp and filters 2015-05-21 16:48:49 +05:30
prabathabey
c8affcf836 Improving the way webapp requests are authenticated 2015-05-21 15:19:33 +05:30
mharindu
a2c3813588 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Conflicts:
	features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
2015-05-20 16:09:27 +05:30
manoj
1bbaac168b change devices API 2015-05-20 14:34:11 +05:30
mharindu
c6dce2f50f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-20 14:25:25 +05:30
mharindu
3d69503e96 Merged 2015-05-20 14:25:17 +05:30
manoj
1d902cc724 correct end points by adding context 2015-05-20 14:14:52 +05:30
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