Commit Graph

93 Commits

Author SHA1 Message Date
Chatura Dilan
2befefc967 Added OS build date 2016-07-01 15:45:59 +05:30
ayyoob
ba6e202442 Few changes added after testing with the cluster 2016-06-27 00:12:46 +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
Sahan Kariyawasam
35f43a60e7 Added Dashboard server url property 2016-06-07 19:18:03 +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
ayyoob
bb051deebc added https url for jaggery app deployment server 2016-06-06 13:55:05 +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
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
mharindu
cfe24229fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-31 16:19:03 +05:30
charitha
e2c03adec4 FIx for https://wso2.org/jira/browse/IOTS-169 2016-05-31 11:14:37 +05:30
mharindu
52388ed33d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-26 12:44:36 +05:30
mharindu
106be76118 Fixed issues of API publishing to gateway 2016-05-26 12:41:20 +05:30
GPrathap
78475963e3 added entry for websocket url 2016-05-25 14:38:46 +05:30
Rasika Perera
b879927dc1 Adding licence headers for handlebar templates 2016-05-25 11:28:24 +05:30
mharindu
66ccad65cf Partial commit for APIM Gateway migration 2016-05-23 16:51:26 +05:30
Ace
ecd386adf0 Fixing IOTS-160 2016-05-19 08:22:29 +05:30
sumedharubasinghe
067f0a8050 Merge pull request #266 from ayyoob/transport
added api application registration filter
2016-05-18 23:17:43 +05:30
ayyoob
ba47af3186 added api application registration filter 2016-05-18 19:33:04 +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
charitha
6dc0a9dd38 Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario 2016-05-17 18:40:39 +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
charitha
9480c71522 Fixed script error 2016-05-16 21:57:48 +05:30
charitha
81524ae32c Fix for https://wso2.org/jira/browse/IOTS-156 2016-05-16 18:37:49 +05:30
charitha
3d9ae8d1f6 Fix for https://wso2.org/jira/browse/IOTS-152 2016-05-16 17:50:58 +05:30
charitha
e7c5ef78d0 Removed unnecessary jaggery apis 2016-05-16 17:03:36 +05:30
Ruwan
8f0840e3df Merge pull request #254 from ayyoob/transport
updated authentication in api
2016-05-15 20:07:02 +05:30
ayyoob
168033b19d updated authentication in api 2016-05-15 17:46:13 +05:30
charitha
685c52a453 Bug fixes 2016-05-15 13:13:30 +05:30
ayyoob
51d46213c2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport 2016-05-13 15:03:11 +05:30
ayyoob
48912a05bb merged with upstream 2016-05-13 05:23:19 +05:30
ayyoob
bee9a106cc removed method and type from feature 2016-05-13 02:53:08 +05:30
charitha
18957b0110 Add required jagerry modules for the app 2016-05-11 19:30:55 +05:30
charitha
73222e347b Fixed https://wso2.org/jira/browse/IOTS-104 2016-05-11 15:59:35 +05:30
charitha
7ff993a7b7 Enable group analytics 2016-05-10 21:31:51 +05:30
Charitha Goonetilleke
ca62c2ef73 Fix grouped device listing 2016-05-04 02:47:45 +05:30
Charitha Goonetilleke
92784120bd Add group sharing UI functionality 2016-05-03 23:28:26 +05:30
Rasika Perera
b6c33a0aec Fixing group roles listing 2016-05-03 19:49:09 +05:30
Rasika Perera
64a262d3e4 Fixing 404 on groups listing 2016-05-03 15:34:50 +05:30
Rasika Perera
07c0aa1045 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-02 18:12:03 +05:30