Commit Graph

172 Commits

Author SHA1 Message Date
Rasika Perera
8397b688e9 Merge branch 'release-2.0.x' into mutual_ssl_feature 2017-01-06 19:34:25 +05:30
geethkokila
44c7383b15 Adding support to send ios request the synapse gateway 2017-01-06 17:04:00 +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
Milan Perera
637c014866 Refactored scope strings 2017-01-06 10:15:21 +05:30
Milan Perera
157ef998a6 Resolved conflicts and merged 2017-01-06 09:22:49 +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
GPrathap
5d1435c7bc renamed permission string 2017-01-05 16:47:53 +05:30
GPrathap
0bd7b90e9a added scope annotation 2017-01-05 12:26:07 +05:30
Maninda
0fb5a577b8 Fixed some issues found in FindBugs security analysis. 2017-01-05 11:47:09 +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
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
geethkokila
1b4857b7fd Fixing conflicts 2016-12-20 11:19:58 +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
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
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
amalhub
fe2b6b5993 IOTS-292: Adding verification services needed for gataway handler 2016-12-14 15:20:26 +05:30
Milan Perera
bcbf61a886 Fixed conflicts 2016-12-14 08:50:17 +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
geethkokila
b9d104e9b2 Fixing the certificate mgt issue 2016-12-08 14:38:42 +05:30
geethkokila
d911281ad1 Merging master branch with release-2.0.x 2016-12-08 12:34:50 +05:30
charitha
161fe62a08 Fix for https://wso2.org/jira/browse/IOTS-323 2016-12-06 18:59:43 +05:30
WSO2 Builder
228b24ca79 [maven-release-plugin] prepare for next development iteration 2016-12-01 12:14:01 +00:00
WSO2 Builder
5dbb258f55 [maven-release-plugin] prepare release v2.0.2 2016-12-01 12:10:10 +00:00
WSO2 Builder
8431b30ddc [maven-release-plugin] prepare for next development iteration 2016-11-25 08:06:30 +00:00
WSO2 Builder
ae2e283f14 [maven-release-plugin] prepare release v2.0.1 2016-11-25 07:43:34 +00:00
GPrathap
6efc5bc1ed removed @API and @Permission annotations 2016-11-20 19:10:45 +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
a6064d2561 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:13 +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
Madawa Soysa
774eaadb71 EMM-1298: Extracting serial number from the certificate itself when adding a certificate 2016-10-25 11:43:58 +05:30
WSO2 Builder
27a2c9b979 [maven-release-plugin] prepare for next development iteration 2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c [maven-release-plugin] prepare release v1.2.5 2016-10-18 12:09:16 +00:00
Kamidu Sachith Punchihewa
7666bbfd05 Merge pull request #395 from Megala21/master
Fixing EMM-1752 and EMM-1755
2016-10-18 16:58:24 +05:30
WSO2 Builder
6a55e1be83 [maven-release-plugin] prepare for next development iteration 2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61 [maven-release-plugin] prepare release v1.2.4 2016-10-17 14:13:25 +00:00
Megala
4ec6883ec8 Merge remote-tracking branch 'upstream/master' 2016-10-17 14:51:20 +05:30
Shavindri
28cb653b06 Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file. 2016-10-17 14:21:30 +05:30
Megala
e55b3a6d5f Fixes related to having special characters in role name 2016-10-14 16:03:14 +05:30
Shavindri
c64581dc59 Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex 2016-10-13 13:45:02 +05:30