Commit Graph

2209 Commits

Author SHA1 Message Date
geethkokila
f2128762f0 Adding the changes for removing repeated operations from pending operations, if same operation is added twice, are making them repeated, Device will not recieve them 2016-04-30 19:37:23 +05:30
inosh-perera
486190f182 adding more error logs for client certificate not present scenario 2016-04-30 14:44:22 +05:30
geethkokila
c0dd2c423e Fixing the build failure on java 8 2016-04-29 22:44:01 +05:30
geethkokila
3396a5066d Adding changes for the updated time of device info and device location 2016-04-29 22:30:07 +05:30
hasuniea
59f1d04c44 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-29 19:30:33 +05:30
geethkokila
d4f2a95972 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-29 17:35:13 +05:30
Kasun Delgolla
71685c3f92 Merge pull request #227 from charithag/master
Add capability to assign device in to a group and bug fixes
2016-04-29 17:04:38 +05:30
ayyoob
7c7b300c79 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-04-29 17:04:34 +05:30
charithag
fd531555a3 Fix bugs 2016-04-29 13:34:46 +05:30
charithag
a2cb6937c1 Fix device listing page title 2016-04-29 12:46:53 +05:30
charithag
68361f01ed Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-29 12:30:00 +05:30
geethkokila
aa3e7a9eda Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-29 11:03:18 +05:30
dilanua
b8972c9019 Adding temporary development code bits for dashboard analytics feature 2016-04-29 05:40:34 +05:30
ayyoob
04536a1446 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-04-28 22:17:37 +05:30
geethkokila
3dd830c7d0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-28 19:53:56 +05:30
geethkokila
6f9851413e Adding the changes for operation activity id 2016-04-28 19:53:42 +05:30
dilanua
330e1a1e19 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-28 18:11:44 +05:30
dilanua
46117b4e84 Adding temporary development code bits for dashboard analytics feature 2016-04-28 18:10:52 +05:30
hasuniea
441d2e171f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-28 17:50:30 +05:30
mharindu
548f71ca2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-28 16:43:24 +05:30
mharindu
c824e63f1e Refactored and fixed findbug issues in OAuth extension 2016-04-28 16:43:13 +05:30
mharindu
04fa0f4874 Implemented new password grant handler 2016-04-28 14:50:52 +05:30
mharindu
6db9b21623 Code cleanup in webapp publisher 2016-04-28 14:49:34 +05:30
dilanua
49513ba79b Adding temporary development code bits for dashboard analytics feature 2016-04-28 14:26:22 +05:30
dilanua
b9be51d50d Adding temporary development code bits for dashboard analytics feature 2016-04-28 12:18:43 +05:30
mharindu
6f8bb64e1c Fixed merge conflicts 2016-04-28 11:59:03 +05:30
mharindu
ffc7542d4d Modified authorization to support API gateway 2016-04-28 11:36:34 +05:30
hasuniea
61e7324f41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-28 10:49:48 +05:30
charithag
25ea00f26f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-28 08:02:55 +05:30
charithag
b1683c1ccb Add capability to assign device in to a group and bug fixes 2016-04-28 08:01:46 +05:30
dilanua
053d14b317 Adding temporary development code bits for dashboard analytics feature 2016-04-28 06:28:13 +05:30
ayyoob
76d7274220 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-04-28 01:50:28 +05:30
Ruwan
1486e4ab8c Merge pull request #226 from ruwany/master
refactoring and bug fixes
2016-04-27 20:45:21 +05:30
Ace
a06327b731 refactoring and bug fixes 2016-04-27 20:43:13 +05:30
geethkokila
5a77e08fd5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 17:57:05 +05:30
ayyoob
6d648eccc6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-04-27 17:18:03 +05:30
inoshperera
f4d223cac8 Merge pull request #225 from charithag/master
Update new analytics components
2016-04-27 16:38:20 +05:30
charithag
6e84f0a5a3 Fix font issue 2016-04-27 16:37:05 +05:30
charithag
2a006684cc Fix formatting 2016-04-27 16:07:14 +05:30
charithag
fb52c5845d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 15:41:41 +05:30
charithag
bcbde92143 Update new analytics components. 2016-04-27 15:40:49 +05:30
dilanua
36e5357cfd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 15:21:30 +05:30
Ruwan
8683227257 Merge pull request #224 from ruwany/master
Cleaning up code
2016-04-27 15:05:42 +05:30
Ace
985d07cbc7 Cleaning up code 2016-04-27 14:53:12 +05:30
dilanua
2a55c50ad1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 13:58:58 +05:30
dilanua
2b62eac4f5 Adding temporary development code bits for dashboard analytics feature 2016-04-27 13:58:53 +05:30
charithag
1e709bc394 Update new analytics components and remove obsoletes. 2016-04-27 13:43:37 +05:30
geethkokila
4029c86da4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 10:26:51 +05:30
geethkokila
2fb42518b6 Adding the changes for the device group with policy. 2016-04-27 10:26:47 +05:30
ayyoob
502a05f623 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-04-27 00:48:38 +05:30