Commit Graph

1512 Commits

Author SHA1 Message Date
mharindu
2dbcf86f3d Added retrying mechanism to webapp publisher 2016-05-20 15:52:50 +05:30
dilanua
b9a9fb3169 Adding class & method comments, constants to dashboard analytics feature 2016-05-19 12:37:12 +05:30
Ace
083e0f6eaa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-19 08:22:54 +05:30
Ace
ecd386adf0 Fixing IOTS-160 2016-05-19 08:22:29 +05:30
ayyoob
e8a66a7a37 resolved build issue 2016-05-19 02:46:05 +05:30
mharindu
52b300c06a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-19 00:42:27 +05:30
mharindu
968cb00f35 Fixed conflicts and merged 2016-05-19 00:42:14 +05:30
sumedharubasinghe
ae93e0c9a7 Merge pull request #268 from ayyoob/transport
resolving create application issues
2016-05-19 00:40:20 +05:30
mharindu
83c2a1f0ee Fixed issues in api publishing 2016-05-19 00:30:41 +05:30
ayyoob
8a38abbae6 resolving create application issues 2016-05-19 00:26:34 +05:30
prabathabey
5e03c5ed30 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-19 00:20:57 +05:30
prabathabey
a375252a94 Adding pluggable push notification framework 2016-05-19 00:20:45 +05:30
Ruwan
99c2446dc8 Merge pull request #267 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
2016-05-19 00:14:33 +05:30
charitha
7eb111078a Fix for https://wso2.org/jira/browse/IOTS-110 MT issue 2016-05-19 00:07:40 +05:30
sumedharubasinghe
067f0a8050 Merge pull request #266 from ayyoob/transport
added api application registration filter
2016-05-18 23:17:43 +05:30
mharindu
bca1b4b059 Fixed conflicts 2016-05-18 22:01:38 +05:30
mharindu
9f93570b29 Fixed issues in webapp-publisher 2016-05-18 22:00:16 +05:30
ayyoob
ba47af3186 added api application registration filter 2016-05-18 19:33:04 +05:30
dilanua
7051af8d80 Adding relevant contextual names for database view names in dashboard analytics feature 2016-05-18 18:48:43 +05:30
geethkokila
958288f8ec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-18 14:57:01 +05:30
geethkokila
c7dd386c94 Adding new apis for device informations 2016-05-18 14:56:46 +05:30
dilanua
2886ead44b Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature 2016-05-18 14:26:43 +05:30
mharindu
49cb4787c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-18 11:49:35 +05:30
mharindu
82b90522a0 Migrated to APIM 5.0.4 2016-05-18 11:49:20 +05:30
sumedharubasinghe
61ef87c658 Merge pull request #265 from rasika90/IOTS-114
Fixing IOTS-114: the user is unable to deselect a child node permissions
2016-05-18 11:26:18 +05:30
Rasika Perera
bc3f64a77a Fixing IOTS-114: the user is unable to deselect a child node permissions 2016-05-18 11:24:38 +05:30
charitha
075b5a8901 Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164 2016-05-18 10:10:21 +05:30
sumedharubasinghe
6a69a3a895 Merge pull request #261 from charithag/master
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
2016-05-18 02:20:00 +05:30
sumedharubasinghe
2f6c1dfbdd Merge pull request #263 from ayyoob/transport
few fixes in JWT client after testing with multi tenancy
2016-05-18 02:18:33 +05:30
ayyoob
c0240c5cbc few fixes in JWT client after testing with multi tenancy 2016-05-18 02:09:12 +05:30
charitha
aadf87e5d9 Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158 2016-05-17 23:33:33 +05:30
Rasika Perera
be970bfc9d Fixing IOTS-117 Domain needs to be marked as a mandatory field 2016-05-17 23:05:32 +05:30
mharindu
89026c2b7f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-17 20:33:23 +05:30
charitha
6dc0a9dd38 Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario 2016-05-17 18:40:39 +05:30
mharindu
894e11c1c4 Fixed the JWT verifier issue 2016-05-17 15:39:16 +05:30
mharindu
9ebf2ab6d9 Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt 2016-05-17 15:33:17 +05:30
charitha
ddc47cd862 Fix for https://wso2.org/jira/browse/IOTS-161 2016-05-17 14:25:28 +05:30
charitha
0ccaa9fe81 Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112 2016-05-17 13:57:47 +05:30
mharindu
5ccc480ddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-17 12:25:57 +05:30
mharindu
efc9fc3265 Fixed conflicts 2016-05-17 08:58:54 +05:30
mharindu
16a8f61f79 Refactored jwt authenticator 2016-05-17 08:48:55 +05:30
dilanua
d5950afe7a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-17 05:55:05 +05:30
dilanua
c90f4471a8 Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature 2016-05-17 05:54:40 +05:30
charitha
9480c71522 Fixed script error 2016-05-16 21:57:48 +05:30
charitha
e0fc7c4018 Fix for https://wso2.org/jira/browse/IOTS-110 2016-05-16 21:01:33 +05:30
ayyoob
cbdf5dd175 added a simple resolution for https://wso2.org/jira/browse/APIMANAGER-4504 2016-05-16 20:41:30 +05:30
ayyoob
2ceff61811 refactors jet authenticator to pick tenant specific key store 2016-05-16 19:44:31 +05:30
charitha
81524ae32c Fix for https://wso2.org/jira/browse/IOTS-156 2016-05-16 18:37:49 +05:30
mharindu
ace6c2dbfc Fixed issues in JWT Authenticator 2016-05-16 18:13:00 +05:30
charitha
3d9ae8d1f6 Fix for https://wso2.org/jira/browse/IOTS-152 2016-05-16 17:50:58 +05:30