kamidu
|
5593e79757
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-02-03 17:20:50 +05:30 |
|
kamidu
|
fe338aa412
|
removing the module vfa plugin
|
2017-02-03 17:20:25 +05:30 |
|
Kamidu Sachith Punchihewa
|
68b36babe6
|
Merge pull request #575 from wso2/master
UI fixes for device cloud
|
2017-02-03 16:53:19 +05:30 |
|
Kamidu Sachith Punchihewa
|
28b9b6b334
|
Merge pull request #576 from Kamidu/master
Merge branch 'master' with 'cloud 3.0.1'
|
2017-02-03 16:53:01 +05:30 |
|
kamidu
|
c49338e3ab
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-02-03 16:51:36 +05:30 |
|
kamidu
|
bd715b7aac
|
resolving branch conflicts
|
2017-02-03 16:51:25 +05:30 |
|
Kamidu Sachith Punchihewa
|
849ea1e2a7
|
Merge pull request #574 from Kamidu/master
Location improvements
|
2017-02-03 15:56:17 +05:30 |
|
kamidu
|
53840dcc37
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-02-03 13:01:21 +05:30 |
|
ayyoob
|
56de095599
|
resolved app connector build slowness issue
|
2017-02-03 05:00:57 +05:30 |
|
WSO2 Builder
|
d7e4580e77
|
[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration
|
2017-02-02 16:06:06 +05:30 |
|
WSO2 Builder
|
1737eaaa79
|
[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11
|
2017-02-02 16:05:58 +05:30 |
|
Hasunie
|
3b98e0f754
|
Merge pull request #572 from charithag/master-update-swagger-docs
Update swagger docs
|
2017-02-02 14:58:11 +05:30 |
|
Ayyoob Hamza
|
a85f051792
|
Merge pull request #573 from ayyoob/cloud-3.1.0
fixed analytics multi tenant issues
|
2017-02-02 04:45:26 +05:30 |
|
ayyoob
|
e0f6e9579d
|
fixed multi tenant issues after testing
|
2017-02-02 03:17:19 +05:30 |
|
ayyoob
|
2cfc4540f4
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
|
2017-02-02 01:59:53 +05:30 |
|
ayyoob
|
50d8aedade
|
fixed analytics multi tenant issues
|
2017-02-02 01:59:48 +05:30 |
|
Milan Perera
|
0c173995e0
|
Merge pull request #571 from milanperera/cloud
Merging changes of master to cloud branch
|
2017-02-01 15:13:31 +05:30 |
|
Milan Perera
|
a5d936d6c0
|
Resolved conflicts
|
2017-02-01 15:12:41 +05:30 |
|
charitha
|
9bf38af4f7
|
Fix issues in swagger docs
|
2017-02-01 15:03:10 +05:30 |
|
Milan Perera
|
99782e6360
|
Resolved conflicts and merged
|
2017-02-01 14:13:01 +05:30 |
|
Hasunie
|
1ab1def2b6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-02-01 12:04:18 +05:30 |
|
Hasunie
|
fb28a4042f
|
fixing windows config issues
|
2017-02-01 12:02:50 +05:30 |
|
Milan Perera
|
3127d13b00
|
Merge pull request #570 from milanperera/cloud
Added cloud agent to the download page
|
2017-02-01 11:35:16 +05:30 |
|
Geeth
|
929922b6f3
|
Merge pull request #569 from geethkokila/cloud-3.1.0
Fixing the virtual fire alarm issue
|
2017-02-01 11:34:11 +05:30 |
|
Milan Perera
|
cc8066896b
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud
|
2017-02-01 11:31:42 +05:30 |
|
Milan Perera
|
e1a419425e
|
Added cloud agent to the download page
|
2017-02-01 11:31:15 +05:30 |
|
geethkokila
|
bf96aa721c
|
Fixing the virtual fire alarm issue
|
2017-02-01 11:18:49 +05:30 |
|
ayyoob
|
73eb590a7c
|
renamed grant type to default
|
2017-02-01 00:08:32 +05:30 |
|
Kamidu Sachith Punchihewa
|
64cb8b5223
|
Update load-map.js
|
2017-01-31 14:10:29 +05:30 |
|
kamidu
|
55489d5e52
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-01-31 13:44:12 +05:30 |
|
kamidu
|
192e1c3edc
|
adding missing classes in hbs
|
2017-01-31 13:41:01 +05:30 |
|
WSO2 Builder
|
7034dae2b5
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-31 12:58:56 +05:30 |
|
WSO2 Builder
|
a2224f96ff
|
[maven-release-plugin] prepare release v3.0.10
|
2017-01-31 12:58:45 +05:30 |
|
Charitha Goonetilleke
|
24c6a7a47b
|
Merge pull request #567 from lakshani/master
removed unwanted versions from the pom
|
2017-01-31 11:12:09 +05:30 |
|
lakshani
|
67663449d2
|
removed unwanted versions from the pom
|
2017-01-31 11:02:49 +05:30 |
|
Hasunie
|
f9bb3f6e89
|
removing swagger annotation from enrollment
(cherry picked from commit 3dc1418)
|
2017-01-31 10:23:02 +05:30 |
|
Hasunie
|
3dc1418290
|
removing swagger annotation from enrollment
|
2017-01-31 10:16:56 +05:30 |
|
Geeth
|
98898cbac1
|
Merge pull request #566 from lakshani/master
removed snapshot versions from pom
|
2017-01-30 19:37:03 +05:30 |
|
lakshani
|
1319806a6c
|
removed snapshot versions
|
2017-01-30 19:32:26 +05:30 |
|
Ruwan
|
aff2e93ceb
|
Merge pull request #565 from lakshani/master
updated poms to latest version
|
2017-01-30 19:05:25 +05:30 |
|
lakshani
|
83608b0fa7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-01-30 19:03:37 +05:30 |
|
lakshani
|
f62e7021d6
|
updated the pom to latest version
|
2017-01-30 19:03:30 +05:30 |
|
Ruwan
|
94d5a31b13
|
Merge pull request #563 from lakshani/master
Added appm rest-connector
|
2017-01-30 18:52:47 +05:30 |
|
lakshani
|
8f53a05962
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-01-30 18:44:33 +05:30 |
|
lakshani
|
fff1a3f168
|
fixed the issues in rest connector
|
2017-01-30 18:44:23 +05:30 |
|
WSO2 Builder
|
4554d8929d
|
[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration
|
2017-01-30 18:07:35 +05:30 |
|
WSO2 Builder
|
da7c040224
|
[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9
|
2017-01-30 18:07:24 +05:30 |
|
Hasunie
|
e8c649bdd5
|
Merge pull request #564 from GPrathap/master
allowing every internal users to view device analytics dashboard
|
2017-01-30 17:59:29 +05:30 |
|
GPrathap
|
1d488b06a8
|
allowing every internal users to view device analytics dashboard
|
2017-01-30 17:53:02 +05:30 |
|
lakshani
|
ffdcd2b217
|
updated pom based on review comments
|
2017-01-30 11:45:19 +05:30 |
|