Commit Graph

2208 Commits

Author SHA1 Message Date
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
Rasika Perera
64a262d3e4 Fixing 404 on groups listing 2016-05-03 15:34:50 +05:30
Rasika Perera
4eb588ac60 Group Constants moved to common 2016-05-03 14:37:34 +05:30
geethkokila
d32e822055 Fixing the shutdown errors 2016-05-03 14:10:30 +05:30
ayyoob
99a424b58b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext 2016-05-03 09:28:16 +05:30
Rasika Perera
38cdd94f3c Adding group permission checking for Device Access Authorizations 2016-05-03 00:33:19 +05:30
dilanua
af973dacc6 Adding temporary development code bits for dashboard analytics feature 2016-05-02 18:45:23 +05:30
Rasika Perera
07c0aa1045 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-02 18:12:03 +05:30
dilanua
d9015b92a0 Adding temporary development code bits for dashboard analytics feature 2016-05-02 15:27:32 +05:30
dilanua
c828a5264b Adding temporary development code bits for dashboard analytics feature 2016-05-02 15:15:45 +05:30
geethkokila
a0d260e6a3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-02 14:36:52 +05:30
geethkokila
e2d67fc92c Adding the changes for device search 2016-05-02 14:36:14 +05:30
Kasun Delgolla
d1def26602 Committing group listing back end pagination UI 2016-05-02 12:56:22 +05:30
geethkokila
e4b400a5e7 Disabling device analytics publishing by default 2016-05-02 10:45:10 +05:30
dilanua
f2f153a2b4 Adding temporary development code bits for dashboard analytics feature 2016-05-01 09:51:09 +05:30
geethkokila
f200f37c80 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-30 19:37:38 +05:30
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