Commit Graph

494 Commits

Author SHA1 Message Date
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
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
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
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
acc159d132 * Refactored addPolicy 2015-05-13 22:04:15 +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
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
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
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