Commit Graph

981 Commits

Author SHA1 Message Date
WSO2 Builder
09607fc4c2 [WSO2 Release] [Jenkins #2475] [Release 3.0.41] prepare for next development iteration 2017-07-19 19:11:43 +05:30
WSO2 Builder
791a85e79b [WSO2 Release] [Jenkins #2475] [Release 3.0.41] prepare release v3.0.41 2017-07-19 19:11:30 +05:30
WSO2 Builder
5b968f4fe5 [WSO2 Release] [Jenkins #2473] [Release 3.0.40] prepare for next development iteration 2017-07-19 07:24:26 +00:00
WSO2 Builder
122678f3d4 [WSO2 Release] [Jenkins #2473] [Release 3.0.40] prepare release v3.0.40 2017-07-19 07:24:14 +00:00
WSO2 Builder
8fd9960913 [WSO2 Release] [Jenkins #2468] [Release 3.0.39] prepare for next development iteration 2017-07-18 04:19:56 +00:00
WSO2 Builder
92aa96ee18 [WSO2 Release] [Jenkins #2468] [Release 3.0.39] prepare release v3.0.39 2017-07-18 04:19:43 +00:00
WSO2 Builder
94d270863e [WSO2 Release] [Jenkins #2466] [Release 3.0.38] prepare for next development iteration 2017-07-17 07:10:59 +00:00
WSO2 Builder
c29d83afeb [WSO2 Release] [Jenkins #2466] [Release 3.0.38] prepare release v3.0.38 2017-07-17 07:10:46 +00:00
WSO2 Builder
47ce6f4271 [WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare for next development iteration 2017-07-16 22:21:47 +05:30
WSO2 Builder
5dc7dc5442 [WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare release v3.0.37 2017-07-16 22:21:33 +05:30
WSO2 Builder
91456df809 [WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare for next development iteration 2017-07-16 21:54:30 +05:30
WSO2 Builder
25598c12d4 [WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare release v3.0.36 2017-07-16 21:54:16 +05:30
WSO2 Builder
94c1fd0ad6 [WSO2 Release] [Jenkins #2461] [Release 3.0.35] prepare for next development iteration 2017-07-16 18:05:31 +05:30
WSO2 Builder
ce87e69859 [WSO2 Release] [Jenkins #2461] [Release 3.0.35] prepare release v3.0.35 2017-07-16 18:05:17 +05:30
WSO2 Builder
5f8dab6916 [WSO2 Release] [Jenkins #2457] [Release 3.0.34] prepare for next development iteration 2017-07-14 12:53:35 +05:30
WSO2 Builder
7c5fc0bf5d [WSO2 Release] [Jenkins #2457] [Release 3.0.34] prepare release v3.0.34 2017-07-14 12:53:19 +05:30
WSO2 Builder
2673a7ae3c [WSO2 Release] [Jenkins #2454] [Release 3.0.33] prepare for next development iteration 2017-07-13 15:38:51 +05:30
WSO2 Builder
14f8bacb65 [WSO2 Release] [Jenkins #2454] [Release 3.0.33] prepare release v3.0.33 2017-07-13 15:38:38 +05:30
WSO2 Builder
2a6d35bdf5 [WSO2 Release] [Jenkins #2452] [Release 3.0.32] prepare for next development iteration 2017-07-13 12:25:52 +05:30
WSO2 Builder
a1a6649213 [WSO2 Release] [Jenkins #2452] [Release 3.0.32] prepare release v3.0.32 2017-07-13 12:25:38 +05:30
WSO2 Builder
f398de79c4 [WSO2 Release] [Jenkins #2449] [Release 3.0.31] prepare for next development iteration 2017-07-11 15:35:38 +05:30
WSO2 Builder
757e93c301 [WSO2 Release] [Jenkins #2449] [Release 3.0.31] prepare release v3.0.31 2017-07-11 15:35:22 +05:30
WSO2 Builder
8d0e7a2086 [WSO2 Release] [Jenkins #2448] [Release 3.0.30] prepare for next development iteration 2017-07-11 14:16:42 +05:30
WSO2 Builder
6b30b11de9 [WSO2 Release] [Jenkins #2448] [Release 3.0.30] prepare release v3.0.30 2017-07-11 14:16:25 +05:30
Jasintha
4bae413f72 Fixing Filstream closing issue and few formatting errors 2017-07-11 13:01:09 +05:30
Jasintha
b1d5a58d6b Fixing weekTrustManger Imple issue 2017-07-11 10:12:07 +05:30
WSO2 Builder
3a991b8bf7 [WSO2 Release] [Jenkins #2446] [Release 3.0.29] prepare for next development iteration 2017-07-10 17:50:16 +05:30
WSO2 Builder
9ecc6f7281 [WSO2 Release] [Jenkins #2446] [Release 3.0.29] prepare release v3.0.29 2017-07-10 17:50:02 +05:30
WSO2 Builder
71e3cdffdd [WSO2 Release] [Jenkins #2444] [Release 3.0.28] prepare for next development iteration 2017-07-10 14:54:49 +05:30
WSO2 Builder
2519d86874 [WSO2 Release] [Jenkins #2444] [Release 3.0.28] prepare release v3.0.28 2017-07-10 14:54:40 +05:30
WSO2 Builder
c63c04f5a6 [WSO2 Release] [Jenkins #2441] [Release 3.0.27] prepare for next development iteration 2017-07-09 09:50:34 +05:30
WSO2 Builder
9d2fd5273e [WSO2 Release] [Jenkins #2441] [Release 3.0.27] prepare release v3.0.27 2017-07-09 09:50:19 +05:30
WSO2 Builder
5d27e40e76 [WSO2 Release] [Jenkins #2438] [Release 3.0.26] prepare for next development iteration 2017-07-07 19:11:59 +05:30
WSO2 Builder
3930a7cfb1 [WSO2 Release] [Jenkins #2438] [Release 3.0.26] prepare release v3.0.26 2017-07-07 19:11:44 +05:30
WSO2 Builder
b429d8b902 [WSO2 Release] [Jenkins #2437] [Release 3.0.25] prepare for next development iteration 2017-07-07 18:30:31 +05:30
WSO2 Builder
8ac3291551 [WSO2 Release] [Jenkins #2437] [Release 3.0.25] prepare release v3.0.25 2017-07-07 18:30:16 +05:30
WSO2 Builder
8287bfa6d5 [WSO2 Release] [Jenkins #2435] [Release 3.0.24] prepare for next development iteration 2017-07-07 16:24:55 +05:30
WSO2 Builder
f3c6548937 [WSO2 Release] [Jenkins #2435] [Release 3.0.24] prepare release v3.0.24 2017-07-07 16:24:39 +05:30
WSO2 Builder
ab606238d9 [WSO2 Release] [Jenkins #2432] [Release 3.0.23] prepare for next development iteration 2017-07-07 00:09:32 +05:30
WSO2 Builder
23cdc06244 [WSO2 Release] [Jenkins #2432] [Release 3.0.23] prepare release v3.0.23 2017-07-07 00:09:19 +05:30
WSO2 Builder
407fdf66da [WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare for next development iteration 2017-07-06 15:02:03 +05:30
WSO2 Builder
ba0a0c4687 [WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare release v3.0.22 2017-07-06 15:01:52 +05:30
WSO2 Builder
1950126459 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare for next development iteration 2017-07-05 23:45:39 +05:30
WSO2 Builder
2388bd5f05 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare release v3.0.21 2017-07-05 23:45:24 +05:30
WSO2 Builder
f106a914bb [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare for next development iteration 2017-07-05 14:59:52 +05:30
WSO2 Builder
0cc8f902ae [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare release v3.0.20 2017-07-05 14:59:38 +05:30
WSO2 Builder
09bf240ff6 [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare for next development iteration 2017-07-04 19:13:38 +05:30
WSO2 Builder
3c63162f7a [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare release v3.0.19 2017-07-04 19:13:23 +05:30
WSO2 Builder
e65f0b1afa [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare for next development iteration 2017-07-03 18:31:48 +05:30
WSO2 Builder
e1bbc9fe47 [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare release v3.0.18 2017-07-03 18:31:35 +05:30
WSO2 Builder
7a02ecbe68 [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare for next development iteration 2017-07-01 12:47:09 +05:30
WSO2 Builder
5b32f7813a [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare release v3.0.17 2017-07-01 12:46:54 +05:30
WSO2 Builder
c376208943 [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare for next development iteration 2017-06-30 17:44:28 +05:30
WSO2 Builder
5c013a3abd [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare release v3.0.16 2017-06-30 17:44:14 +05:30
WSO2 Builder
cc13b1446e [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare for next development iteration 2017-06-30 15:46:09 +05:30
WSO2 Builder
08831cb9f4 [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare release v3.0.15 2017-06-30 15:45:56 +05:30
WSO2 Builder
6330164676 [WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare for next development iteration 2017-06-29 14:54:03 +05:30
WSO2 Builder
153fb3984e [WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare release v3.0.14 2017-06-29 14:53:50 +05:30
WSO2 Builder
fc41a165a8 [WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare for next development iteration 2017-06-28 19:26:16 +05:30
WSO2 Builder
7acd8e70c4 [WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare release v3.0.13 2017-06-28 19:26:02 +05:30
WSO2 Builder
cb078fbb0f [WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare for next development iteration 2017-06-28 18:26:18 +05:30
WSO2 Builder
8e874b2ef0 [WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare release v3.0.12 2017-06-28 18:26:05 +05:30
WSO2 Builder
c03e1ec1d1 [WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare for next development iteration 2017-06-27 12:15:35 +05:30
WSO2 Builder
997affda65 [WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare release v3.0.11 2017-06-27 12:15:21 +05:30
WSO2 Builder
e23ef52e61 [maven-release-plugin]prepare for next development iteration 2017-06-23 20:27:17 +05:30
WSO2 Builder
c333f28461 [maven-release-plugin]prepare release v3.0.10 2017-06-23 20:27:03 +05:30
WSO2 Builder
27e494f153 [WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare for next development iteration 2017-06-23 17:22:32 +05:30
WSO2 Builder
21ab65e6d5 [WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare release v3.0.9 2017-06-23 17:22:20 +05:30
WSO2 Builder
54d25522ba [WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare for next development iteration 2017-06-22 20:09:55 +05:30
WSO2 Builder
69b168f3b2 [WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare release v3.0.8 2017-06-22 20:09:41 +05:30
ayyoob
6c041c7b6a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-22 04:34:45 +05:30
ayyoob
80cc690a42 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-21 04:11:40 +05:30
WSO2 Builder
68cb8d3f81 [WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare for next development iteration 2017-06-20 22:37:58 +05:30
WSO2 Builder
d0f52c48ef [WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare release v3.0.7 2017-06-20 22:37:45 +05:30
WSO2 Builder
2896b55f5e [WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare for next development iteration 2017-06-20 18:03:42 +05:30
WSO2 Builder
bdb57383b1 [WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare release v3.0.6 2017-06-20 18:03:28 +05:30
WSO2 Builder
8badc2bc37 [WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare for next development iteration 2017-06-19 17:23:13 +05:30
WSO2 Builder
43182aede9 [WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare release v3.0.5 2017-06-19 17:22:58 +05:30
WSO2 Builder
f70535ed20 [WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare for next development iteration 2017-06-19 16:22:55 +05:30
WSO2 Builder
c3d154ee65 [WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare release v3.0.4 2017-06-19 16:22:42 +05:30
ayyoob
3b7d4d8966 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-17 19:17:42 +05:30
WSO2 Builder
e924a86d73 [WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare for next development iteration 2017-06-16 17:40:41 +05:30
WSO2 Builder
b35aaab992 [WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare release v3.0.3 2017-06-16 17:40:27 +05:30
madhawap
648659a781 Sets values taken from system varibales to iot-api-config.xml
iot-api-config.xml consists with system varibales like iot.core.host, iot.keymanager.host etc. But values set to those varibales were not pass into these places. This commit fixes that
2017-06-16 13:16:29 +05:30
WSO2 Builder
2b76317f40 [WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare for next development iteration 2017-06-16 11:00:40 +05:30
WSO2 Builder
02bc10e6d2 [WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare release v3.0.2 2017-06-16 11:00:26 +05:30
WSO2 Builder
1e58f762da [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare for next development iteration 2017-06-15 16:23:05 +05:30
WSO2 Builder
bae931f3c5 [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare release v3.0.1 2017-06-15 16:22:51 +05:30
ayyoob
0d08c42f5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-15 09:48:00 +05:30
WSO2 Builder
69d2cff7bd [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare for next development iteration 2017-06-14 18:08:46 +05:30
WSO2 Builder
3795011895 [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare release v3.0.0 2017-06-14 18:08:31 +05:30
ayyoob
07bdd5cb6c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-14 13:19:07 +05:30
WSO2 Builder
16420433b5 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare for next development iteration 2017-06-13 17:26:56 +05:30
WSO2 Builder
5c06b9dcb2 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare release v2.0.75 2017-06-13 17:26:42 +05:30
ayyoob
22a4716443 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-12 11:35:43 +05:30
WSO2 Builder
8927158086 [WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare for next development iteration 2017-06-09 12:57:29 +05:30
WSO2 Builder
28423c45bc [WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare release v2.0.74 2017-06-09 12:57:15 +05:30
ayyoob
6c7f911cbc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
2017-06-08 14:39:51 +05:30
WSO2 Builder
e3dfbdfdbd [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
WSO2 Builder
598332b640 [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare release v2.0.73 2017-06-07 13:44:15 +05:30
WSO2 Builder
73fa026eeb [WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare for next development iteration 2017-06-06 12:33:06 +05:30
WSO2 Builder
2415762ccb [WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare release v2.0.72 2017-06-06 12:32:53 +05:30
ayyoob
a7ebc96cb7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-03 18:06:32 +05:30
WSO2 Builder
39a7037821 [WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare for next development iteration 2017-06-02 16:44:55 +05:30
WSO2 Builder
22782ec125 [WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare release v2.0.71 2017-06-02 16:44:41 +05:30
ayyoob
04b8b74e4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-01 17:22:33 +05:30
WSO2 Builder
c7fd70145d [WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare for next development iteration 2017-06-01 08:58:27 +05:30
WSO2 Builder
0c9d104401 [WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare release v2.0.70 2017-06-01 08:58:13 +05:30
Rasika Perera
aa0f9e0510 Merge pull request #744 from ayyoob/new-master
auto healing in case of app deletion and added device scope to handle to handle multiple session
2017-06-01 05:29:27 +05:30
WSO2 Builder
69a63baa43 [WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare for next development iteration 2017-05-30 11:24:51 +05:30
WSO2 Builder
713b948ea9 [WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare release v2.0.69 2017-05-30 11:24:37 +05:30
ayyoob
c3f23fa564 fixed multi tenant issues after testing custom device type impl 2017-05-29 01:00:16 +05:30
WSO2 Builder
7e83b53bb4 [WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare for next development iteration 2017-05-22 15:33:56 +05:30
WSO2 Builder
768073ea51 [WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare release v2.0.68 2017-05-22 15:33:42 +05:30
WSO2 Builder
88bab85750 [WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare for next development iteration 2017-05-18 17:33:39 +05:30
WSO2 Builder
4e506a547e [WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare release v2.0.67 2017-05-18 17:33:25 +05:30
WSO2 Builder
3092423d4d [WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare for next development iteration 2017-05-17 19:11:50 +05:30
WSO2 Builder
e21520392c [WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare release v2.0.66 2017-05-17 19:11:36 +05:30
WSO2 Builder
d4baa72328 [WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare for next development iteration 2017-05-16 18:34:27 +05:30
WSO2 Builder
7b549f623d [WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare release v2.0.65 2017-05-16 18:34:13 +05:30
Madawa Soysa
c7d002a6a9 Fix for https://github.com/wso2/product-iots/issues/449 2017-05-16 17:18:16 +05:30
ayyoob
42cb383804 auto healing in case of app deletion and added device scope to handle multiple session with same user 2017-05-11 21:21:53 +05:30
WSO2 Builder
84d305dcd4 [WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare for next development iteration 2017-05-11 09:15:49 +05:30
WSO2 Builder
3bf945fe95 [WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare release v2.0.64 2017-05-11 09:15:33 +05:30
WSO2 Builder
f7300645a5 [WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare for next development iteration 2017-05-09 15:05:26 +05:30
WSO2 Builder
ca83609703 [WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare release v2.0.63 2017-05-09 15:05:11 +05:30
WSO2 Builder
964eae6f92 [WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare for next development iteration 2017-05-08 17:42:41 +05:30
WSO2 Builder
31f91f80b9 [WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare release v2.0.62 2017-05-08 17:42:28 +05:30
WSO2 Builder
639eeb225a [WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare for next development iteration 2017-05-05 11:41:19 +05:30
WSO2 Builder
7d3025a25b [WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare release v2.0.61 2017-05-05 11:41:03 +05:30
WSO2 Builder
a546355cf3 [WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare for next development iteration 2017-05-04 15:42:27 +05:30
WSO2 Builder
eb6b1db3fe [WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare release v2.0.60 2017-05-04 15:42:14 +05:30
WSO2 Builder
4797fc9600 [WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare for next development iteration 2017-05-03 20:29:05 +05:30
WSO2 Builder
896bc24f21 [WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare release v2.0.59 2017-05-03 20:28:51 +05:30
Rasika Perera
5dc9259fc0 Merge pull request #728 from rasika/git_issue_726
Resolving cannot log into devicemgt app when tenant is not loaded in API Manager
2017-05-03 20:23:07 +05:30
Rasika Perera
2831bfaf2c #726 : Resolving cannot log into devicemgt app when tenant is not loaded in API Manager 2017-05-03 19:59:17 +05:30
WSO2 Builder
98991fe89b [WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare for next development iteration 2017-05-03 15:28:16 +05:30
WSO2 Builder
8b31b93181 [WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare release v2.0.58 2017-05-03 15:28:02 +05:30
WSO2 Builder
6fddf9c8d0 [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare for next development iteration 2017-05-03 08:28:19 +05:30
WSO2 Builder
2f4051019c [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare release v2.0.57 2017-05-03 08:28:05 +05:30
WSO2 Builder
80bf3c8fbd [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare for next development iteration 2017-05-02 18:01:00 +05:30
WSO2 Builder
2a7173c66d [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare release v2.0.56 2017-05-02 18:00:46 +05:30
WSO2 Builder
95a80301e9 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare for next development iteration 2017-05-02 17:15:09 +05:30
WSO2 Builder
236db75700 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare release v2.0.55 2017-05-02 17:14:54 +05:30
Chatura Dilan
309352df1e Merge pull request #722 from janakamarasena/mutual-ssl-handler
Added mutual SSL authentication handling for android
2017-05-02 17:04:38 +05:30
WSO2 Builder
43e76e4678 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare for next development iteration 2017-05-02 09:37:33 +05:30
WSO2 Builder
34865f0d25 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare release v2.0.54 2017-05-02 09:37:16 +05:30
Janak Amarasena
2b0800794d Minor improvements to the code 2017-04-28 16:32:57 +05:30
Janak Amarasena
e5bd7566d3 Add Mutual SSL handling to AuthHandler 2017-04-28 16:32:57 +05:30
WSO2 Builder
3a9986d054 [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare for next development iteration 2017-04-28 10:29:44 +05:30
WSO2 Builder
b53610ff8b [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare release v2.0.53 2017-04-28 10:29:35 +05:30
megala21
47ce861b49 Fixing basic authenticator issue 2017-04-28 10:01:54 +05:30
megala21
4560348697 Fixing isses in authentication 2017-04-27 23:21:29 +05:30
megala21
b5e4c22c31 Merge remote-tracking branch 'upstream/master' 2017-04-27 21:55:32 +05:30
megala21
121c289b39 Adding security filters to web.xml 2017-04-27 17:36:10 +05:30
WSO2 Builder
726422dc81 [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare for next development iteration 2017-04-26 21:31:21 +05:30
WSO2 Builder
4bf6bf73cc [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare release v2.0.52 2017-04-26 21:31:08 +05:30
WSO2 Builder
4429482a29 [WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare for next development iteration 2017-04-26 15:26:48 +05:30
WSO2 Builder
1bbd982e1f [WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare release v2.0.51 2017-04-26 15:26:35 +05:30
WSO2 Builder
52b0165275 [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare for next development iteration 2017-04-26 11:16:14 +05:30
WSO2 Builder
ada2669ecf [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare release v2.0.50 2017-04-26 11:15:58 +05:30
ayyoob
9967d6e7da few fixes after testing mqtt authorisation flow
(cherry picked from commit 4aba08b)
2017-04-26 10:20:03 +05:30
WSO2 Builder
543e603298 [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare for next development iteration 2017-04-25 10:14:34 +05:30
WSO2 Builder
5010a3eebf [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare release v2.0.49 2017-04-25 10:14:21 +05:30
WSO2 Builder
eb8ba53092 [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare for next development iteration 2017-04-25 08:58:47 +05:30
WSO2 Builder
4764bff47e [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare release v2.0.48 2017-04-25 08:58:32 +05:30
WSO2 Builder
c1b5a649f6 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare for next development iteration 2017-04-21 16:06:53 +05:30
WSO2 Builder
6ccccb67b4 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare release v2.0.47 2017-04-21 16:06:39 +05:30
Harshan Liyanage
0dc15324ad Merge pull request #701 from amalhub/master
Merging Cloud updates to master
2017-04-21 15:59:00 +05:30
Madawa Soysa
0eeef0a568 Refactoring to use APIManager DCR
This commit is done to refactor the Auth application creation process to use the APIManager Key manager client registration endpoint instead of IOT DCR endpoint.
2017-04-21 15:46:18 +05:30
WSO2 Builder
1ecb4edbd7 [WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare for next development iteration 2017-04-21 15:31:09 +05:30
WSO2 Builder
48a8f43cb3 [WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare release v2.0.46 2017-04-21 15:30:57 +05:30
WSO2 Builder
16d97d62be [WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare for next development iteration 2017-04-20 14:41:55 +05:30
WSO2 Builder
8891784b99 [WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare release v2.0.45 2017-04-20 14:41:41 +05:30
WSO2 Builder
f7d1a7cf99 [WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare for next development iteration 2017-04-18 10:40:31 +05:30
WSO2 Builder
4b85af950c [WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare release v2.0.44 2017-04-18 10:40:22 +05:30
ayyoob
d121e557b8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-17 17:44:48 +05:30
ayyoob
8a842e8f8e restricted basic auth support 2017-04-17 17:37:46 +05:30
WSO2 Builder
b9e614e383 [WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare for next development iteration 2017-04-17 16:39:50 +05:30
WSO2 Builder
d37951ef3f [WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare release v2.0.43 2017-04-17 16:39:37 +05:30
WSO2 Builder
fc15f43b31 [WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare for next development iteration 2017-04-07 14:07:15 +05:30
WSO2 Builder
27b84bfc22 [WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare release v2.0.42 2017-04-07 14:07:01 +05:30
Harshan Liyanage
46f418bafb Api publishing timeout fixes for cloud. 2017-04-07 13:46:52 +05:30
Ace
903ab9abe3 Adding logic to acknowledge 404 response when tiers not available 2017-04-07 13:44:23 +05:30
WSO2 Builder
5496159f9d [WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare for next development iteration 2017-04-05 11:58:36 +05:30
WSO2 Builder
ef94e90366 [WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare release v2.0.41 2017-04-05 11:58:23 +05:30
WSO2 Builder
a826370019 [WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare for next development iteration 2017-04-05 09:37:06 +05:30
WSO2 Builder
4654a4db45 [WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare release v2.0.40 2017-04-05 09:36:53 +05:30
WSO2 Builder
8b7e458592 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare for next development iteration 2017-04-04 18:08:44 +05:30
WSO2 Builder
6297993560 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare release v2.0.39 2017-04-04 18:08:31 +05:30
WSO2 Builder
802c83de39 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare for next development iteration 2017-03-29 23:16:15 +05:30
WSO2 Builder
98dda03784 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare release v2.0.38 2017-03-29 23:16:04 +05:30
sinthuja
18583af6b4 Fixing the case where multiple tags were passed for searching the APIs. 2017-03-29 23:07:18 +05:30
WSO2 Builder
f3e119cd78 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration 2017-03-28 12:48:31 +05:30
WSO2 Builder
a8f8a49a80 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37 2017-03-28 12:48:20 +05:30
WSO2 Builder
0e5895ec78 [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration 2017-03-24 12:06:23 +05:30
WSO2 Builder
d6080159cb [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36 2017-03-24 12:06:12 +05:30
WSO2 Builder
3f8f8b3ab9 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration 2017-03-23 18:59:18 +05:30
WSO2 Builder
6a9a5ba9c8 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35 2017-03-23 18:59:07 +05:30
WSO2 Builder
e8ee33e7a4 [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration 2017-03-22 15:24:27 +05:30
WSO2 Builder
6cc898d2ab [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34 2017-03-22 15:24:16 +05:30
WSO2 Builder
a26a4bb539 [WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare for next development iteration 2017-03-22 14:25:54 +05:30
WSO2 Builder
000601911f [WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare release v2.0.33 2017-03-22 14:25:43 +05:30
WSO2 Builder
50c9eb9ba4 [WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare for next development iteration 2017-03-21 20:02:26 +05:30
WSO2 Builder
ca79804c5c [WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare release v2.0.32 2017-03-21 20:02:14 +05:30
WSO2 Builder
a35205c480 [WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare for next development iteration 2017-03-20 16:49:31 +05:30
WSO2 Builder
ac379c9bf9 [WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare release v2.0.31 2017-03-20 16:49:20 +05:30
WSO2 Builder
de25f3afe3 [WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare for next development iteration 2017-03-16 16:59:42 +05:30
WSO2 Builder
55ecafe7f4 [WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare release v2.0.30 2017-03-16 16:59:28 +05:30
WSO2 Builder
15d57f71ad [WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare for next development iteration 2017-03-16 11:10:29 +05:30
WSO2 Builder
3af9e1729a [WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare release v2.0.29 2017-03-16 11:10:11 +05:30
WSO2 Builder
322f39596e [WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare for next development iteration 2017-03-15 18:46:16 +05:30
WSO2 Builder
18244d6c96 [WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare release v2.0.28 2017-03-15 18:46:03 +05:30
WSO2 Builder
12f21868dc [WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare for next development iteration 2017-03-15 18:04:26 +05:30
WSO2 Builder
4328c3c39d [WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare release v2.0.27 2017-03-15 18:04:12 +05:30
WSO2 Builder
c6bb8e0128 [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare for next development iteration 2017-03-14 17:47:54 +05:30
WSO2 Builder
da9002ba9f [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare release v2.0.26 2017-03-14 17:47:43 +05:30
WSO2 Builder
6114f4b2d5 [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare for next development iteration 2017-03-14 15:27:06 +05:30
WSO2 Builder
ea8f19f26d [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare release v2.0.25 2017-03-14 15:26:55 +05:30
WSO2 Builder
d433525145 [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration 2017-03-14 14:09:19 +05:30
WSO2 Builder
35ee3eca3a [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24 2017-03-14 14:09:08 +05:30
WSO2 Builder
4e0afb7d39 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration 2017-03-13 18:09:06 +05:30
WSO2 Builder
33f1448c82 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23 2017-03-13 18:08:55 +05:30
Harshan Liyanage
3ab025a6d8 Merge pull request #631 from ayyoob/cloud-3.1.0
added claimable property and fixed unsecured endpoint bug
2017-03-13 18:03:18 +05:30
WSO2 Builder
e95e96f06c [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration 2017-03-10 13:09:08 +05:30
WSO2 Builder
5d55413e02 [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22 2017-03-10 13:08:55 +05:30
Susinda
40469d0e4d Adding maven.javadoc.skip to org.wso2.carbon.apimgt.integration.generated.client project 2017-03-10 12:57:47 +05:30
Susinda
7083c4ec9b version corrected to 2.0.22-SNAPSHOT 2017-03-09 14:49:49 +05:30
Susinda Perera
bd7d6939e5 Merge pull request #628 from susinda/master
Merging from cloud-3.1.0
2017-03-09 13:58:59 +05:30
Susinda
e83fa8cb02 org.wso2.carbon.apimgt.integration.generated.client version increment 2017-03-09 13:50:15 +05:30
WSO2 Builder
ae3300afde [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration 2017-03-09 13:14:50 +05:30
WSO2 Builder
6646c0c56f [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21 2017-03-09 13:14:38 +05:30
Susinda Perera
7c9659ed29 Merge pull request #1 from susinda/cloud-3.1.0
Cloud 3.1.0
2017-03-09 12:44:36 +05:30
WSO2 Builder
21cdcdd21a [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration 2017-03-09 12:38:02 +05:30
WSO2 Builder
23be60ebd0 [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20 2017-03-09 12:37:49 +05:30
ayyoob
2384755a97 added claimable property and fixed unsecured endpoint bug 2017-03-08 03:14:51 +05:30
ayyoob
964fb7ce72 regenerated swagger api based on apimgt 2.1.0 rest api 2017-03-07 01:56:51 +05:30
ayyoob
525b55d603 avoid race condition by loading tiers 2017-03-06 11:30:22 +05:30
ayyoob
5e4b0564b7 added permission fix for operation and synchronised application creation to avoid duplicate subscription 2017-03-03 17:02:36 +05:30
Susinda
09b74211c4 increment carbon-devicemgt version to 2.0.20 2017-03-02 12:39:19 +05:30
ayyoob
5d3aa49e06 added logger trace support for apim integration service 2017-03-02 00:31:34 +05:30
ayyoob
c088a9bc93 fixed api subscribe issue for device specific app creation 2017-03-01 23:26:17 +05:30
WSO2 Builder
7f98d37835 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration 2017-02-28 21:22:53 +05:30
WSO2 Builder
b03936ca49 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19 2017-02-28 21:19:50 +05:30
WSO2 Builder
82888e1d20 [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration 2017-02-28 21:15:10 +05:30
WSO2 Builder
b11c2e451b [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18 2017-02-28 21:14:44 +05:30
WSO2 Builder
67a091ff5a [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration 2017-02-28 21:12:47 +05:30
WSO2 Builder
dcc2088455 [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17 2017-02-28 21:12:14 +05:30
WSO2 Builder
927b2d451d [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration 2017-02-28 21:00:32 +05:30
WSO2 Builder
dfe9b1ff9c [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16 2017-02-28 21:00:08 +05:30
ayyoob
470500b80e added ssl context 2017-02-27 16:44:21 +05:30
ayyoob
dac7d3c1ee made device management to be default tag 2017-02-09 09:59:06 +05:30
ayyoob
67ae4c7c68 fixed api subscription issue 2017-02-09 09:11:22 +05:30
ayyoob
6c96d228ae added subscription fix 2017-02-09 03:02:56 +05:30
ayyoob
b7566f4e4a added artifact deployment support through UI 2017-02-05 17:51:48 +05:30
ayyoob
274d3e9aeb used jwt grant type instead of saml 2017-02-04 20:51:56 +05:30
Kamidu Sachith Punchihewa
559fe98cc9 Merge pull request #585 from wso2/master
Cloud ui fixes and the new master fixes
2017-02-03 17:24:49 +05:30
WSO2 Builder
54a278a1bc [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration 2017-02-03 16:08:26 +05:30
WSO2 Builder
3bc46c4d2d [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15 2017-02-03 16:08:12 +05:30
WSO2 Builder
1bc8f5c28d [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration 2017-02-02 15:56:43 +05:30
WSO2 Builder
1483503790 [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14 2017-02-02 15:56:36 +05:30
Milan Perera
701d6e4522 Updated the snapshot version of intergration client 2017-02-01 12:55:56 +05:30
Milan Perera
a5f41ef734 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud 2017-02-01 12:14:59 +05:30
ayyoob
38f61adf94 few changes after testing multi tenancy 2017-01-30 22:14:26 +05:30
WSO2 Builder
5dc55bb5b5 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration 2017-01-30 16:05:41 +05:30
WSO2 Builder
c7fe9c3a20 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13 2017-01-30 16:05:29 +05:30
WSO2 Builder
c17bead1fc [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration 2017-01-29 19:46:03 +05:30
WSO2 Builder
14100d3cc8 [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12 2017-01-29 19:45:51 +05:30
Milan Perera
2b4a3cde61 Fixed conflicts and merged 2017-01-26 14:59:05 +05:30
Milan Perera
21d8d14b7e Fixed multy tenancy issues related to android device type 2017-01-26 14:50:12 +05:30
ayyoob
0c4a78f3e9 fixed api Id issue for subscription 2017-01-26 00:02:17 +05:30
ayyoob
3c45f9af11 fixed api Id issue for subscription 2017-01-25 22:15:03 +05:30
ayyoob
159e067fed changed integration client version 2017-01-25 14:03:38 +05:30
ayyoob
b42505c1fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y 2017-01-25 14:01:03 +05:30
ayyoob
1a7a215441 added missing license headers 2017-01-25 14:00:31 +05:30
ayyoob
1370b87618 fixed apim application issue 2017-01-25 09:24:23 +05:30
WSO2 Builder
cd7e0feaa6 [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration 2017-01-24 23:22:44 +05:30
WSO2 Builder
abb150d9bd [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11 2017-01-24 23:22:33 +05:30
ayyoob
7348ae2f2a resolved merge issues 2017-01-24 19:49:40 +05:30
ayyoob
3423ef025d merged with upstream 2017-01-24 19:39:49 +05:30
ayyoob
e74b4e23c4 removed apim dependency from cdmf 2017-01-24 19:32:59 +05:30
WSO2 Builder
002fb8719b [maven-release-plugin] prepare for next development iteration 2017-01-23 20:24:47 +00:00
WSO2 Builder
04f32902fd [maven-release-plugin] prepare release v2.0.10 2017-01-23 20:21:44 +00:00
WSO2 Builder
5c207897ad [maven-release-plugin] prepare for next development iteration 2017-01-20 12:44:14 +00:00
WSO2 Builder
233d14edbd [maven-release-plugin] prepare release v2.0.9 2017-01-20 12:41:33 +00:00
WSO2 Builder
eedecf00ed [maven-release-plugin] prepare for next development iteration 2017-01-19 23:23:04 +00:00
WSO2 Builder
ef57fc463b [maven-release-plugin] prepare release v2.0.8 2017-01-19 23:20:20 +00:00
ayyoob
5927064435 apim seperation 2017-01-18 01:48:07 +05:30
ayyoob
2a538ff959 fixed multi tenant login issue 2017-01-16 16:07:36 +05:30
WSO2 Builder
585b9bde4d [maven-release-plugin] prepare for next development iteration 2017-01-14 01:50:45 +00:00
WSO2 Builder
d206148841 [maven-release-plugin] prepare release v2.0.7 2017-01-14 01:46:41 +00:00
geethkokila
bf8ab0da11 Adding support for identifying the device type from the url 2017-01-13 16:23:47 +05:30
ayyoob
5b3a8091ec fixed Null pointer exception 2017-01-12 23:18:54 +05:30
ayyoob
d4ec0705e7 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-12 19:09:12 +05:30
ayyoob
cdd144237f removed unused parameter 2017-01-12 19:09:01 +05:30
Milan Perera
21c50c9a55 Fixed NPE occurred due to scope mapping 2017-01-12 19:01:57 +05:30
ayyoob
2fbaf31b93 fixed permission and assigned environment variables for url context 2017-01-12 18:13:43 +05:30
Rasika Perera
83aea1fd01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master
# Conflicts:
#	components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
#	components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
#	components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java
#	components/apimgt-extensions/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
#	components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
#	components/certificate-mgt/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
#	components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
#	components/device-mgt-extensions/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PasswordResetWrapper.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/Profile.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ProfileFeature.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Policy.java
#	components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Profile.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/SearchDAO.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/impl/SearchDAOImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationProcessor.java
#	components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedFileProtocolIteratorFactory.java
#	components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedIteratorFactory.java
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/pages/uuf.page.sign-in/sign-in.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
#	components/device-mgt/pom.xml
#	components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
#	components/email-sender/pom.xml
#	components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml
#	components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
#	components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml
#	components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml
#	components/identity-extensions/dynamic-client-registration/pom.xml
#	components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
#	components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/OAuthExtUtils.java
#	components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
#	components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
#	components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
#	components/identity-extensions/pom.xml
#	components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
#	components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
#	components/policy-mgt/pom.xml
#	components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
#	components/webapp-authenticator-framework/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
#	features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
#	features/apimgt-extensions/pom.xml
#	features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
#	features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
#	features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
#	features/certificate-mgt/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
#	features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
#	features/device-mgt-extensions/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
#	features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
#	features/device-mgt/pom.xml
#	features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml
#	features/dynamic-client-registration/pom.xml
#	features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
#	features/email-sender/pom.xml
#	features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
#	features/jwt-client/pom.xml
#	features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
#	features/oauth-extensions/pom.xml
#	features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
#	features/policy-mgt/pom.xml
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
#	features/webapp-authenticator-framework/pom.xml
#	pom.xml
2017-01-08 11:45:46 +05:30
WSO2 Builder
5411d93103 [maven-release-plugin] prepare for next development iteration 2017-01-07 07:48:36 +00:00
WSO2 Builder
3ea83b925a [maven-release-plugin] prepare release v2.0.6 2017-01-07 07:33:45 +00:00
geethkokila
7059ad1243 Changing the package name 2017-01-07 11:21:50 +05:30
geethkokila
2881079b27 Removing two unnecessary classes from the project and adding java documentation to class 2017-01-07 11:06:48 +05:30
Rasika Perera
08ab946e88 Added doc comments 2017-01-07 10:28:25 +05:30
Rasika Perera
a16052431c Corrected a typo on [APIMCertificateMGTException] 2017-01-07 10:26:35 +05:30
Rasika Perera
c2490347b6 Corrected a typo 2017-01-07 10:25:32 +05:30
Joseph Fonseka
a5640f48b5 Changed auth type on API resources as configured in web.xml 2017-01-06 19:41:16 +05:30
Rasika Perera
dfcf72cae0 Merge pull request #518 from geethkokila/mutual_ssl_feature
Adding gateway support for IOS device type
2017-01-06 19:34:36 +05:30
Rasika Perera
8397b688e9 Merge branch 'release-2.0.x' into mutual_ssl_feature 2017-01-06 19:34:25 +05:30
Rasika Perera
bc93d48927 Merge pull request #520 from madhawap/release-2.0.x
fix to WebappPublisherConfig
2017-01-06 19:23:29 +05:30
madhawap
d22de197a1 fix to WebappPublisherConfig 2017-01-06 19:07:49 +05:30
geethkokila
3795a7e30f Removing the hardcoded apis 2017-01-06 17:09:46 +05:30
geethkokila
44c7383b15 Adding support to send ios request the synapse gateway 2017-01-06 17:04:00 +05:30
Milan Perera
228848075c Fixed conflicts and merged 2017-01-06 16:46:42 +05:30
Milan Perera
42a587904f Fixed issues in permission-scope mapping 2017-01-06 16:10:52 +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
Rasika Perera
8706636b51 Merge pull request #511 from ayyoob/release-2.0.x
Made Policy Monitoring for device type to be multitenance & Added default values for push notification dynamic configuration
2017-01-06 14:15:21 +05:30
inoshperera
e6a70b2394 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-06 11:35:34 +05:30
inoshperera
11d2ecac10 removing basic auth headers from API definitions. 2017-01-06 11:34:48 +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
ayyoob
b20a2e0997 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-05 17:51:34 +05:30
ayyoob
c69513e0f5 removed tenant domain from the web.xml 2017-01-05 17:51:23 +05:30
Milan Perera
f3409adc21 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-05 12:41:22 +05:30
Milan Perera
7b8a7c0b52 Merge pull request #1 from GPrathap/release-2.0.x
removed setting APIs secured as default.
2017-01-05 11:58:52 +05:30
Maninda
0fb5a577b8 Fixed some issues found in FindBugs security analysis. 2017-01-05 11:47:09 +05:30
inoshperera
c4a2ba0cea adding http api publisher for Android agent to work out of the box 2017-01-04 16:54:46 +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
GPrathap
f508bcfd0e corrected method name 2017-01-01 22:03:50 +05:30
GPrathap
649879f998 removed setting APIs secured as default.
Because if secured is enabled, it is to be needed to provided parameters which are related to basic oauth, when this is false, jwt token is being used.
2017-01-01 21:13:53 +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
Ace
1d2a5dc9ef Updating identity/auth-saml dependencies to latest 2016-12-22 10:58:59 +05:30
geethkokila
83b9fd46cd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-20 16:59:03 +05:30
Rasika Perera
a633547d19 IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext 2016-12-20 13:03:19 +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
Ace
47d8baccf7 upgrading to latest version of identity 2016-12-19 11:38:03 +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
geethkokila
200740eca6 Partial commit for the git update 2016-12-19 09:58:19 +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
Megala
d4e9c43ff1 Fixing race condition in creating and subscribing application in api-manager side 2016-12-16 14:13:40 +05:30
amalhub
7e90fde461 IOTS-292: Adding new filter configs 2016-12-14 15:23:59 +05:30
amalhub
0bd298e6d7 IOTS-292: Code refactoring 2016-12-14 15:23:48 +05:30
amalhub
871970002a IOTS-292: Adding android cert verification for gateway handler 2016-12-14 15:23:36 +05:30
amalhub
610163d705 IOTS-292: Adding IOS synapse config for gatway change 2016-12-14 15:23:24 +05:30
amalhub
d00817268e IOTS-292: Adding the api-mgt handler for gateway change 2016-12-14 15:23:04 +05:30
Milan Perera
bcbf61a886 Fixed conflicts 2016-12-14 08:50:17 +05:30
Milan Perera
36ee55f493 Implemented permission-scope mapping for IoTs 2016-12-14 08:45:42 +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
d911281ad1 Merging master branch with release-2.0.x 2016-12-08 12:34:50 +05:30
GPrathap
7807ed77da removed hardcoded validity period while creating application in APIM 2016-12-05 09:50:10 +05:30
WSO2 Builder
df4c13ec72 [maven-release-plugin] prepare for next development iteration 2016-12-05 08:35:51 +05:30
WSO2 Builder
1677beecac [maven-release-plugin] prepare release v2.0.2 2016-12-05 08:35:51 +05:30
GPrathap
c969013ca2 added new property : validity Period 2016-11-30 12:33:36 +05:30
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
ayyoob
3fb42ef32e Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-21 19:16:32 +05:30
ayyoob
fede8ec409 few changes after testing with authoriser 2016-11-21 19:13:59 +05:30
GPrathap
6efc5bc1ed removed @API and @Permission annotations 2016-11-20 19:10:45 +05:30
ayyoob
fe263efe60 changed device access verification approach 2016-11-20 02:37:37 +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
charitha
ac30e7eb3e Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
2016-11-01 14:47:21 +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
ayyoob
3140c36f7b added missing license headers 2016-10-25 13:57:16 +05:30
sinthuja
a6203845c9 Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service. 2016-10-24 16:37:00 +05:30
sinthuja
00e57bd800 Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service. 2016-10-24 16:31:41 +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
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
ayyoob
852ea00403 refactored method name 2016-10-09 19:10:43 +05:30
ayyoob
5727886ea1 few changes after apimgt integration 2016-10-09 03:16:02 +05:30
harshanl
b1e140b58e Removed unnecessary imports 2016-09-30 10:58:00 +05:30
Chatura Dilan Perera
c16cc4cae1 [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032 [maven-release-plugin] prepare release v1.2.2 2016-09-29 20:32:59 +05:30
Ace
154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
2016-09-22 19:08:21 +05:30
Chatura Dilan Perera
50d8885f8b [maven-release-plugin] prepare for next development iteration 2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4 [maven-release-plugin] prepare release v1.2.1 2016-09-19 18:54:38 +05:30
Ace
6a8a5cbd5a Merging with master 2016-09-19 12:21:41 +05:30
Ace
1dfb8e22e1 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:09 +05:30
Chatura Dilan Perera
de23a8cf27 [maven-release-plugin] prepare for next development iteration 2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9 [maven-release-plugin] prepare release v1.2.0 2016-09-09 20:18:12 +05:30
Chatura Dilan Perera
2d5262e21e [maven-release-plugin] prepare for next development iteration 2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404 [maven-release-plugin] prepare release v1.2.0 2016-09-09 17:10:04 +05:30
mharindu
115099c8fe Implemented permission based authorization 2016-09-09 02:56:21 +05:30
mharindu
24930b3042 Partial commit of migration 2016-09-05 16:37:09 +05:30
mharindu
d7e8cc30dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7 2016-08-24 14:56:06 +05:30
Chatura Dilan Perera
8b17cbb339 Fix conflicts 2016-08-19 15:00:57 +05:30
Chatura Dilan Perera
654e1d9938 [maven-release-plugin] prepare for next development iteration 2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667 [maven-release-plugin] prepare release v1.1.2 2016-08-18 22:09:33 +05:30
ayyoob
892d5cee20 avoided lazy inialization 2016-08-15 15:13:39 +05:30
mharindu
f5609cc8ff Adding carbon 4.4.7 migration changes 2016-08-11 12:19:05 +05:30
mharindu
bd41e4f4fb Implemented scope based authorization in device-mgt UI module 2016-08-09 19:08:07 +05:30
mharindu
acf6d7ecd7 Fixed conflicts and merged 2016-08-08 10:42:30 +05:30
mharindu
ed4c762bfd Refactored scopes 2016-08-04 17:46:46 +05:30
Prabath Abeysekara
cc90bef42b Merge pull request #318 from Securepoint/master
Minor bug fixies and code improvements
2016-08-03 14:12:24 +05:30
mharindu
564c2b280e Fixed conflicts and merged 2016-07-26 16:38:51 +05:30
mharindu
19275634a1 Fixed webapp name resolving issue 2016-07-25 12:04:30 +05:30
mharindu
827567733c Fixed scope update issue in API update 2016-07-22 16:41:40 +05:30
mharindu
bdec8880bb Fixed conflicts and merged 2016-07-18 20:22:27 +05:30
mharindu
9932f061fb Fixed webapp name resolving issue 2016-07-18 20:09:16 +05:30
mharindu
186432e1df Fixed webapp name resolving issue 2016-07-18 20:08:51 +05:30
Timo Briddigkeit
ed07774552 Fixed literal string comparison.
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");

A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
2016-07-15 16:25:31 +02:00
Timo Briddigkeit
ee5b077e6a Fixed various XML External Entity (XXE) attack vulnerabilities 2016-07-13 15:02:11 +02:00
mharindu
0f904e21d8 Fixed conflicts and merged 2016-07-11 22:12:15 +05:30
Chatura Dilan
4ec11e8c08 [maven-release-plugin] prepare for next development iteration 2016-07-08 19:11:40 +05:30
Chatura Dilan
ffedcac543 [maven-release-plugin] prepare release v1.1.1 2016-07-08 19:09:55 +05:30
mharindu
ac75ff1d71 Fixed conflict and merged 2016-07-03 15:09:05 +05:30
mharindu
49623a4693 Implemented scope based authorization 2016-07-03 15:03:47 +05:30
prabathabey
49ce42b797 Code cleanup 2016-06-30 18:19:11 +05:30
Ruwan
6ce7f8c65a Merge pull request #307 from ayyoob/transport
Few changes added after testing with the cluster
2016-06-27 09:39:17 +05:30
ayyoob
ba6e202442 Few changes added after testing with the cluster 2016-06-27 00:12:46 +05:30
prabathabey
aeb4ad3295 Merging rest-api-improvements branch to master 2016-06-21 15:52:35 +05:30
ayyoob
52e84273d1 added profile check before publishing apis 2016-06-08 22:38:49 +05:30
inoshperera
3c73217e96 fixing osgi issue related to usage of carbon context. And adding api publishing check from config. 2016-05-27 19:15:46 +05:30
ayyoob
c9cd051a6b subscribed to super tenant apis 2016-05-27 02:20:15 +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
ayyoob
feaf6b2b35 added webapp publisher missing bundle 2016-05-24 15:35:48 +05:30
mharindu
50d35a90f8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-23 16:51:38 +05:30
mharindu
66ccad65cf Partial commit for APIM Gateway migration 2016-05-23 16:51:26 +05:30
mharindu
3e291c5b13 [maven-release-plugin] prepare for next development iteration 2016-05-20 16:43:16 +05:30
mharindu
9549ac446b [maven-release-plugin] prepare release v1.1.0 2016-05-20 16:43:02 +05:30
mharindu
2dbcf86f3d Added retrying mechanism to webapp publisher 2016-05-20 15:52:50 +05:30
mharindu
968cb00f35 Fixed conflicts and merged 2016-05-19 00:42:14 +05:30
mharindu
83c2a1f0ee Fixed issues in api publishing 2016-05-19 00:30:41 +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
ayyoob
2ceff61811 refactors jet authenticator to pick tenant specific key store 2016-05-16 19:44:31 +05:30
mharindu
83ec18c38d Removed external dependancies from webapp publisher component 2016-05-16 14:20:34 +05:30
mharindu
c68b92c7b4 Fixed conflicts 2016-05-16 14:12:28 +05:30
mharindu
9a4b904702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-16 11:55:35 +05:30
mharindu
659cdcc50c Implemented extended scope validator and improved webapp publisher to support Synapse 2016-05-16 11:47:04 +05:30
mharindu
f2ac5c5cad Implemented extended scope validator and improved webapp publisher to support Synapse 2016-05-16 11:46:30 +05:30
Ace
cbc505c459 changing profile name 2016-05-15 01:35:57 +05:30
Ace
4517a7f1aa Making API publish destination configurable and other changes 2016-05-15 01:15:11 +05:30
Ace
6d9f2f92a4 Making API publish destination configurable 2016-05-15 01:12:45 +05:30
mharindu
5ad8d2938e Fixed issues of publishing APIs to synapse gateway 2016-05-11 10:50:32 +05:30
mharindu
6db9b21623 Code cleanup in webapp publisher 2016-04-28 14:49:34 +05:30
mharindu
6f8bb64e1c Fixed merge conflicts 2016-04-28 11:59:03 +05:30
mharindu
ffc7542d4d Modified authorization to support API gateway 2016-04-28 11:36:34 +05:30
Ace
a06327b731 refactoring and bug fixes 2016-04-27 20:43:13 +05:30
Ace
985d07cbc7 Cleaning up code 2016-04-27 14:53:12 +05:30
ayyoob
64bd0fc061 removed fix for web app publishing start up issue when synapse gateway is used 2016-04-18 17:16:51 +05:30
ayyoob
12db341d33 few changes on web app publisher after testing 2016-04-18 03:00:06 +05:30
ayyoob
d3418462d9 few changes in api manager application registration 2016-04-17 12:18:49 +05:30
ayyoob
9d4defaa01 check whether the subscriber exist before creating 2016-04-15 23:10:11 +05:30
ayyoob
afe965e787 adding code review changes on JWT and API App registration 2016-04-14 19:55:55 +05:30
ayyoob
1b4a9227d8 merged web app publisher code and refactored jwt client extension to adhere to new artefact name 2016-03-31 04:24:30 +05:30
charithag
40f863fd57 Fix bundle imports for java 8 2016-03-30 10:00:56 +05:30
charithag
3e4ccf6337 Add missing features and component from IoTS-1.0.0-M4 2016-03-30 01:44:04 +05:30
geethkokila
e9da24c9e8 Changing the snapshot versions from 1.0.4 to 1.1.0 2016-03-24 11:41:52 +05:30
geethkokila
e0e0a57c11 [maven-release-plugin] prepare for next development iteration 2016-01-05 18:15:38 +05:30
geethkokila
cebb88e712 [maven-release-plugin] prepare release v1.0.3 2016-01-05 18:15:28 +05:30
geethkokila
e66d291947 [maven-release-plugin] prepare for next development iteration 2015-12-30 14:19:05 +05:30
geethkokila
f416a73e75 [maven-release-plugin] prepare release v1.0.2 2015-12-30 14:18:57 +05:30
geethkokila
185a59fbd4 [maven-release-plugin] prepare for next development iteration 2015-12-23 22:39:29 +05:30
geethkokila
b3580d754b [maven-release-plugin] prepare release v1.0.1 2015-12-23 22:39:20 +05:30
geethkokila
4e9255fbc9 [maven-release-plugin] prepare for next development iteration 2015-12-22 08:28:42 +05:30
geethkokila
ceb60adb34 [maven-release-plugin] prepare release v1.0.0 2015-12-22 08:28:33 +05:30
Kamidu Sachith
2d23eb86eb Improve runtime performance 2015-12-21 16:38:42 +05:30
harshanl
1c8bb7551d Refactored Dynamic-client registration service to use AppMgt osgi service 2015-10-07 23:15:17 +05:30
harshanl
302eb3a8a9 Merged changes 2015-10-07 00:00:28 +05:30
harshanl
648d8ec209 Added OAuth scope validator & fixed DataHolders 2015-10-05 11:28:47 +05:30
prabathabey
bce52e54a3 Upgrading dependency versions to their respective latests 2015-10-01 19:24:48 +05:30
prabathabey
dc2680ac5e Making APIPublisher util compose the relevant API endpoint url programmatically 2015-09-02 21:21:51 +05:30
prabathabey
256c42243f Improving APIPublisher implementation 2015-09-02 21:12:06 +05:30
prabathabey
9288e3846d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 20:26:01 +05:30
prabathabey
4334994b36 Fixing issues encountered in APIPublisher implementation 2015-09-02 20:25:52 +05:30
harshanl
d7ea5625bc Fixed apimgt publisher component issues 2015-09-02 20:24:33 +05:30
prabathabey
b298407160 Fixing improper parent configurations found in apimgt.extensions component and feature 2015-07-25 13:29:57 +05:30
prabathabey
1716c2c7f6 Making apimgt extensions module a separate component/feature pair 2015-07-25 12:41:18 +05:30