Commit Graph

4651 Commits

Author SHA1 Message Date
Megala
4fdeec89cc Revert f3f7635d3b 2017-03-02 15:11:59 +05:30
Milan Perera
2a250371a2 Merge pull request #619 from ayyoob/cloud-3.1.0
added logger trace and made api app registration to be device type specific
2017-03-02 14:33:56 +05:30
ayyoob
d66e439f49 added carbon local ip as config 2017-03-02 14:05:57 +05:30
Susinda Perera
44904b6601 Merge pull request #618 from susinda/3.1.0-test
increment carbon-devicemgt version to 2.0.20
2017-03-02 12:40:16 +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
charitha
abdffdbf39 Add tenant id to Enrollment Certificate 2017-02-28 21:18:46 +05:30
charitha
14dfc1b538 Fix minor issues found with jmeter tests 2017-02-28 21:18:22 +05:30
madhawap
f1b761d987 Minor code formating 2017-02-28 21:16:56 +05:30
Kamidu Sachith Punchihewa
8e530b0523 adding the removed tenant based token handlers 2017-02-28 21:16:21 +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
lakshani
eb12e5b9f1 Adding commit 'added java doc comments' 2017-02-28 21:11:15 +05:30
lakshani
9e5574dccc Adding commit 'added change device status to device view page' 2017-02-28 21:09:05 +05:30
lakshani
3f90b403c0 Adding lakshani's commit 'updated device status button' 2017-02-28 21:03:53 +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
charitha
7374a0825d Fix https://wso2.org/jira/browse/IOTS-436 2017-02-28 20:56:32 +05:30
charitha
d2991585aa Applying charithas commit on IOTS-436 2017-02-28 20:56:25 +05:30
WSO2 Builder
13bb9aebf7 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration 2017-02-28 15:08:01 +05:30
WSO2 Builder
937d283052 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19 2017-02-28 15:07:51 +05:30
Geeth
58d47928fb Merge pull request #584 from charithag/IOT-436
Fix https://wso2.org/jira/browse/IOTS-436
2017-02-28 15:01:07 +05:30
charitha
8ad49c86f8 Add tenant id to Enrollment Certificate 2017-02-28 14:59:29 +05:30
charitha
b5768dde11 Fix minor issues found with jmeter tests 2017-02-28 14:49:06 +05:30
charitha
8e033e86e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-02-27 16:47:51 +05:30
ayyoob
470500b80e added ssl context 2017-02-27 16:44:21 +05:30
Geeth
54e5203612 Merge pull request #617 from madhawap/master
Minor code formating
2017-02-24 23:29:12 +05:30
madhawap
e0c5ff78fa Minor code formating 2017-02-24 23:24:00 +05:30
Geeth
264cd7e1f1 Merge pull request #592 from geethkokila/cloud-3.1.0
Fixing the task to get the only device registered tenants
2017-02-24 12:33:14 +05:30
geethkokila
e90dc8b6c1 Fixing the compile error 2017-02-24 12:32:00 +05:30
geethkokila
d8303356cd Fixing the conflicts 2017-02-24 12:16:14 +05:30
Kamidu Sachith Punchihewa
96bdb7c4ae Merge pull request #616 from Kamidu/cloud-3.1.0
Cloud 3.1.0
2017-02-20 18:21:58 +05:30
kamidu
b7e3b28722 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-20 18:20:14 +05:30
kamidu
4e16e29b1c removing group sharing 2017-02-20 18:20:04 +05:30
Geeth
349e1448eb Merge pull request #615 from DimalChandrasiri/cloud-3.1.0
Removed analytics link temporarily
2017-02-20 17:33:46 +05:30
Imesh Chandrasiri
3c90f8ad49 temporary removal of view analytics 2017-02-20 17:19:20 +05:30
Imesh Chandrasiri
8cf92e8a5b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-20 15:11:08 +05:30
Imesh Chandrasiri
a938d57a65 Removing analytics link from groups listing 2017-02-20 15:11:00 +05:30
Kamidu Sachith Punchihewa
ee4ab2fda8 Merge pull request #614 from Kamidu/master
adding the removed tenant based token handlers
2017-02-19 22:12:56 +05:30
Kamidu Sachith Punchihewa
66baa3a71b adding the removed tenant based token handlers 2017-02-19 22:11:28 +05:30
Kamidu Sachith Punchihewa
587c798f09 Merge pull request #613 from Kamidu/cloud-3.1.0
remove tennent related token handlers
2017-02-19 21:49:58 +05:30
Kamidu Sachith Punchihewa
4a5c99af78 remove tennent related token handlers 2017-02-19 21:49:19 +05:30
Kamidu Sachith Punchihewa
f03d701c24 Merge pull request #612 from DimalChandrasiri/cloud-3.1.0
Temporary advance search removal commit
2017-02-19 19:39:13 +05:30
Imesh Chandrasiri
5097416d69 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-19 19:34:35 +05:30
Imesh Chandrasiri
368647f176 Temporary advance search removal commit 2017-02-19 19:34:28 +05:30