Commit Graph

176 Commits

Author SHA1 Message Date
Joseph Fonseka
a5640f48b5 Changed auth type on API resources as configured in web.xml 2017-01-06 19:41:16 +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
geethkokila
3795a7e30f Removing the hardcoded apis 2017-01-06 17:09:46 +05:30
geethkokila
44c7383b15 Adding support to send ios request the synapse gateway 2017-01-06 17:04:00 +05:30
Milan Perera
228848075c Fixed conflicts and merged 2017-01-06 16:46:42 +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
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
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
inoshperera
11d2ecac10 removing basic auth headers from API definitions. 2017-01-06 11:34:48 +05:30
Milan Perera
e0ee2fc1e5 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-06 09:19:12 +05:30
ayyoob
b20a2e0997 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-05 17:51:34 +05:30
ayyoob
c69513e0f5 removed tenant domain from the web.xml 2017-01-05 17:51:23 +05:30
Milan Perera
f3409adc21 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-05 12:41:22 +05:30
Milan Perera
7b8a7c0b52 Merge pull request #1 from GPrathap/release-2.0.x
removed setting APIs secured as default.
2017-01-05 11:58:52 +05:30
Maninda
0fb5a577b8 Fixed some issues found in FindBugs security analysis. 2017-01-05 11:47:09 +05:30
inoshperera
c4a2ba0cea adding http api publisher for Android agent to work out of the box 2017-01-04 16:54:46 +05:30
geethkokila
65cb12b5ac Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2017-01-03 14:13:49 +05:30
Milan Perera
02d75b757c Fixed conflicts and merged 2017-01-03 10:37:46 +05:30
GPrathap
f508bcfd0e corrected method name 2017-01-01 22:03:50 +05:30
GPrathap
649879f998 removed setting APIs secured as default.
Because if secured is enabled, it is to be needed to provided parameters which are related to basic oauth, when this is false, jwt token is being used.
2017-01-01 21:13:53 +05:30
WSO2 Builder
6aea6195e9 [maven-release-plugin] prepare for next development iteration 2016-12-23 19:20:14 +00:00
WSO2 Builder
3db5b289ac [maven-release-plugin] prepare release v2.0.5 2016-12-23 19:18:26 +00:00
WSO2 Builder
ed47094964 [maven-release-plugin] prepare for next development iteration 2016-12-23 07:05:25 +00:00
WSO2 Builder
8d409a7248 [maven-release-plugin] prepare release v2.0.4 2016-12-23 07:00:40 +00:00
Ace
1d2a5dc9ef Updating identity/auth-saml dependencies to latest 2016-12-22 10:58:59 +05:30
geethkokila
83b9fd46cd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-20 16:59:03 +05:30
Rasika Perera
a633547d19 IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext 2016-12-20 13:03:19 +05:30
geethkokila
8ca28fa1fd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-19 13:47:27 +05:30
Rasika Perera
1465c56822 Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
This reverts commit f9b6939cb7.
2016-12-19 12:39:56 +05:30
Ace
47d8baccf7 upgrading to latest version of identity 2016-12-19 11:38:03 +05:30
geethkokila
8e2432c47b Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-19 10:04:18 +05:30
geethkokila
200740eca6 Partial commit for the git update 2016-12-19 09:58:19 +05:30
WSO2 Builder
f9b6939cb7 [WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4 2016-12-19 09:06:04 +05:30
Rasika Perera
42930fe8c4 Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
This reverts commit 78b9052c37.
2016-12-19 08:45:19 +05:30
WSO2 Builder
78b9052c37 [WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4 2016-12-16 17:03:06 +05:30
Megala
d4e9c43ff1 Fixing race condition in creating and subscribing application in api-manager side 2016-12-16 14:13:40 +05:30
amalhub
7e90fde461 IOTS-292: Adding new filter configs 2016-12-14 15:23:59 +05:30
amalhub
0bd298e6d7 IOTS-292: Code refactoring 2016-12-14 15:23:48 +05:30
amalhub
871970002a IOTS-292: Adding android cert verification for gateway handler 2016-12-14 15:23:36 +05:30
amalhub
610163d705 IOTS-292: Adding IOS synapse config for gatway change 2016-12-14 15:23:24 +05:30
amalhub
d00817268e IOTS-292: Adding the api-mgt handler for gateway change 2016-12-14 15:23:04 +05:30
Milan Perera
bcbf61a886 Fixed conflicts 2016-12-14 08:50:17 +05:30
Milan Perera
36ee55f493 Implemented permission-scope mapping for IoTs 2016-12-14 08:45:42 +05:30
Milan Perera
dd353e1bfb Commiting permission-scope mapping improvements 2016-12-08 20:30:49 +05:30
WSO2 Builder
a59edee410 [maven-release-plugin] prepare for next development iteration 2016-12-08 14:39:00 +00:00
WSO2 Builder
8f9b21b41b [maven-release-plugin] prepare release v2.0.3 2016-12-08 14:37:11 +00:00