Commit Graph

2730 Commits

Author SHA1 Message Date
Susinda Perera
f2225cf6b9 Update README.md 2017-03-14 12:43:46 +05:30
sinthuja
2f20502d81 Merge branch 'wso2-master' 2017-03-14 00:45:59 +05:30
sinthuja
5c79504529 Resolving the startup issue in the broker profile. 2017-03-13 21:51:52 +05:30
Harshan Liyanage
1882171824 Merge pull request #611 from Kamidu/cloud-3.1.0
android view related ui fixes
2017-03-13 17:47:10 +05:30
WSO2 Builder
18d3518236 [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare for next development iteration 2017-03-13 17:43:20 +05:30
WSO2 Builder
867790d3cb [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12 2017-03-13 17:43:10 +05:30
kamidu
c97dfb4080 android view related ui fixes : MACOS :: Git config auto genarated for sachithp@wso2's-MacBook-Pro.local 2017-03-13 17:40:26 +05:30
Susinda Perera
fee6ae0967 Merge pull request #610 from susinda/master
removing commented code, tetsing build fix and CI/CD
2017-03-13 17:37:32 +05:30
Susinda
842c47c762 removing commented code, tetsing build fix and CI/CD 2017-03-13 17:36:06 +05:30
Susinda Perera
dbf8ee8561 Merge pull request #609 from susinda/master
removing commented code, tetsing build fix and CI/CD
2017-03-13 16:46:59 +05:30
Susinda
a8fe06524e removing commented code, tetsing build fix and CI/CD 2017-03-13 16:45:47 +05:30
sameera910409
078209347a refactor code for firebase cloud messaging 2017-03-13 14:30:27 +05:30
Amal Gunatilake
3b712dba1a Merge pull request #608 from susinda/master
Revert the implementation 'agent download from github release'
Reviewed and merged.
2017-03-13 14:18:09 +05:30
Susinda
1ebc84450f revert the implementation 'agent download from github release' 2017-03-13 14:15:03 +05:30
Susinda
286d293ddd revert the implementation 'agent download from github release' 2017-03-13 13:55:42 +05:30
Susinda
4f52439092 Fixing build failure - using 22 version 2017-03-10 15:59:32 +05:30
Susinda
b5036f3d4b carbon.devicemgt.version increment to 2.0.23-SNAPSHOT 2017-03-10 15:43:13 +05:30
Susinda
7c3d94cf77 Added README file to avoid git ignoring empty dirs 2017-03-10 12:43:31 +05:30
Susinda Perera
ae3267d458 Merge pull request #607 from susinda/master
Android agent downloaded from github release location, Hasuni's fix o…
2017-03-10 12:02:55 +05:30
Susinda
f96389e671 Android agent downloadded from github relese location, Hasuni's fix on initial operations added 2017-03-10 12:00:27 +05:30
Susinda
4ebce9687d carbon.devicemgt.version dependency version chnaged to 2.0.22-SNAPSHOT 2017-03-09 15:11:50 +05:30
Susinda Perera
eac71fdc35 Merge pull request #606 from susinda/master
Merging from cloud-3.1.0
2017-03-09 14:01:34 +05:30
Susinda Perera
fb6cfb6699 Merge pull request #1 from susinda/cloud-3.1.0
Merging from Cloud 3.1.0
2017-03-09 12:45:44 +05:30
Susinda Perera
e634a38561 Merge pull request #605 from susinda/master
Merge 3.1.0-test to master
2017-03-09 12:22:15 +05:30
Susinda
07bd4a9aad Merge branch 'master' into 3.1.0-test 2017-03-09 12:02:01 +05:30
Amal Gunatilake
bc864a86f6 Merge pull request #604 from amalhub/3.1.0-test
Cherry-pick: fix for leaflet tile not loading issues
2017-03-09 08:59:09 +05:30
kamidu
d2d56651cc fix for leaflet tile not loading issues
(cherry picked from commit 6604c23257)
2017-03-07 15:25:24 +05:30
Harshan Liyanage
9f01dbda44 Merge branch 'ayyoob-cloud-3.1.0' into cloud-3.1.0 2017-03-07 10:14:17 +05:30
ayyoob
d9d6964fee added missing plugins 2017-03-07 02:14:52 +05:30
ayyoob
2dd7f53489 added log support for server to server communication 2017-03-07 02:04:26 +05:30
Harshan Liyanage
0c3be8d00f Merge branch 'hasuniea-cloud-3.1.0' into cloud-3.1.0 2017-03-03 17:45:59 +05:30
Harshan Liyanage
b82a59c828 Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0 2017-03-03 17:45:26 +05:30
Hasunie
7fcf4e9a3b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:38:39 +05:30
Hasunie
3e50f0b737 adding initial operations 2017-03-03 17:37:55 +05:30
Harshan Liyanage
dc054e6ed5 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:10:17 +05:30
Harshan Liyanage
f2761e9b0a Removed info operation addition upon page load 2017-03-03 17:10:02 +05:30
Ayyoob Hamza
0129ebc847 Merge pull request #599 from ayyoob/cloud-3.1.0
fixed operation bar permission issue
2017-03-03 17:08:04 +05:30
ayyoob
a10eb7cb14 removed feature 2017-03-03 17:03:57 +05:30
Susinda Perera
9b681d9ea0 Merge pull request #597 from susinda/3.1.0-test
carbon-device-mgt version changed to 2.0.20-SNAPSHOT
2017-03-03 15:09:42 +05:30
Susinda
66d2f32a4d carbon-device-mgt version changed to 2.0.20-SNAPSHOT 2017-03-03 14:59:51 +05:30
ayyoob
77ec1c4107 fixed operation bar permission rendering issue 2017-03-02 20:27:46 +05:30
Milan Perera
360a58dce6 Merge pull request #596 from Kamidu/cloud-3.1.0
fix for leaflet tile not loading issues
2017-03-02 15:23:48 +05:30
kamidu
6604c23257 fix for leaflet tile not loading issues 2017-03-02 15:20:27 +05:30
Milan Perera
9458958521 Merge pull request #595 from ayyoob/cloud-3.1.0
resolved device type download issue in windows OS and added logs
2017-03-02 14:40:11 +05:30
ayyoob
eda4710211 resolved device type download issue in windows OS and added log support for service clients. 2017-03-02 00:32:39 +05:30
Susinda Perera
4f5e4b2230 Merge pull request #594 from susinda/3.1.0-test
Merging commits from master to 3.1.0-test
2017-02-28 20:30:49 +05:30
susinda
5ad6dc1f1d Fxing PhoneNumber Serach for android 2017-02-28 20:28:48 +05:30
lakshani
3505cc8abc Adding (cherry-pick) lakshani's commit on 'Fixed the issue in server startu' 2017-02-28 20:28:43 +05:30
Susinda Perera
6f9ea52218 Merge pull request #593 from wso2/cloud-3.1.0
Merging to 3.1.0-test from Cloud 3.1.0 - Till Feb-28
2017-02-28 19:25:12 +05:30
ayyoob
384ab40f5b added ssl context 2017-02-27 16:44:26 +05:30