ayyoob
e0f6e9579d
fixed multi tenant issues after testing
8 years ago
ayyoob
2cfc4540f4
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0
8 years ago
ayyoob
50d8aedade
fixed analytics multi tenant issues
8 years ago
Milan Perera
0c173995e0
Merge pull request #571 from milanperera/cloud
...
Merging changes of master to cloud branch
8 years ago
Milan Perera
a5d936d6c0
Resolved conflicts
8 years ago
charitha
9bf38af4f7
Fix issues in swagger docs
8 years ago
Milan Perera
99782e6360
Resolved conflicts and merged
8 years ago
Hasunie
1ab1def2b6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Hasunie
fb28a4042f
fixing windows config issues
8 years ago
Milan Perera
3127d13b00
Merge pull request #570 from milanperera/cloud
...
Added cloud agent to the download page
8 years ago
Geeth
929922b6f3
Merge pull request #569 from geethkokila/cloud-3.1.0
...
Fixing the virtual fire alarm issue
8 years ago
Milan Perera
cc8066896b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud
8 years ago
Milan Perera
e1a419425e
Added cloud agent to the download page
8 years ago
geethkokila
bf96aa721c
Fixing the virtual fire alarm issue
8 years ago
ayyoob
73eb590a7c
renamed grant type to default
8 years ago
Kamidu Sachith Punchihewa
64cb8b5223
Update load-map.js
8 years ago
kamidu
55489d5e52
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
kamidu
192e1c3edc
adding missing classes in hbs
8 years ago
WSO2 Builder
7034dae2b5
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
a2224f96ff
[maven-release-plugin] prepare release v3.0.10
8 years ago
Charitha Goonetilleke
24c6a7a47b
Merge pull request #567 from lakshani/master
...
removed unwanted versions from the pom
8 years ago
lakshani
67663449d2
removed unwanted versions from the pom
8 years ago
Hasunie
f9bb3f6e89
removing swagger annotation from enrollment
...
(cherry picked from commit 3dc1418
)
8 years ago
Hasunie
3dc1418290
removing swagger annotation from enrollment
8 years ago
Geeth
98898cbac1
Merge pull request #566 from lakshani/master
...
removed snapshot versions from pom
8 years ago
lakshani
1319806a6c
removed snapshot versions
8 years ago
Ruwan
aff2e93ceb
Merge pull request #565 from lakshani/master
...
updated poms to latest version
8 years ago
lakshani
83608b0fa7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
lakshani
f62e7021d6
updated the pom to latest version
8 years ago
Ruwan
94d5a31b13
Merge pull request #563 from lakshani/master
...
Added appm rest-connector
8 years ago
lakshani
8f53a05962
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
lakshani
fff1a3f168
fixed the issues in rest connector
8 years ago
WSO2 Builder
4554d8929d
[WSO2 Release] [Jenkins #2500 ] [Release 3.0.9] prepare for next development iteration
8 years ago
WSO2 Builder
da7c040224
[WSO2 Release] [Jenkins #2500 ] [Release 3.0.9] prepare release v3.0.9
8 years ago
Hasunie
e8c649bdd5
Merge pull request #564 from GPrathap/master
...
allowing every internal users to view device analytics dashboard
8 years ago
GPrathap
1d488b06a8
allowing every internal users to view device analytics dashboard
8 years ago
lakshani
ffdcd2b217
updated pom based on review comments
8 years ago
lakshani
ebc6c6ec11
added java doc comments
8 years ago
lakshani
d6b6da9c14
added rest-connector
8 years ago
Ayyoob Hamza
079c50c83d
Merge pull request #562 from ayyoob/release-3.0.x
...
removed virtual firealarm unused impl and removed apim dependency
8 years ago
Ayyoob Hamza
30a8642931
Merge pull request #560 from GPrathap/master
...
updated to release version: carbon-device -mgt
8 years ago
GPrathap
0cdc391ca1
updated to release version: carbon-device -mgt
8 years ago
ayyoob
036d6936a7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
ayyoob
3021947f30
updated saml grant type config name
8 years ago
Ayyoob Hamza
66a8b3bbea
Merge pull request #559 from GPrathap/master
...
changed websocket token retrieval mechanism
8 years ago
GPrathap
21abaa8270
changed websocket token retrieval mechanism
8 years ago
savi_wso2
c761324460
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
GPrathap
d54d854c4e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
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
8 years ago
ayyoob
8b5dd4d811
resolved merge issues
8 years ago