Commit Graph

2529 Commits

Author SHA1 Message Date
ayyoob
28faf53802 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-19 11:07:00 +05:30
ayyoob
59e2a33e4a exposed device access authorisation as a service 2016-11-19 11:02:48 +05:30
ayyoob
20e7dd9e86 picked icon from features config 2016-11-17 23:33:04 +05:30
ayyoob
8a6af051dc Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-17 18:37:38 +05:30
ayyoob
a0c8aeb159 few changes after testing feature manager implementation 2016-11-17 18:35:40 +05:30
WSO2 Builder
19c1b3566d [maven-release-plugin] prepare for next development iteration 2016-11-16 12:18:48 +00:00
WSO2 Builder
cff6e242c8 [maven-release-plugin] prepare release v2.0.0 2016-11-16 12:16:25 +00:00
Ace
16d2a062da Adding android device-view changes 2016-11-16 15:44:28 +05:30
Ace
a0616cf9a2 Adding config changes 2016-11-16 15:08:43 +05:30
charitha
a6064d2561 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:13 +05:30
charitha
40c59c2f16 Fix issues in policy UI 2016-11-16 12:46:10 +05:30
charitha
589ba9c40b Add missing units 2016-11-15 15:59:40 +05:30
charitha
b8d8b35847 Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0 2016-11-15 13:54:59 +05:30
sameera910409
02eec1033e add group sharing role create functionality 2016-11-15 12:20:58 +05:30
sinthuja
2f59f1566c Changing the port to the default port of the analytics pack. 2016-11-09 16:12:58 +05:30
ayyoob
415fae8007 fixed update issue 2016-11-08 23:40:28 +05:30
ayyoob
0f66c90660 preload db queries 2016-11-07 01:14:22 +05:30
ayyoob
44ac6b13b5 changes in UI after refactoring 2016-11-07 00:51:08 +05:30
ayyoob
4292442aa5 refactored device type deployer 2016-11-06 17:46:02 +05:30
Ace
5eaca0b1b1 merging with upstream 2016-11-04 20:09:01 +05:30
Ace
2aa1c98d0b bringing common features to cdmf 2016-11-04 19:12:06 +05:30
charitha
bb60acd105 Fix device listing issue 2016-11-02 12:59:43 +05:30
ayyoob
202e0d5619 merged with origin 2016-11-02 09:44:49 +05:30
ayyoob
33bb9b5a14 merged with IoTS-1.0.0 branch 2016-11-02 06:51:28 +05:30
sinthuja
a5212213cf Changing the default wbsocket URL to DAS endpoint. 2016-11-01 19:55:22 +05:30
charitha
d1a6353195 Synced with changes in master 2016-11-01 15:41:51 +05:30
charitha
4a115e5d3f Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-01 15:01:53 +05:30
Charitha Goonetilleke
e1a1f710a0 Merge pull request #406 from sameeragunarathne/IoTS-1.0.0
fixed share groups and group analytics in device grouping
2016-11-01 15:01:38 +05:30
charitha
ac30e7eb3e Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
2016-11-01 14:47:21 +05:30
WSO2 Builder
9517a3d30f [maven-release-plugin] prepare for next development iteration 2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9 [maven-release-plugin] prepare release v1.2.6 2016-10-31 10:32:11 +00:00
kamidu
0867b3d075 updating the footer 2016-10-31 15:39:10 +05:30
Rasika Perera
fbe423b824 Using permissionsUtil.hasPermission for clientside permission check 2016-10-29 23:46:49 +05:30
Rasika Perera
b1b6b94570 Adding permissionsUtil 2016-10-29 23:13:52 +05:30
sameera910409
f8f7dd08cd fixed share groups and group analytics in device grouping 2016-10-28 14:07:50 +05:30
Harshan Liyanage
261e8c510c Fixed syntax issue in device.js file 2016-10-27 15:32:38 +05:30
Charitha Goonetilleke
353707c9c7 Merge pull request #404 from sameeragunarathne/IoTS-1.0.0
add group listing  and group device listing fixes
2016-10-26 17:55:03 +05:30
charitha
1bfba25c5e Remove user list and role list attributes from group object
Move group components to same devicemgt package levels
2016-10-26 17:51:38 +05:30
kamidu
12e609c737 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-26 17:40:05 +05:30
kamidu
0c70c87406 fix for EMM-1673 2016-10-26 17:39:47 +05:30
Kamidu Sachith Punchihewa
02d3adf51e Merge pull request #401 from madawas/modal-refactor
Refactoring pages to use new modal unit
2016-10-26 17:29:50 +05:30
Kamidu Sachith Punchihewa
33874f95b6 Merge pull request #399 from saadsahibjan/master
Fix incorrect spacing
2016-10-26 17:28:59 +05:30
Kamidu Sachith Punchihewa
9d90411189 Merge pull request #402 from madawas/EMM-1298
Fix for EMM-1298
2016-10-26 17:27:33 +05:30
Kamidu Sachith Punchihewa
a295c88dc0 Merge pull request #405 from Megala21/master
Refactoring code
2016-10-26 17:27:04 +05:30
sameera910409
204a0ed943 fixes for the comments of the PR#404 2016-10-26 15:14:53 +05:30
Megala
a088392b2f Adding css for required fields 2016-10-26 11:58:23 +05:30
sameera910409
fef7c07cb2 add device group deleting and updating fixes 2016-10-26 10:08:48 +05:30
Harshan Liyanage
72522ad759 Fixed SQL syntax issue 2016-10-26 09:49:59 +05:30
Harshan Liyanage
9bf5ca94fb Fixed SQL syntax issue 2016-10-25 18:50:38 +05:30
sameera910409
41f367abfa add group listing and group device listing fixes 2016-10-25 17:48:16 +05:30