kamidu
c49338e3ab
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
kamidu
bd715b7aac
resolving branch conflicts
8 years ago
Kamidu Sachith Punchihewa
849ea1e2a7
Merge pull request #574 from Kamidu/master
...
Location improvements
8 years ago
kamidu
53840dcc37
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
WSO2 Builder
d7e4580e77
[WSO2 Release] [Jenkins #2510 ] [Release 3.0.11] prepare for next development iteration
8 years ago
WSO2 Builder
1737eaaa79
[WSO2 Release] [Jenkins #2510 ] [Release 3.0.11] prepare release v3.0.11
8 years ago
Hasunie
3b98e0f754
Merge pull request #572 from charithag/master-update-swagger-docs
...
Update swagger docs
8 years ago
charitha
9bf38af4f7
Fix issues in swagger docs
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
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
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 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
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
Rasika Perera
2c7c8e9542
Updated cdmf version into [2.0.11-SNAPSHOT]
8 years ago
Rasika Perera
7b3ecbeaab
Updated cdmf into [2.0.10-SNAPSHOT]
8 years ago
Rasika Perera
3f39280bb9
Merge pull request #558 from wso2/release-3.0.8
...
Release 3.0.8
8 years ago
WSO2 Builder
e64fe695ab
[maven-release-plugin] prepare for next development iteration
8 years ago
Rasika Perera
893e3d4017
Version bump [carbon.devicemgt.version] into [2.0.9]
8 years ago
WSO2 Builder
5fbd40c579
[maven-release-plugin] prepare release v3.0.8
8 years ago
Rasika Perera
04ae39ce3c
Merge pull request #556 from Kamidu/release-3.0.x
...
fixing ui issues in android device view
8 years ago
kamidu
6ad32a0c8b
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Rasika Perera
3f2d78bd81
Merge pull request #555 from chaturadilan/release-3.0.x
...
Bumping up appm version to 1.2.13
8 years ago
kamidu
0679aab11d
adding missing classes in hbs
8 years ago
Chatura Dilan
b580827ced
Bumping up appm version to 1.2.13
8 years ago
Rasika Perera
1fdaf0dc2f
Merge pull request #554 from ayyoob/arduino
...
arduino fix is added
8 years ago
Rasika Perera
10428e7ca2
Merge pull request #553 from hasuniea/windows10
...
fixing synapse configs
8 years ago