Commit Graph

2675 Commits

Author SHA1 Message Date
Milan Perera
f7e8e37ed2 Add iot.http.port to iot-server.sh 2018-10-11 14:13:58 +05:30
charitha
a05a4323e6 Merge remote-tracking branch 'entgra/master' into entgra-master
# Conflicts:
#	modules/distribution/src/core/samples/device-plugins-deployer.xml
2018-10-10 21:34:18 +05:30
charitha
dc9d9799e3 Add android sense to sample device plugins 2018-10-10 21:33:10 +05:30
Charitha Goonetilleke
ade1a5c021 Merge branch 'master' into 'master'
Fix IoT device deploying issue

See merge request entgra/product-iots!2
2018-10-08 18:29:32 +00:00
lasanthaDLPDS
30182eb230 White labeling Readme 2018-10-08 11:49:16 +05:30
charitha
52fb5b2651 Merge remote-tracking branch 'entgra/master' into entgra-master
# Conflicts:
#	pom.xml
2018-10-08 10:54:38 +05:30
charitha
fc21b8a53c Update app manager version 2018-10-08 10:53:29 +05:30
lasanthaDLPDS
ab92a2fda6 Fix script white labeling issue 2018-10-08 10:30:55 +05:30
lasanthaDLPDS
e4c9477bf7 Fix IoT device deploying issue 2018-10-08 10:30:55 +05:30
Milan Harindu
c3ea7e9012 Merge branch 'master' into 'master'
Correcting integration test for device types

See merge request entgra/product-iots!3
2018-10-08 04:48:50 +00:00
Ace
be0dfb9c6f Merge branch 'master' of https://gitlab.com/entgra/product-iots 2018-10-06 15:55:43 +05:30
Ace
00c9334d50 Correcting integration test 2018-10-06 15:55:27 +05:30
Milan Harindu
bb89875316 Update .gitlab-ci.yml 2018-10-05 09:23:59 +00:00
Milan Harindu
cf6ffb82d0 Update .gitlab-ci.yml 2018-10-05 09:06:47 +00:00
Milan Harindu
cb6391d95c Update .gitlab-ci.yml 2018-10-05 08:51:50 +00:00
mharindu
112376eab5 Update pom.xml 2018-10-05 08:49:08 +00:00
Milan Harindu
66130ab4da Update .gitlab-ci.yml 2018-10-05 07:34:40 +00:00
Milan Harindu
d711d94d77 Update .gitlab-ci.yml 2018-10-05 07:13:53 +00:00
Charitha Goonetilleke
67f5ba92f7 Update .gitlab-ci.yml 2018-10-03 05:43:36 +00:00
Charitha Goonetilleke
23ade2a80a Update .gitlab-ci.yml 2018-10-03 04:57:09 +00:00
Charitha Goonetilleke
f44133611e Update to latest snapshot versions 2018-10-03 04:10:46 +00:00
Milan Harindu
3aabeed65f Update .gitlab-ci.yml 2018-10-03 03:25:00 +00:00
mharindu
7247cd3977 [maven-release-plugin] prepare for next development iteration 2018-10-03 08:45:57 +05:30
Dharmakeerthi Lasantha
0dc1b1623b Merge branch 'newAPPM' into 'application-manager-new'
Bump dependency versions

See merge request entgra/product-iots!1
2018-10-01 05:48:36 +00:00
lasanthaDLPDS
af2b0ef615 Bump dependency versions 2018-10-01 01:53:06 +05:30
mharindu
bf79ebfe85 [maven-release-plugin] prepare release v3.4.0-alpha 2018-09-28 22:27:31 +00:00
mharindu
08f2368856 Update app manager version 2018-09-28 20:54:59 +00:00
mharindu
dcb393a0fe Update device.mgt core and plugin versions 2018-09-28 18:19:58 +00:00
charitha
86d3b27551 Update component versions 2018-09-27 12:47:43 +05:30
charitha
2bf8e0db79 Merge branch 'master' of https://github.com/wso2/product-iot-server into entgra-master
# Conflicts:
#	pom.xml
2018-09-20 15:14:23 +05:30
charitha
b7df56b55d Bump device mgt version 2018-09-20 15:13:01 +05:30
Charitha Goonetilleke
a590872a2f Add CI 2018-09-20 07:09:02 +00:00
geethkokila
8e69e93a48 Removing old app manager files 2018-09-15 23:20:08 +05:30
geethkokila
5f4ed2ff18 Adding the changes for the product 2018-09-15 22:30:17 +05:30
Geeth
7dfcfc118c
Merge pull request #1862 from geethkokila/master
Fixing the test failures
2018-09-04 11:08:38 +05:30
geethkokila
63aeeacd39 Fixing the test failures 2018-09-04 11:06:17 +05:30
Geeth
cdd81eb80e
Merge pull request #1861 from geethkokila/master
Add DB migration scripts for EMM 2.1.0 to IoT 3.3.1
2018-09-04 11:05:23 +05:30
geethkokila
c144b3d0d3 Update the migration script 2018-09-04 11:04:26 +05:30
geethkokila
4efcbf12f6 Add DB migration scripts for EMM 2.1.0 to IoT 3.3.1
Adding the migration scripts which are required by many customers
2018-09-03 13:28:04 +05:30
Geeth
231f8fc66d
Merge pull request #1859 from charithag/iots-3.3.0
Fixed configurations & Bump device mgt version
2018-08-31 11:10:28 +05:30
charitha
5affc81cd6 Bump device mgt version 2018-08-31 11:08:33 +05:30
charitha
aeb8cb7a35 Fixed configurations 2018-08-30 14:42:08 +05:30
Charitha Goonetilleke
ced3ecd2c6
Merge pull request #1855 from charithag/iots-3.3.0
Updated to latest device mgt components
2018-08-23 12:22:44 +05:30
charitha
ac806a71a3 Updated to latest device mgt components 2018-08-21 14:30:52 +05:30
Geeth
fbb5b5863f
Merge pull request #1853 from charithag/iots-3.3.0
Bug fixes and improvements for Geo fencing
2018-08-13 15:15:48 +05:30
charitha
9cb8f3be58 Updated to latest device mgt components 2018-08-13 15:11:10 +05:30
charitha
299a434cbc Commiting snapshot versions for developemnt 2018-08-03 22:35:58 +05:30
charitha
5fe781f6f1 Fixed capp deployement issue 2018-08-03 22:34:27 +05:30
charitha
a7bf5a0e91 Update Entgra nexus url 2018-07-11 15:19:39 +05:30
charitha
4d5d79be3a Fixed gitlab ci issue 2018-07-09 10:24:06 +05:30