Commit Graph

2675 Commits

Author SHA1 Message Date
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
lasantha
883c91bdfb Add PostgreSQL script to storage db scripts
PostgerSQL scripts are not in the storage db scripts folder. Therefore added it and script will copy to the storage folder when building the server
2018-03-12 11:27:23 +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
geethkokila
0f1d09447c Merge branch 'master' of https://github.com/wso2/product-iots 2018-03-08 10:22:37 +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
Madawa Soysa
8a84c2d6e3 Add UI testcase to test policy view
This commit adds testcases to test UI functionalities of adding a simple android policy and viewing it from the user interface.
2018-03-05 11:02:36 +05:30
geethkokila
9a4b61d786 Merge branch 'master' of https://github.com/wso2/product-iots 2018-03-05 10:20:56 +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
Ace
49b2f52289 Fix for change-ip script to function properly 2018-03-03 23:37:47 +05:30
Rasika Perera
070be88f50
Merge pull request #1734 from rasika/master
Update carbon-device-mgt version and carbon-device-mgt-plugins
2018-03-03 22:46:50 +05:30
Rasika Perera
d55f29ba21
Update carbon-device-mgt version and carbon-device-mgt-plugins 2018-03-03 21:50:19 +05:30
WSO2 Builder
5f826ecb28 [maven-release-plugin] prepare for next development iteration 2018-03-01 19:51:47 +00:00
WSO2 Builder
f9bd80c89c [maven-release-plugin] prepare release v3.2.0-RC4 2018-03-01 19:51:37 +00:00
Rasika Perera
89f081b5b1
Merge pull request #1730 from rasika/master
Update carbon-device-mgt and carbon-device-mgt-plugins versions
2018-03-02 00:22:47 +05:30
Rasika Perera
d43fde8555 Update carbon-device-mgt and carbon-device-mgt-plugins versions 2018-03-01 23:48:40 +05:30
WSO2 Builder
dd10ae87b7 [maven-release-plugin] prepare for next development iteration 2018-02-28 18:40:17 +00:00
WSO2 Builder
c240ed86f8 [maven-release-plugin] prepare release v3.2.0-RC3 2018-02-28 18:40:05 +00:00
Rasika Perera
5e48269da7
Merge pull request #1727 from rasika/master
Update carbon-device-mgt and carbon-device-mgt-plugins versions
2018-02-28 23:32:55 +05:30
Rasika Perera
f79d985790
Merge pull request #1726 from rasika/master
Fix the CSRF issue when accessing mobile api
2018-02-28 22:53:18 +05:30
Rasika Perera
d41ce02b82 Update carbon-device-mgt and carbon-device-mgt-plugins versions 2018-02-28 22:52:25 +05:30
Rasika Perera
9964e10bc1 Fix the CSRF issue when accessing mobile api
Resolves https://github.com/wso2/product-iots/issues/1725
2018-02-28 22:15:26 +05:30
Rasika Perera
083ad11be3
Merge pull request #1723 from rasika/master
Update documentation anchor links
2018-02-28 19:51:16 +05:30
Rasika Perera
a6e208902c Updating doc link
Resolves https://github.com/wso2/product-iots/issues/1694
2018-02-28 19:04:33 +05:30
Rasika Perera
9569f7151e Updating doc link
Resolves https://github.com/wso2/product-iots/issues/1694
2018-02-28 18:18:16 +05:30
geethkokila
ca1634c7de Change the cookie policy
Changing the cookie policy by adding the contenct
2018-02-28 17:31:00 +05:30
geethkokila
d537c34eda Add privacy and cookie policy
Adding the cookie and privacy policy as jaggery application.
2018-02-28 09:34:35 +05:30
geethkokila
6606f944a3 Merge branch 'master' of https://github.com/wso2/product-iots 2018-02-27 14:36:15 +05:30
WSO2 Builder
b28862ffb8 [maven-release-plugin] prepare for next development iteration 2018-02-25 20:08:06 +00:00
WSO2 Builder
2768a0aba8 [maven-release-plugin] prepare release v3.2.0-RC2 2018-02-25 20:07:56 +00:00
Ruwan
d0da9ced41
Merge pull request #1719 from rasika/master
Update app-manager version into v1.2.51
2018-02-26 00:19:20 +05:30
Rasika Perera
c5af021e0c Updating app-manager version into v1.2.51 2018-02-26 00:17:15 +05:30