2238 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
sinthuja	e42744eb4d	Merge pull request #1340 from Nirothipan/master ... Fixes for [EMM-1816] By default https://localhost:9443/ redirect to carbon console - redirect to /emm instead	2017-08-29 10:13:16 +05:30
Nirothipan	bb68e6d59c	redirecting default url from cabon home to devicemgt	2017-08-28 18:58:02 +05:30
Ruwan	975954e0cc	Merge pull request #1337 from geethkokila/master ... Fixing the instrumentations dependencies	2017-08-28 13:21:11 +05:30
geethkokila	f390f3695d	Fixing the instrumentations dependencies	2017-08-28 12:04:55 +05:30
WSO2 Builder	224ae5a7f6	[maven-release-plugin] prepare for next development iteration	2017-08-23 05:55:38 +00:00
WSO2 Builder	667a23c03f	[maven-release-plugin] prepare release v3.1.0-update1	2017-08-23 05:54:14 +00:00
Harshan Liyanage	688df8cb48	Merge pull request #1328 from ruwany/master ... Correcting kernel version	2017-08-23 10:34:12 +05:30
Ace	d50986b6ac	Correcting kernel version	2017-08-23 10:35:43 +05:30
Madhawa Perera	09761b2c1a	Merge pull request #1327 from ruwany/master ... Updating devicemgt core and plugin dependencies	2017-08-22 15:09:38 -04:00
Ace	21a3d56cc9	Updating devicemgt core and plugin dependencies	2017-08-23 00:32:24 +05:30
Geeth	55bbc8219e	Merge pull request #1310 from milanperera/f-master ... prepare for next development iteration	2017-08-18 10:19:44 +05:30
Milan Perera	975da56316	prepare for next development iteration	2017-08-18 10:13:48 +05:30
Kamidu Sachith Punchihewa	af1e9ace45	Merge pull request #1294 from sameerawickramasekara/master ... New sample device type from Java code	2017-08-16 11:27:09 +05:30
Sameera Wickramasekara	6b4f3d0373	Trim deviceId to remove extra spaces	2017-08-14 17:41:41 +05:30
Sameera Wickramasekara	273cb989d4	Add new device type sampledevice	2017-08-14 17:17:57 +05:30
Sameera Wickramasekara	7450910748	remove raspberrypicodebased devicetype	2017-08-14 17:15:51 +05:30
WSO2 Builder	e7706289ff	[maven-release-plugin]prepare for next development iteration	2017-08-11 09:56:41 +00:00
WSO2 Builder	526a8b95f3	[maven-release-plugin]prepare release v3.1.0-RC4	2017-08-11 09:55:17 +00:00
Geeth	3500937e95	Merge pull request #1297 from milanperera/release-master ... Upgraded carbon core and plugins versions	2017-08-11 14:33:26 +05:30
Milan Perera	310ddd814d	Upgraded carbon core and plugins versions	2017-08-11 14:31:12 +05:30
Sameera Wickramasekara	ed0b110ad6	Fix code formatting	2017-08-11 11:35:58 +05:30
WSO2 Builder	682babe830	[maven-release-plugin]prepare for next development iteration	2017-08-10 22:47:42 +05:30
WSO2 Builder	4b85767d39	[maven-release-plugin]prepare release v3.1.0-RC4	2017-08-10 22:47:28 +05:30
Rasika Perera	bdaf5b016b	Merge pull request #1292 from milanperera/release-master ... Upgraded carbon.core and plugin versions	2017-08-10 21:15:30 +05:30
Milan Perera	7e73c601b0	Upgraded carbon.core and plugin versions	2017-08-10 21:13:07 +05:30
Madawa Soysa	3bc6e2716e	Merge pull request #1291 from milanperera/release-master ... Modified change-ip script	2017-08-10 18:54:19 +05:30
Milan Perera	1b7c7860d7	Modified change-ip script ... change-ip script has been modified to use same keystores across all three profiles in order to support carbon level server to server authentication	2017-08-10 18:51:33 +05:30
Rasika Perera	5ba3df6499	Merge pull request #1287 from evilkid/patch-1 ... Update change-ip.sh	2017-08-10 18:05:40 +05:30
Sameera Wickramasekara	3d359642bf	Add new raspberrypicodebased device type to samples	2017-08-10 16:56:40 +05:30
Ouerghi Yassine	0f91ebfb3f	Update change-ip.sh	2017-08-10 02:15:13 +01:00
warunalakshitha	a9a1b2c066	Merge branch 'master' of https://github.com/wso2/product-iots into remote-control	2017-08-09 18:24:05 +05:30
madhawap	f3a5ee59f5	Updated carbon device mgt and plugins versions	2017-08-09 18:24:04 +05:30
Madhawa Perera	f400cc417e	Merge pull request #1282 from milanperera/iot-master ... Modified change-ip script	2017-08-09 14:21:14 +05:30
warunalakshitha	8513714247	Merge branch 'master' of https://github.com/wso2/product-iots into remote-control	2017-08-09 12:15:35 +05:30
warunalakshitha	253b5faac5	add remote session control feature to product	2017-08-09 12:08:47 +05:30
Milan Perera	5075019288	Modified change-ip script ... Change analytics and broker's ip/domain through carbon.xml	2017-08-09 11:36:52 +05:30
Madhawa Perera	a75d03a7da	Merge pull request #1279 from lasanthaDLPDS/master ... improving text arrangement in 'change-ip.sh' script	2017-08-08 14:50:54 +05:30
lasantha	20a7f5685f	improving text arrangement in 'change-ip.sh' script	2017-08-08 12:17:53 +05:30
madhawap	e179be2f2a	Updated carbon device mgt and plugins versions	2017-08-08 05:38:13 +05:30
Milan Perera	bfc0612f20	Merge pull request #1275 from lasanthaDLPDS/master ... improving change-ip.sh script	2017-08-07 13:02:59 +05:30
lasantha	74aec0eb54	improving change-ip.sh script	2017-08-07 09:55:23 +05:30
Geeth	848e3a9f6f	Merge pull request #1274 from milanperera/iot-master ... Added jwt public cert to client truststore	2017-08-06 23:10:16 +05:30
Milan Perera	dd9bd7d3b3	Merge branch 'master' of https://github.com/wso2/product-iots into iot-master	2017-08-06 23:05:14 +05:30
Milan Perera	907ab4b87d	Added jwt public cert to client truststore from the change-ip scipt	2017-08-06 23:03:54 +05:30
Madhawa Perera	422a761f33	Merge pull request #1267 from milanperera/iot-master ... Modifying change-ip script	2017-08-04 12:32:16 +05:30
Milan Perera	089cf7fa5d	Merge remote-tracking branch 'upstream/master' into iot-master	2017-08-03 18:51:30 +05:30
Harshan Liyanage	a29d9a0e93	Merge pull request #1269 from sameeragunarathne/master ... fixes https://github.com/wso2/product-iots/issues/1268 : [H2 / Analyt…	2017-08-03 17:57:52 +05:30
sameera910409	d5eb514271	fixes https://github.com/wso2/product-iots/issues/1268 : [H2 / Analytics] Identity/h2.sql script is missing in analytics profile	2017-08-03 16:54:40 +05:30
WSO2 Builder	2ce8881cbc	[maven-release-plugin]prepare for next development iteration	2017-08-03 13:43:12 +05:30
WSO2 Builder	4003c98a45	[maven-release-plugin]prepare release v3.1.0-RC4	2017-08-03 13:42:58 +05:30