Commit Graph

4077 Commits

Author SHA1 Message Date
ayyoob
0c2de7965f Added device scope validation 2016-06-20 02:33:17 +05:30
Ruwan
e8cfb1ea45 Merge pull request #300 from ayyoob/transport
added support to load device type configuration in  base ui
2016-06-17 18:09:06 +05:30
inoshperera
a9f8e8c84d Merge pull request #299 from madhawap/rest-api-improvements
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
2016-06-17 17:45:29 +05:30
madhawap
ea56d4ced3 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-17 17:37:23 +05:30
madhawap
015ca0575e added 'updatedTimeStamp' to the Activity get response 2016-06-17 17:36:50 +05:30
ayyoob
1373e995fb added support to load device type configuration in base ui 2016-06-17 17:21:39 +05:30
dilanua
1513c6cf8a Adding isActive property to PolicyWrapper 2016-06-17 12:05:35 +05:30
madhawap
7cdb7dcee1 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-17 10:14:21 +05:30
dilanua
0eed97e84c Adding API for getting device types 2016-06-15 14:21:31 +05:30
madhawap
b3f95d19c1 add changes to 'since' QueryParam and 'if-modified-since' HeaderParam 2016-06-15 12:05:44 +05:30
madhawap
a827e6289a Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-15 10:33:53 +05:30
inoshperera
96eb71314b Merge pull request #297 from madhawap/rest-api-improvements
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
2016-06-14 18:49:01 +05:30
madhawap
d7b860b955 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-14 18:09:16 +05:30
madhawap
59119f9167 add changes to 'since' QueryParam and 'if-modified-since' HeaderParam 2016-06-14 18:08:43 +05:30
Ruwan
f6a126b560 Merge pull request #298 from ayyoob/transport
changed the UI calls from tomcat to apimgt gateway
2016-06-14 15:51:43 +05:30
ayyoob
7b2c04152f changed the UI calls from tomcat to apimgt gateway 2016-06-14 15:49:34 +05:30
Ace
7b62d2769e Changing response code returned when adding user 2016-06-14 15:28:59 +05:30
ayyoob
31fc16247c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport 2016-06-14 15:20:31 +05:30
madhawap
3d416da6fe add changes to 'since' QueryParam and 'if-modified-since' HeaderParam 2016-06-14 12:03:14 +05:30
geethkokila
626142a59b Fixing the isssue in retrieving the device info 2016-06-14 10:47:07 +05:30
Ace
016414c076 Bug fixes for role search 2016-06-13 15:43:21 +05:30
geethkokila
d6501cbf8c Fixing the device search issues 2016-06-13 10:15:26 +05:30
hasuniea
220a34faa9 renamed scep feature 2016-06-10 10:04:52 +05:30
hasuniea
629a0103d9 renaming scep web app 2016-06-10 09:39:39 +05:30
hasuniea
81aae9716d fixing certmgt issue 2016-06-09 14:16:02 +05:30
hasuniea
ec3d032bc5 fixinf code issues 2016-06-09 10:07:01 +05:30
hasuniea
6471055c3f add refactored stuff 2016-06-09 10:00:35 +05:30
Ruwan
0d524226cd Merge pull request #296 from ayyoob/transport
added profile check before publishing apis
2016-06-08 23:00:08 +05:30
ayyoob
b94eed267c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport 2016-06-08 22:41:04 +05:30
ayyoob
52e84273d1 added profile check before publishing apis 2016-06-08 22:38:49 +05:30
Ruwan
211ea9a8e4 Merge pull request #295 from Shabirmean/master
Changes to the certificate generators to fetch the Certificate alias from the Unique Identifier set in the CSR
2016-06-08 12:20:31 +05:30
Shabirmean
adec5cc303 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-06-08 12:01:32 +05:30
Ruwan
4d4d24a413 Merge pull request #294 from sahan-kariyawasam/master
Added dashboard server url as a property
2016-06-07 22:18:43 +05:30
Sahan Kariyawasam
35f43a60e7 Added Dashboard server url property 2016-06-07 19:18:03 +05:30
geethkokila
1fabb0eee3 Fixing the database syncing issue 2016-06-07 12:55:15 +05:30
Shabirmean
a55dc9bce8 Adding necessary imports for the Certificate generation from CSR 2016-06-07 09:29:54 +05:30
Shabirmean
4380f7e242 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-06-06 19:13:56 +05:30
Milan Perera
489fa46569 Merge pull request #293 from milanperera/apim
Changed HTTPS Url
2016-06-06 15:59:11 +05:30
mharindu
de72cc21c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-06-06 15:52:57 +05:30
mharindu
3858920d72 Changed HTTPS Url 2016-06-06 15:52:22 +05:30
Ruwan
db56143fa3 Merge pull request #292 from ayyoob/transport
added https url for jaggery app deployment server
2016-06-06 13:58:55 +05:30
ayyoob
bb051deebc added https url for jaggery app deployment server 2016-06-06 13:55:05 +05:30
Milan Perera
c3ea1b3be8 Merge pull request #291 from ayyoob/transport
added missing imports
2016-06-06 10:47:21 +05:30
ayyoob
c5a997b1bf added missing imports 2016-06-06 10:42:31 +05:30
ayyoob
cd6a5aad6f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport 2016-06-06 10:33:06 +05:30
Milan Perera
64da754ab2 Merge pull request #290 from milanperera/apim
Fixed APIM publishing issues
2016-06-06 09:45:23 +05:30
mharindu
a80ca2d696 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-06-06 09:10:07 +05:30
Kasun Delgolla
008a8a893f Merge pull request #289 from GPrathap/master
fixing jira:IOTS-195
2016-06-05 23:37:14 +05:30
GPrathap
efb71d472a changing sso default state 2016-06-05 23:21:39 +05:30
GPrathap
e23044d59d fixing jira:IOTS-195 2016-06-05 23:15:54 +05:30