Commit Graph

1974 Commits

Author SHA1 Message Date
dilanua
adec59e934 Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature 2016-05-10 15:26:20 +05:30
Prabath Abeysekara
400f2bb7b4 Merge pull request #236 from dilee/master
Fixed issues in Oracle DB script
2016-05-10 15:01:51 +05:30
Dileesha Rajapakse
cb5736854a Fixed issues in Oracle DB script 2016-05-10 14:58:02 +05:30
dilanua
2a9e2a47e8 Adding inter-mediate code improvements to dashboard analytics feature 2016-05-10 07:26:49 +05:30
Geeth
c1edc9e444 Merge pull request #235 from dilee/master
Fixed errors in PostgreSQL script
2016-05-09 14:40:03 +05:30
Dileesha Rajapakse
de08e96646 Fixed errors in PostgreSQL script 2016-05-09 14:35:45 +05:30
dilanua
13c5fe3d1b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-09 12:33:34 +05:30
dilanua
0ab4035b37 Adding H2, MySQL Support for dashboard analytics feature 2016-05-09 12:33:11 +05:30
Kasun Delgolla
4cb7b86f4c Fixing SQL errors 2016-05-09 12:20:43 +05:30
hasuniea
ddc87d6726 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-09 11:12:57 +05:30
ayyoob
c165156dcd remove imports 2016-05-09 01:05:08 +05:30
dilanua
a23e578537 Adding inter-mediate development code bits for dashboard analytics feature 2016-05-08 17:43:05 +05:30
dilanua
17e958d838 Adding inter-mediate development code bits for dashboard analytics feature 2016-05-08 17:42:01 +05:30
ayyoob
0b6acdc929 Added file seperator 2016-05-08 02:44:24 +05:30
hasuniea
245e90e6f6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-06 12:54:05 +05:30
dilanua
7b43d28298 Adding temporary development code bits for dashboard analytics feature 2016-05-06 12:54:04 +05:30
dilanua
d568c6e8bd Adding temporary development code bits for dashboard analytics feature 2016-05-05 16:12:15 +05:30
dilanua
945e188917 Adding temporary development code bits for dashboard analytics feature 2016-05-05 12:03:11 +05:30
dilanua
82ffcb012b Adding temporary development code bits for dashboard analytics feature 2016-05-05 11:51:31 +05:30
dilanua
9786908b35 Adding temporary development code bits for dashboard analytics feature 2016-05-05 11:49:09 +05:30
hasuniea
686774068a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-05 10:26:01 +05:30
sumedharubasinghe
84ebba0bd7 Merge pull request #234 from rasika90/master
Fixing permission issue and adding group permission validation for operations
2016-05-04 04:17:49 +05:30
Rasika Perera
18edc21a04 Adding group permissions validation for operations 2016-05-04 04:14:09 +05:30
Rasika Perera
5c680b3f65 Fixing issue on group permission validating 2016-05-04 04:13:39 +05:30
Rasika Perera
4cab2b5504 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-04 03:15:27 +05:30
sumedharubasinghe
d7064c9230 Merge pull request #233 from ayyoob/das-ext
removed unused code
2016-05-04 03:14:35 +05:30
sumedharubasinghe
1e5f4ef283 Merge pull request #232 from charithag/master
Fix grouped device listing
2016-05-04 03:03:57 +05:30
Rasika Perera
3477961311 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-04 02:53:35 +05:30
Rasika Perera
b8f938c191 Merge branch 'master' of https://github.com/charithag/carbon-device-mgt 2016-05-04 02:50:54 +05:30
Charitha Goonetilleke
ca62c2ef73 Fix grouped device listing 2016-05-04 02:47:45 +05:30
Milan Perera
f23ad06d72 Merge pull request #231 from charithag/master
Fix parameter mismatch
2016-05-04 01:51:38 +05:30
Rasika Perera
12868d587b Merge branch 'master' of https://github.com/charithag/carbon-device-mgt 2016-05-04 01:50:48 +05:30
Charitha Goonetilleke
e01b62086f Fix parameter mismatch 2016-05-04 01:47:50 +05:30
ayyoob
442f8c38fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-05-04 01:20:18 +05:30
ayyoob
5f302fce63 removed unused code and resolved host issues 2016-05-04 01:19:56 +05:30
sumedharubasinghe
5efb786e73 Merge pull request #230 from charithag/master
Add authorization check for shared devices in groups
2016-05-04 00:13:08 +05:30
Charitha Goonetilleke
0eb1509109 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-04 00:11:28 +05:30
Charitha Goonetilleke
8c62d9d64c Add authorization check for shared devices in groups 2016-05-04 00:07:48 +05:30
sumedharubasinghe
956cc23978 Merge pull request #229 from charithag/master
Fix and improve group UI functionality
2016-05-03 23:32:25 +05:30
Charitha Goonetilleke
92784120bd Add group sharing UI functionality 2016-05-03 23:28:26 +05:30
Charitha Goonetilleke
d15e52491a Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt 2016-05-03 19:57:36 +05:30
Rasika Perera
33eed1f6cd Adding permissions for roles updating 2016-05-03 19:52:52 +05:30
Rasika Perera
b6c33a0aec Fixing group roles listing 2016-05-03 19:49:09 +05:30
Charitha Goonetilleke
b705352fb7 Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt 2016-05-03 19:32:05 +05:30
Charitha Goonetilleke
f74a5b7a59 Merge remote-tracking branch 'rasika/master' 2016-05-03 19:31:31 +05:30
Rasika Perera
938eda7c46 Adding group permissions checking 2016-05-03 19:29:12 +05:30
Rasika Perera
9cb24d8cec Adding enum to hold default role to default permissions mapping 2016-05-03 19:18:58 +05:30
Rasika Perera
142ab10eea Code refactoring 2016-05-03 19:18:07 +05:30
hasuniea
5f8a41eb12 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-03 16:02:15 +05:30
ayyoob
39267e2d36 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-05-03 15:43:24 +05:30