Commit Graph

1435 Commits

Author SHA1 Message Date
WSO2 Builder
cbf7dd8dce [maven-release-plugin]prepare release v3.1.0-alpha 2017-06-23 23:06:36 +05:30
madhawap
2d0104ee10 version changes 2017-06-23 21:58:05 +05:30
madhawap
8b868688ec version changes 2017-06-23 21:38:31 +05:30
sinthuja
c69f74ad2b Updating the source/target JDK versions to 1.8. 2017-06-23 18:13:44 +05:30
sinthuja
ff6642b5ba Adding the executable permission for the mobile qsg script. 2017-06-23 17:23:49 +05:30
sinthuja
f9fb51b671 Updating the qsg script out dated readme. 2017-06-23 17:21:13 +05:30
sinthuja
2803ba29e7 Merge branch 'pr1049' into origin-master
# Conflicts:
#	modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
2017-06-23 17:10:14 +05:30
thisaripatabendi
dd5f4861eb Fixing connected-cup issues. 2017-06-23 16:49:20 +05:30
sinthuja
9bdd2d766f Merge pull request #1048 from dunithd/master
Applying new UX for connected cup device details page
2017-06-23 16:48:35 +05:30
thisaripatabendi
67a6eb0db4 Fixing connected-cup issues. 2017-06-23 16:34:56 +05:30
Ruwan
93f5ed77f0 Merge pull request #1045 from ayyoob/devicetype-3.1.0
temporary fix for api verfication issue in integration test
2017-06-23 15:56:24 +05:30
sinthuja
0b85c80701 Updating the license headers. 2017-06-23 15:51:30 +05:30
sinthuja
cbd4507648 Adding missing connected cup version in the root pom.xml. 2017-06-23 15:30:53 +05:30
dunithd
ee680cfec8 Applying new UX for connected cup device details page 2017-06-23 15:27:23 +05:30
sinthuja
8afe1d5245 Cleaning up the files pom files. 2017-06-23 15:25:45 +05:30
sinthuja
cfe3e59ce3 Removing the unused file device-type, and removing datasource configs from UI feature. 2017-06-23 15:14:04 +05:30
sinthuja
2aad4c7bd4 Updating the coffeeking version as the bundle version. 2017-06-23 15:01:54 +05:30
sinthuja
1773b64d20 Reverting the change done for device type. 2017-06-23 14:08:19 +05:30
ayyoob
8cd1f815e4 temporary fix for api verfication issue 2017-06-23 13:50:25 +05:30
sinthuja
9d866509bd Merge branch 'wso2-master' into test-merge 2017-06-23 13:19:32 +05:30
sinthuja
5aa641183b Fixing some path issue in device type deployables. 2017-06-23 13:09:37 +05:30
sinthuja
c6876695fc Seperating the connected cup feature into backend, api, ui features as recommended feature structure. 2017-06-23 12:54:23 +05:30
sinthuja
5483532882 Fixing some version problem in the connected cup sample. 2017-06-23 11:47:39 +05:30
sinthuja
a8b4699cb9 Fixing intermittent NPE in mobile QSG 2017-06-23 11:05:32 +05:30
ayyoob
8c4f13ee48 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-23 04:12:26 +05:30
ayyoob
32c54e0ab6 adding client truststore key store - temporariy fix until kernel 4.4.17 is released 2017-06-23 04:07:25 +05:30
sinthuja
c04b8e7872 Fixing the old references of the plugins-deployer, and owsap log in the integration tests. 2017-06-22 23:26:45 +05:30
sinthuja
099ce78ea3 Adding missing http push notification extension. 2017-06-22 22:56:09 +05:30
sinthuja
eb473cb7ea Fixing the integration tests with modified plugin-deployer.xml name 2017-06-22 22:03:12 +05:30
ayyoob
5969d413ac moved to released version 2017-06-22 21:57:32 +05:30
sinthuja
b363714446 fixing the issue in creating the connected cup instance. 2017-06-22 20:45:52 +05:30
sinthuja
602e012e2e committing the intermediate changes. 2017-06-22 18:11:52 +05:30
Geeth
911d001aa6 Merge pull request #1034 from sinthuja/test-merge
Fixing  https://github.com/wso2/product-iots/issues/776.
2017-06-22 14:45:00 +05:30
sinthuja
56cbef3f35 Fixing https://github.com/wso2/product-iots/issues/776. 2017-06-22 14:23:05 +05:30
ayyoob
cc94c0b29a few test case fixes 2017-06-22 06:50:39 +05:30
Harshan Liyanage
c240fb9a71 Merge branch 'master' of https://github.com/wso2/product-iots 2017-06-21 18:34:03 +05:30
Harshan Liyanage
0a7e33961a Fixed sample-deployer issues which resolves wso2/product-iots#458 2017-06-21 18:33:39 +05:30
Rasika Perera
d48b7d4939 Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not copied 2017-06-21 14:52:25 +05:30
ayyoob
6d941a6e72 few fixes on test case 2017-06-20 19:32:51 +05:30
ayyoob
76ddf4fe57 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-17 19:33:14 +05:30
ayyoob
5f80490332 added device type test case 2017-06-17 18:54:59 +05:30
Rasika Perera
c2b573b32c Adding geo fencing 2017-06-16 16:15:15 +05:30
Geeth
ef8ce3e1c6 Merge pull request #1016 from sinthuja/test-merge
Fixing the issues in cipher tool.
2017-06-15 14:19:13 +05:30
sinthuja
b59aec2e48 Fixing the license year in script files. 2017-06-15 13:51:59 +05:30
sinthuja
760f35f912 Merge branch 'wso2-master' into test-merge 2017-06-15 13:42:56 +05:30
sinthuja
38963cb807 Fixing #1003. 2017-06-15 13:42:18 +05:30
ayyoob
bf02c6ccb7 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-15 10:00:56 +05:30
ayyoob
f167b20192 updated migration db queries 2017-06-15 09:47:46 +05:30
Ace
e2def31fdf Increasing timeout 2017-06-14 19:19:56 +05:30
ayyoob
4e248659ed Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-14 13:23:59 +05:30
ayyoob
72b66504f4 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-14 13:23:48 +05:30
Ace
8890408f38 Optimizing server start up time when running integration tests 2017-06-14 12:37:46 +05:30
Ace
a75f6bc12e Fixing test failure 2017-06-13 17:12:06 +05:30
sinthuja
6ac04eba48 Fixing https://github.com/wso2/product-iots/issues/1000. 2017-06-13 12:56:24 +05:30
sinthuja
2fc5104043 Fixing https://github.com/wso2/product-iots/issues/522. 2017-06-13 12:19:13 +05:30
Ace
e6850a2b2b increasing timeout for test 2017-06-12 17:20:00 +05:30
ayyoob
8ddac1d037 merged with origin 2017-06-12 11:50:45 +05:30
megala21
6b5d4bf05f Increasing the timeout 2017-06-10 23:46:24 +05:30
ayyoob
fcfd39f54d Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-08 14:45:36 +05:30
ayyoob
bcffd2d41e adding http push notification feature 2017-06-08 14:40:18 +05:30
Janak Amarasena
c3ad20b18a Add new supported grant type 2017-06-07 14:26:29 +05:30
ayyoob
d4ff9da16d updated migration script 2017-06-06 11:01:16 +05:30
GDLMadushanka
d376a91745 JavaDocs added 2017-06-06 10:44:24 +05:30
GDLMadushanka
43d8dc38b1 Clean up code 2017-06-06 07:49:42 +05:30
GDLMadushanka
5c782a6c15 CarbonServerManager moved to IOTS from platform integration test tools 2017-06-05 16:40:45 +05:30
ayyoob
5785ee1072 intial commit for db migration from 3.0.0 - 3.1.0 2017-06-05 00:13:52 +05:30
ayyoob
12837efd6d renamed content validator type name 2017-06-04 06:53:21 +05:30
ayyoob
80ecba8528 migrated new kernel and mb version 2017-06-01 10:47:59 +05:30
ayyoob
1a5c3ab51f Merge branch 'master' of https://github.com/wso2/product-iots 2017-05-29 05:46:34 +05:30
ayyoob
2ed4b2dfb6 added default purge configuration 2017-05-29 05:45:55 +05:30
megala21
976bdb2292 Fixing issues 2017-05-23 12:03:05 +05:30
megala21
ee94b8ce8f Adding initial cut virtual fire-alarm policy publish scenario 2017-05-23 01:42:11 +05:30
megala21
1aadd2b171 Adding initial test cases for virtual fire alarm 2017-05-21 01:07:10 +05:30
megala21
70763e42c2 Merge remote-tracking branch 'upstream/master' into test_case_fixes 2017-05-16 20:21:00 +05:30
megala21
1178869ef3 Updating versions 2017-05-16 20:20:55 +05:30
Ayyoob Hamza
5334745d0b Merge pull request #448 from sinthuja/test-merge
Removing some unnecessary features from the profiles.
2017-05-16 16:21:02 +05:30
sinthuja
b2495ad414 Fixing the formatting issue. 2017-05-16 15:23:44 +05:30
sinthuja
52fb2f732f Fixing the formatting issue. 2017-05-16 15:22:14 +05:30
sinthuja
df48dbd3c0 Fixing the formatting issue. 2017-05-16 15:18:42 +05:30
sinthuja
955294135a Moving the config files to the key manager profile. 2017-05-16 15:08:14 +05:30
sinthuja
28cc40db78 Removing unwanted features from profiles. 2017-05-16 15:01:16 +05:30
megala21
974a113ac3 Resolving conflicts 2017-05-16 14:39:17 +05:30
megala21
8ee4c2dbba Adding test cases for quick start guide 2017-05-16 14:36:11 +05:30
megala21
2338043eee Fixing test case failure 2017-05-16 10:08:13 +05:30
megala21
79a4f58929 Fixing issue in tenant-conf.json copying location 2017-05-16 09:06:27 +05:30
megala21
19b06bc8bc Adding android sense test cases 2017-05-15 00:31:24 +05:30
ayyoob
408f392af2 merged with origin 2017-05-09 19:46:59 +05:30
ayyoob
d8620a0088 merged with origin 2017-05-09 19:33:05 +05:30
ayyoob
1c2d1ef231 added filter properties to pick plugins version from parent pom 2017-05-09 16:30:54 +05:30
ayyoob
43552543d2 added android sense analytics feature to the analytics runtime 2017-05-09 16:30:09 +05:30
ayyoob
2c7a7cd9b9 merged with origin 2017-05-09 16:29:32 +05:30
ayyoob
cd79929f42 added default values for global properties 2017-05-09 01:07:24 +05:30
sinthuja
2ec2c2e5b5 removing the android sense feature from key manager profile. 2017-05-08 23:36:03 +05:30
sinthuja
2f3819107a Merge branch 'wso2-master' into test-merge
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/distribution/src/core/plugins/plugins-deployer.xml
#	modules/p2-profile/iot-core-profile/pom.xml
#	pom.xml
2017-05-08 22:48:51 +05:30
sinthuja
efe3d7aefb Updating the device mgt plugins version. 2017-05-08 22:38:25 +05:30
sinthuja
afae580959 Fixing the issue in the build. 2017-05-08 22:37:22 +05:30
ayyoob
55a46201bd removed android sense from the default features 2017-05-08 17:23:42 +05:30
Amal Gunatilake
9608d22ef6 Merge pull request #405 from ayyoob/new-master2
Added missing appm features/ installed android sense feature / fixed stats deploying issue
2017-05-08 13:41:35 +05:30
ayyoob
08286dd88b Merge branch 'master' of https://github.com/wso2/product-iots into new-master2 2017-05-08 12:00:01 +05:30
sinthuja
c84dd34eaa Merge branch 'wso2-master' into test-merge
# Conflicts:
#	modules/distribution/src/core/plugins/plugins-deployer.xml
#	pom.xml
2017-05-08 11:57:07 +05:30