Commit Graph

2675 Commits

Author SHA1 Message Date
WSO2 Builder
01d2e037cf [maven-release-plugin]prepare for next development iteration 2017-10-31 15:51:49 +00:00
WSO2 Builder
701e92cde3 [maven-release-plugin]prepare release v3.1.0-update5 2017-10-31 15:51:34 +00:00
Madhawa Perera
ffbf27fb10
Merge pull request #1456 from charithag/add-emm-analytics
Add emm analytics
2017-10-31 20:27:37 +05:30
charitha
799b634a0d Refactoring 2017-10-31 20:05:58 +05:30
charitha
96e414be13 Merge branch 'master' of https://github.com/wso2/product-iot-server into add-emm-analytics 2017-10-31 19:07:49 +05:30
WSO2 Builder
e65536cf51 [maven-release-plugin]prepare for next development iteration 2017-10-31 11:03:47 +00:00
WSO2 Builder
e19dc19344 [maven-release-plugin]prepare release v3.1.0-update5 2017-10-31 11:03:33 +00:00
Madawa Soysa
53dd6cf799
Merge pull request #1455 from madhawap/master
Updating devicemgt core and plugin dependencies
2017-10-31 15:13:15 +05:30
madhawap
73fd3daf03 Updating devicemgt core and plugin dependencies
For the product IoTS update 5 release
2017-10-31 15:10:40 +05:30
charitha
56c883d889 Merge remote-tracking branch 'upstream/master' into add-emm-analytics
# Conflicts:
#	modules/p2-profile/iot-core-profile/pom.xml
2017-10-30 14:26:21 +05:30
Menaka Jayawardena
5597125dc7 Code formatting and removed unnecessary methods. 2017-10-25 10:39:07 +05:30
Menaka Jayawardena
caba24a1e1 Code formatting and improvements. 2017-10-23 16:35:57 +05:30
Menaka Jayawardena
399136daae Changes and Improvements as per the code review. 2017-10-23 16:15:44 +05:30
madhawap
925d8fc128 Merge branch 'master' of https://github.com/wso2/product-iots 2017-10-23 11:17:05 +05:30
Megala Uthayakumar
46ff37100d Merge pull request #1448 from sinthuja/origin-master
Removing analytics.dashboard feature from product-iots.
2017-10-17 09:29:09 +05:30
sinthuja
1ddd7e8b61 Removing the analytics dashboard components from instrumentation. 2017-10-16 21:39:36 +05:30
sinthuja
f392b7d855 Removing analytics.dashboard feature from product-iots. 2017-10-16 10:49:01 +05:30
warunalakshitha
fac10f81e5 fix conflicts 2017-10-15 15:28:24 +05:30
madhawap
b83b444eaa resolving conflicts 2017-10-13 10:25:12 +05:30
madhawap
d84b1dcf87 Merge branch 'master' of https://github.com/madhawap/product-iots 2017-10-13 10:22:33 +05:30
charitha
0a1d8c91e6 Add oauth http publisher 2017-10-09 17:58:03 +05:30
charitha
6ac1296eeb Merge branch 'master' of https://github.com/wso2/product-iot-server into add-emm-analytics 2017-10-06 13:44:12 +05:30
charitha
db48363e0b Fixed MQTT dashboard feature location 2017-10-06 13:35:00 +05:30
charitha
89adf1e08a Add basics feature to analytics profile 2017-10-06 13:34:21 +05:30
WSO2 Builder
3ac12ef8de [maven-release-plugin] prepare for next development iteration 2017-10-05 11:24:43 +05:30
WSO2 Builder
e1b2aec82c [maven-release-plugin] prepare release v3.1.0-update4 2017-10-05 11:24:27 +05:30
inoshperera
cf722943ab Merge pull request #1438 from ruwany/master
Updating maven assembly plugin to 3.0.0
2017-10-05 09:34:51 +05:30
Ace
c832f28230 Updating maven assembly plugin to 3.0.0 2017-10-05 09:25:57 +05:30
Ruwan
eef7f8409f Merge pull request #1437 from Megala21/master
Adding additional wait for exec file creation
2017-10-04 15:53:03 +00:00
megala21
605832c960 Refactoring 2017-10-04 21:06:52 +05:30
megala21
d8dbae712a Adding additional wait for exe file creation 2017-10-04 21:00:11 +05:30
Madawa Soysa
86843e94c4 Merge pull request #1436 from ruwany/master
Bumping kernel and devicemgt core/plugin dependencies
2017-10-04 14:22:57 +05:30
Ace
96f315c4e5 resolving conflicts 2017-10-04 14:21:55 +05:30
Ace
abbe21f3b7 Bumping kernel and devicemgt core/plugin dependencies 2017-10-04 14:17:48 +05:30
maheshika
5a401d67a1 Adding Pull Request Template 2017-10-03 15:22:46 +05:30
warunalakshitha
cbce05311b Merge branch 'master' of https://github.com/wso2/product-iots into remote-control 2017-10-03 12:26:54 +05:30
warunalakshitha
68c66f20c9 upgrade version 2017-10-03 12:26:50 +05:30
Geeth
b8e98fa0d8 Merge pull request #1433 from Megala21/master
Fixing build failure
2017-10-03 10:39:39 +05:30
megala21
44fff51574 Refactor 2017-10-03 10:38:08 +05:30
megala21
914ae3db93 Fixing build failure 2017-10-03 10:32:05 +05:30
Geeth
58a428098e Merge pull request #1431 from Megala21/new_master1
Fixing build failure
2017-10-02 10:21:21 +05:30
megala21
b4a6864c69 Fixing build failure 2017-10-02 10:20:00 +05:30
warunalakshitha
6d91f8af69 add pom.xml changes 2017-10-01 11:06:12 +05:30
warunalakshitha
9ad4472a49 add pom.xml changes 2017-10-01 11:04:36 +05:30
Ruwan
88f24ec119 Merge pull request #1429 from harshanL/master
Inherit maven assembly plugin from carbon-parent
2017-09-28 04:27:22 +00:00
Harshan Liyanage
1f87eccc95 Merge branch 'denuwanthi-assembly-plugin' 2017-09-28 09:35:01 +05:30
Harshan Liyanage
95308ba8b4 Merge branch 'assembly-plugin' of https://github.com/denuwanthi/product-iots into denuwanthi-assembly-plugin 2017-09-28 09:34:41 +05:30
Harshan Liyanage
dc2d424ab6 Fixed merge conflicts. 2017-09-28 09:34:01 +05:30
denuwanthi
e187af7381 Inherit maven assembly plugin from carbon-parent 2017-09-26 14:44:06 +05:30
maheshika
d29c33bcd3 Adding Issue Template 2017-09-26 09:37:20 +05:30