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 |
|
Ruwan
|
906d870309
|
Merge pull request #423 from ayyoob/IoTS-1.0.0
few changes in feature manager implementation for deployer
|
2016-11-18 16:52:14 +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 |
|
sinthuja
|
593d9cf985
|
Making autoVersionSubmodules enabled to avaoid the versions to be given seperately for sub modules.
|
2016-11-17 10:42:56 +05:30 |
|
Charitha Goonetilleke
|
d36de3de98
|
Merge pull request #421 from wso2/release-2.0.0
Release 2.0.1
|
2016-11-16 19:47:21 +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 |
|
charitha
|
d5f82820c5
|
Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0
|
2016-11-16 16:32:43 +05:30 |
|
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 |
|
sinthuja
|
a8b5c92698
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
|
2016-11-16 14:50:39 +05:30 |
|
sinthuja
|
bb5ebd7b4d
|
changing the expected kernel version to be 4.4.9 or higher as it's needed to be installed in DAS.
|
2016-11-16 14:48:00 +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 |
|
Ruwan
|
24586d0f2a
|
Merge pull request #413 from ayyoob/IoTS-1.0.0
refactored device type deployer and few changes in UI after testing the operation flow
|
2016-11-07 06:04:00 +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 |
|
Ayyoob Hamza
|
f7729b51ae
|
Merge pull request #412 from ruwany/deployer
Bringing common features to cdmf level
|
2016-11-04 20:19:40 +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 |
|
sinthuja
|
bc84ff85ea
|
Changing the default port of publishing to 7612.
|
2016-11-01 19:46:57 +05:30 |
|
sinthuja
|
8767dd9b44
|
Adding missing dependency jersey core with device mgt.
|
2016-11-01 18:32:27 +05:30 |
|
Charitha Goonetilleke
|
90a5e38787
|
Merge pull request #409 from charithag/IoTS-1.0.0
Synced with master
|
2016-11-01 15:44:55 +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 |
|
Kamidu Sachith Punchihewa
|
23c65558db
|
Merge pull request #408 from wso2/release-1.2.6
Release 1.2.6
|
2016-11-01 10:50:29 +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 |
|
kamidu
|
9aaf5fc683
|
upgrading carbon version
|
2016-10-31 13:15:20 +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 |
|