Commit Graph

3542 Commits

Author SHA1 Message Date
Rasika Perera
42ff976a41 Merge pull request #527 from ayyoob/release-2.0.x
moved adapter configs as global configurations and few changes after testing
2017-01-09 07:21:02 +05:30
ayyoob
c718d723c0 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-08 01:20:28 +05:30
ayyoob
ea31637223 added scr reference to datasource for deployer and few fixes after the changes in the plugin 2017-01-08 01:19:03 +05:30
Rasika Perera
dde094ecf8 Merge pull request #526 from wso2/release-2.0.6
Release 2.0.6
2017-01-07 22:33:13 +05:30
WSO2 Builder
5411d93103 [maven-release-plugin] prepare for next development iteration 2017-01-07 07:48:36 +00:00
WSO2 Builder
3ea83b925a [maven-release-plugin] prepare release v2.0.6 2017-01-07 07:33:45 +00:00
Rasika Perera
1745dad5cc Merge pull request #525 from rasika/release-2.0.x
Fixing maven-javadoc-plugin issue
2017-01-07 11:36:23 +05:30
Rasika Perera
04951bb6ca Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-07 11:31:23 +05:30
Rasika Perera
5d5f76ca21 Merge pull request #524 from geethkokila/release-2.0.x
Removing two unnecessary classes from the project and adding java doc…
2017-01-07 11:24:35 +05:30
geethkokila
7059ad1243 Changing the package name 2017-01-07 11:21:50 +05:30
Rasika Perera
1f5de41ffa Fixing maven-javadoc-plugin issue [org.wso2.carbon.apimgt.handlers/] should be [org/wso2/carbon/apimgt/handlers/] 2017-01-07 11:07:38 +05:30
geethkokila
2881079b27 Removing two unnecessary classes from the project and adding java documentation to class 2017-01-07 11:06:48 +05:30
Rasika Perera
08ab946e88 Added doc comments 2017-01-07 10:28:25 +05:30
Rasika Perera
a16052431c Corrected a typo on [APIMCertificateMGTException] 2017-01-07 10:26:35 +05:30
Rasika Perera
c2490347b6 Corrected a typo 2017-01-07 10:25:32 +05:30
Rasika Perera
f123f3e61e Merge pull request #523 from rasika/release-2.0.x
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
2017-01-07 08:05:59 +05:30
Rasika Perera
ebdba19041 IOTS-120 : Fixing firstName and lastName cannot contain whitespaces 2017-01-07 08:04:48 +05:30
Rasika Perera
b610c7605f Merge pull request #522 from rasika/release-2.0.x
IOTS-171 : Register form validation message corrected
2017-01-06 21:46:10 +05:30
Rasika Perera
b4ed33bcd0 IOTS-171 : Register form validation message corrected 2017-01-06 21:44:02 +05:30
Rasika Perera
4de481e501 Merge pull request #521 from rasika/release-2.0.x
UI improvement for Datatables
2017-01-06 20:29:47 +05:30
Rasika Perera
d826ba81d0 UI improvement for Datatables 2017-01-06 20:27:24 +05:30
Joseph Fonseka
a5640f48b5 Changed auth type on API resources as configured in web.xml 2017-01-06 19:41:16 +05:30
Rasika Perera
78c413c1ba Merge pull request #519 from hasuniea/release-2.0.x
getting SkippedEndpoint path from URL
2017-01-06 19:37:50 +05:30
Rasika Perera
dfcf72cae0 Merge pull request #518 from geethkokila/mutual_ssl_feature
Adding gateway support for IOS device type
2017-01-06 19:34:36 +05:30
Rasika Perera
8397b688e9 Merge branch 'release-2.0.x' into mutual_ssl_feature 2017-01-06 19:34:25 +05:30
Rasika Perera
bc93d48927 Merge pull request #520 from madhawap/release-2.0.x
fix to WebappPublisherConfig
2017-01-06 19:23:29 +05:30
madhawap
d22de197a1 fix to WebappPublisherConfig 2017-01-06 19:07:49 +05:30
Rasika Perera
b4a649bdfa Merge pull request #516 from milanperera/release-2.0.x
Improved permission-scope mapping capabilities
2017-01-06 19:02:12 +05:30
Hasunie
45a543d3ed getting SkippedEndpoint path from URL 2017-01-06 18:42:24 +05:30
geethkokila
3795a7e30f Removing the hardcoded apis 2017-01-06 17:09:46 +05:30
geethkokila
739a8bdb69 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2017-01-06 17:04:18 +05:30
geethkokila
44c7383b15 Adding support to send ios request the synapse gateway 2017-01-06 17:04:00 +05:30
Rasika Perera
1c1da1f5cd Merge pull request #517 from rasika/release-2.0.x
Fixing CDMF version in footer
2017-01-06 16:57:16 +05:30
Rasika Perera
ab28d596e7 Fixing CDMF version in footer 2017-01-06 16:56:20 +05:30
Milan Perera
d51ee711fc Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-06 16:46:56 +05:30
Rasika Perera
79e98a592b Merge pull request #515 from rasika/release-2.0.x
Replaced [EMM] with [IoT Server]
2017-01-06 16:46:44 +05:30
Milan Perera
228848075c Fixed conflicts and merged 2017-01-06 16:46:42 +05:30
Rasika Perera
e501724c3c Replaced [EMM] with [IoT Server] 2017-01-06 16:26:59 +05:30
Rasika Perera
7af63522f2 Fixed quick startup guide doc url 2017-01-06 16:14:24 +05:30
Milan Perera
42a587904f Fixed issues in permission-scope mapping 2017-01-06 16:10:52 +05:30
geethkokila
9200adebed Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2017-01-06 15:17:44 +05:30
Rasika Perera
3d88eb9692 Merge pull request #514 from charithag/release-2.0.x-Fix-IOTS-103
Fixed https://wso2.org/jira/browse/IOTS-103
2017-01-06 15:04:05 +05:30
charitha
d65557e03e Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-06 14:55:41 +05:30
charitha
e6e39532b7 Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements 2017-01-06 14:55:26 +05:30
Rasika Perera
3472090d1b Merge pull request #513 from ruwany/wip
Fixing device listing issue
2017-01-06 14:16:47 +05:30
Rasika Perera
8706636b51 Merge pull request #511 from ayyoob/release-2.0.x
Made Policy Monitoring for device type to be multitenance & Added default values for push notification dynamic configuration
2017-01-06 14:15:21 +05:30
Ace
6a69d8cf4b merging with upstream 2017-01-06 13:27:33 +05:30
Ace
b83479b214 Fixing device listing issue 2017-01-06 13:20:56 +05:30
Rasika Perera
f5350122ce Merge pull request #512 from inoshperera/release-2.0.x
Release 2.0.x
2017-01-06 12:03:11 +05:30
inoshperera
e6a70b2394 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-06 11:35:34 +05:30