Commit Graph

2092 Commits

Author SHA1 Message Date
ayyoob
ba6e202442 Few changes added after testing with the cluster 2016-06-27 00:12:46 +05:30
ayyoob
ebebca8573 Added support for push notification for xmpp, mqtt and few changes to the after testing 2016-06-20 02:33:59 +05:30
ayyoob
0c2de7965f Added device scope validation 2016-06-20 02:33:17 +05:30
ayyoob
1373e995fb added support to load device type configuration in base ui 2016-06-17 17:21:39 +05:30
ayyoob
7b2c04152f changed the UI calls from tomcat to apimgt gateway 2016-06-14 15:49:34 +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
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
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
Shabirmean
cbd42d2026 Changes to the certificate generators to fetch the Certificate alias from the Unique Identifier set in the CSR 2016-06-02 17:13:09 +05:30
mharindu
cfe24229fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-31 16:19:03 +05:30
Ruwan
d763d81404 Merge pull request #281 from charithag/master
FIx for https://wso2.org/jira/browse/IOTS-169
2016-05-31 11:37:25 +05:30
charitha
92a732cd41 Moved redundant texts to constants 2016-05-31 11:30:36 +05:30
charitha
e2c03adec4 FIx for https://wso2.org/jira/browse/IOTS-169 2016-05-31 11:14:37 +05:30
hasuniea
20343d9349 fixed swagger message issue 2016-05-30 13:03:21 +05:30
mharindu
71eb657e52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-28 21:05:09 +05:30
geethkokila
ed0da9e1d0 Fixing the device informations to get the applications 2016-05-28 03:12:10 +05:30
geethkokila
ecc8b5e6f2 Fixing the api issues 2016-05-28 02:02:43 +05:30
geethkokila
0221782533 Adding new apis for getting the device location when list of device identifiers are supplied 2016-05-28 01:57:36 +05:30
dilanua
f4f47cbfdd Changing view names to fix oracle naming issues in dashboard analytics feature 2016-05-28 00:41:21 +05:30
geethkokila
6328d35797 Changing the device info object by adding the application list 2016-05-28 00:19:04 +05:30
inoshperera
dafd219868 Merge pull request #280 from madhawap/master
Added username field to the device certificate DB and related changes
2016-05-27 22:31:28 +05:30
Madhawa Perera
4b128a6ebd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-27 22:15:53 +05:30
Madhawa Perera
d805245ffc added username field to the device certificate db and related changes 2016-05-27 22:15:21 +05:30
Hasunie
981db24ca8 Merge pull request #279 from hasuniea/master
add certificate feature
2016-05-27 19:48:49 +05:30
hasuniea
271170c26e refactored cert feature 2016-05-27 18:42:24 +05:30
ayyoob
e03be5183d updated JWT Authenticator implementation to support tenancy 2016-05-27 14:01:54 +05:30
prabathabey
ebefd60533 Renaming TenantConfiguration as PlatformConfiguration 2016-05-27 11:22:54 +05:30
ayyoob
c9cd051a6b subscribed to super tenant apis 2016-05-27 02:20:15 +05:30
ayyoob
e8b9f03748 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-27 01:27:32 +05:30
Milan Perera
4462c353b4 Merge pull request #277 from ayyoob/transport
Fixed https://wso2.org/jira/browse/IOTS-177
2016-05-26 21:21:06 +05:30