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
lakshani
ebc6c6ec11
added java doc comments
2017-01-30 09:41:39 +05:30
lakshani
d6b6da9c14
added rest-connector
2017-01-30 09:29:33 +05:30
Ayyoob Hamza
079c50c83d
Merge pull request #562 from ayyoob/release-3.0.x
...
removed virtual firealarm unused impl and removed apim dependency
2017-01-26 12:06:35 +05:30
Ayyoob Hamza
30a8642931
Merge pull request #560 from GPrathap/master
...
updated to release version: carbon-device -mgt
2017-01-25 14:43:02 +05:30
GPrathap
0cdc391ca1
updated to release version: carbon-device -mgt
2017-01-25 14:33:19 +05:30
ayyoob
036d6936a7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-25 14:05:36 +05:30
ayyoob
3021947f30
updated saml grant type config name
2017-01-25 14:03:57 +05:30
Ayyoob Hamza
66a8b3bbea
Merge pull request #559 from GPrathap/master
...
changed websocket token retrieval mechanism
2017-01-25 13:29:14 +05:30
GPrathap
21abaa8270
changed websocket token retrieval mechanism
2017-01-25 11:24:41 +05:30
savi_wso2
c761324460
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
2017-01-25 09:41:18 +05:30
GPrathap
d54d854c4e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
2017-01-25 08:54:35 +05:30
Rasika Perera
372f33bf50
renamed branch "master" to "master-old-20170124" and use branch release-3.0.x as new "master"
...
-- this is done by doing a merge commit with "ours" strategy which obsoletes
the branch.
these are the steps I did:
git branch -m master master-old-20170124
git branch master release-3.0.x
git checkout master
git merge -s ours master-old-20170124
2017-01-24 21:45:39 +05:30
ayyoob
8b5dd4d811
resolved merge issues
2017-01-24 19:57:25 +05:30
ayyoob
4f1f1a3e7e
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
2017-01-24 19:46:39 +05:30
