Commit Graph

2348 Commits

Author SHA1 Message Date
Ruwan Yatawara
ee84635bd6 adding environment variables and bumping versions 2018-03-15 00:03:01 +05:30
Ruwan Yatawara
05f7c9d5e7 Merge branch '330-release' of https://github.com/wso2/product-iots into 330-release 2018-03-14 23:20:33 +05:30
Dharmakeerhi Lasantha
32367196be
Merge pull request #1774 from geethkokila/330-release
Update the scope validator
2018-03-14 20:03:32 +05:30
geethkokila
706f118bd3 Update the scope validator 2018-03-14 20:02:09 +05:30
Geeth
5fafe3d36e
Merge pull request #1773 from lasanthaDLPDS/330-release
Bump the APIM and carbon Kernel vrsions
2018-03-14 19:56:05 +05:30
lasantha
309757603d Bump the APIM and carbon Kernel vrsions 2018-03-14 19:48:40 +05:30
Ruwan Yatawara
c8f758efea Merge branch '330-release' of https://github.com/wso2/product-iots into 330-release 2018-03-14 14:18:10 +05:30
Ruwan Yatawara
14f1429f67 Merge branch '330-release' of https://github.com/geethkokila/product-iots into 330-release 2018-03-14 14:09:33 +05:30
Charitha Goonetilleke
b9588646f5
Merge pull request #1769 from charithag/330-release
Bump kernel version & removed web xml customizations
2018-03-14 08:22:51 +00:00
charitha
da9fb48815 Merge branch '330-release' of https://github.com/wso2/product-iot-server into 330-release
# Conflicts:
#	modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml
2018-03-14 13:52:26 +05:30
Geeth
dece71d0c8
Merge pull request #1770 from ruwany/330-release
Adding identity-consent mgt configs and changing login redirection page
2018-03-14 13:47:02 +05:30
Ruwan Yatawara
88256979dd Adding identity-consent mgt configs and changing login redirection page 2018-03-14 13:17:23 +05:30
charitha
aa19cccfe8 Bump kernel version & removed web xml customizations 2018-03-14 12:34:51 +05:30
Charitha Goonetilleke
99f32bb35e
Merge pull request #1767 from geethkokila/330-release
Add GDPR Compliance
2018-03-14 06:06:25 +00:00
geethkokila
d51ce8e6fa Fix git conflits 2018-03-14 11:15:16 +05:30
Geeth
c8c42f600b
Merge pull request #1765 from charithag/master
Fix issues in broker startup
2018-03-14 09:43:24 +05:30
charitha
f1d1285dfa Merge branch '330-release' of https://github.com/wso2/product-iot-server
# Conflicts:
#	pom.xml
2018-03-14 09:34:02 +05:30
charitha
4d542831c0 Bump analytics commons version 2018-03-14 09:30:09 +05:30
Charitha Goonetilleke
658665cfeb
Merge pull request #1764 from geethkokila/330-release
Update component versions
2018-03-14 03:59:24 +00:00
Geeth
f1153c9194
Merge pull request #4 from ruwany/geethkokila-330-release-new
resolving issues with consent management
2018-03-14 09:22:22 +05:30
charitha
6e35345f28 Fix issue in broker startup 2018-03-13 19:53:56 +05:30
Geeth
e5f4fc6ed9
Merge pull request #6 from Kamidu/release-330-geeth
Update app mgt version
2018-03-13 18:18:55 +05:30
kamidu
7f8d57b7dc Update app mgt version
Update the app mgt version to retrive all the OAEP fixes
2018-03-13 18:06:18 +05:30
Ruwan Yatawara
aad64c4813 resolving issues with consent management 2018-03-13 16:25:52 +05:30
geethkokila
3234b776d6 Update the message broker and kernel versions 2018-03-13 10:25:40 +05:30
Geeth
f9368a9f23
Merge pull request #3 from ruwany/geethkokila-330-release-new
Correcting parent id
2018-03-12 19:36:57 +05:30
Ruwan Yatawara
b9053cffd3 correcting version 2018-03-12 19:36:09 +05:30
Ruwan Yatawara
b26e9166bd Correcting parent id 2018-03-12 19:34:19 +05:30
Geeth
e0ca8f1764
Merge pull request #2 from ruwany/geethkokila-330-release-new
Adding cxf-servlet
2018-03-12 19:32:02 +05:30
Ruwan Yatawara
adff74f9c4 Adding cxf-filter 2018-03-12 19:30:02 +05:30
Geeth
529c6c6f6f
Merge pull request #1 from ruwany/geethkokila-330-release-new
Fixing startup issues
2018-03-12 19:15:24 +05:30
Ruwan Yatawara
7182655e27 Fixing conflict 2018-03-12 19:12:42 +05:30
Ruwan Yatawara
31f478ebcb Fixing ouath2 application deployment failure and captcha error 2018-03-12 19:03:29 +05:30
geethkokila
30d8b3d6ac Bump the devicemgt and plugins versions 2018-03-12 17:43:07 +05:30
geethkokila
ef79cbeee6 Update api management version 2018-03-12 13:26:58 +05:30
geethkokila
954d3b0c0d Update component versions
Updating the component versions and fixing bugs
2018-03-12 11:06:59 +05:30
geethkokila
be16e40a5c Update component versions
Updating the component versions and fixing bugs
2018-03-12 11:06:40 +05:30
WSO2 Builder
d8363a5378 [maven-release-plugin] prepare for next development iteration 2018-03-06 06:42:22 +00:00
WSO2 Builder
21b0d331cd [maven-release-plugin] prepare release v3.2.0 2018-03-06 06:42:12 +00:00
Rasika Perera
6c298ff2fe
Merge pull request #1742 from rasika/master
Update LICENSE.txt
2018-03-05 17:24:08 +05:30
Rasika Perera
cf4fbefd36
Merge pull request #1739 from charithag/master
Update cdm-config for analytics
2018-03-05 17:19:08 +05:30
Rasika Perera
cff955fc18
Update LICENSE.txt 2018-03-05 17:15:43 +05:30
charitha
98f9aa5568 Update cdm-config for analytics 2018-03-04 10:48:25 +05:30
WSO2 Builder
7f2f03608a [maven-release-plugin] prepare for next development iteration 2018-03-03 21:27:27 +00:00
WSO2 Builder
0596e39f2e [maven-release-plugin] prepare release v3.2.0-RC4 2018-03-03 21:27:17 +00:00
Rasika Perera
5a79cdfb92
Merge pull request #1737 from rasika/master
Update carbon-device-mgt and carbon-device-mgt-plugins
2018-03-04 02:15:52 +05:30
Rasika Perera
de39c1faad
Update carbon-device-mgt and carbon-device-mgt-plugins 2018-03-04 00:42:07 +05:30
Rasika Perera
ec92c8bdb9
Merge pull request #1736 from ruwany/fix-branch
Adding fix for changing input-event-adapter.xml super admin credentials
2018-03-04 00:27:58 +05:30
Ace
0b9bc5fe99 Adding fix for changing input-event-adapter.xml super admin credentials 2018-03-04 00:02:38 +05:30
Rasika Perera
138e682a2a
Merge pull request #1735 from ruwany/fix-branch
Fix for change-ip script to function properly
2018-03-03 23:51:53 +05:30