Commit Graph

1731 Commits

Author SHA1 Message Date
ayyoob
7c7b300c79 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-04-29 17:04:34 +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
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
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
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
Ruwan
4c50d4842d Merge pull request #223 from charithag/master
Add device modify and remove options
2016-04-26 20:58:31 +05:30
charithag
f6281c8ef0 Add jax-rs endpoints to modify and remove devices.
Update clientside js to work with secured apis
2016-04-26 20:50:39 +05:30
Charitha Goonetilleke
15a6e4b63b Fix formatting issues 2016-04-26 19:54:19 +05:30
Milan Perera
7add57e9c2 Merge pull request #222 from charithag/master
Add tenant aware dynamic units routing
2016-04-26 19:46:00 +05:30
charithag
d8a9b642ff Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-26 18:57:25 +05:30
charithag
42d11b9d78 Add tenant aware dynamic units routing 2016-04-26 18:56:41 +05:30
prabathabey
52b81dd3eb Fixing compilation failures 2016-04-26 17:38:16 +05:30
prabathabey
f5f177a858 Wrapping all device provisioning related info in ProvisioningConfig 2016-04-26 17:16:48 +05:30
prabathabey
779ed5eac2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-26 16:43:45 +05:30
prabathabey
9068a3d893 Fixing compilation failures caused due to API changes 2016-04-26 16:40:30 +05:30
Prabath Abeysekara
6ddd5db8cc Merge pull request #221 from ayyoob/das-ext
Added device type specific graph loader
2016-04-26 16:35:43 +05:30
ayyoob
2aa5257cda Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-04-26 16:22:16 +05:30
prabathabey
2133762792 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-26 15:59:34 +05:30
prabathabey
95d3b97c5f Code cleanup 2016-04-26 15:59:22 +05:30
ayyoob
e0f47cba19 Added device type specific graph loader 2016-04-26 15:58:21 +05:30
Ruwan
928ef622d7 Merge pull request #220 from charithag/master
Add missing UI functionalities
2016-04-26 15:55:39 +05:30
charithag
6d5635465e Add missing UI functionalities 2016-04-26 15:49:44 +05:30