Commit Graph

2491 Commits

Author SHA1 Message Date
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
charitha
9bf38af4f7 Fix issues in swagger docs 2017-02-01 15:03:10 +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
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
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 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
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
Rasika Perera
2c7c8e9542 Updated cdmf version into [2.0.11-SNAPSHOT] 2017-01-24 15:45:34 +05:30
Rasika Perera
7b3ecbeaab Updated cdmf into [2.0.10-SNAPSHOT] 2017-01-23 15:03:20 +05:30
Rasika Perera
3f39280bb9 Merge pull request #558 from wso2/release-3.0.8
Release 3.0.8
2017-01-23 14:30:34 +05:30
WSO2 Builder
e64fe695ab [maven-release-plugin] prepare for next development iteration 2017-01-20 13:36:50 +00:00
Rasika Perera
893e3d4017 Version bump [carbon.devicemgt.version] into [2.0.9] 2017-01-20 19:02:36 +05:30
WSO2 Builder
5fbd40c579 [maven-release-plugin] prepare release v3.0.8 2017-01-20 13:31:44 +00:00
Rasika Perera
04ae39ce3c Merge pull request #556 from Kamidu/release-3.0.x
fixing ui issues in android device view
2017-01-20 18:47:53 +05:30
kamidu
6ad32a0c8b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-20 18:28:04 +05:30
Rasika Perera
3f2d78bd81 Merge pull request #555 from chaturadilan/release-3.0.x
Bumping up appm version to 1.2.13
2017-01-20 18:27:26 +05:30
kamidu
0679aab11d adding missing classes in hbs 2017-01-20 18:26:15 +05:30
Chatura Dilan
b580827ced Bumping up appm version to 1.2.13 2017-01-20 18:21:36 +05:30
Rasika Perera
1fdaf0dc2f Merge pull request #554 from ayyoob/arduino
arduino fix is added
2017-01-20 18:01:23 +05:30
Rasika Perera
10428e7ca2 Merge pull request #553 from hasuniea/windows10
fixing synapse configs
2017-01-20 18:01:09 +05:30
ayyoob
affbd00796 arduino fix is added 2017-01-20 17:05:41 +05:30
Hasunie
8eed99c215 fixing passcode issue 2017-01-20 16:09:18 +05:30
Hasunie
c55a1b09a3 fixing synapse config issues 2017-01-20 15:34:38 +05:30
sinthuja
f517975bf0 Adding wso2 event receiver to geo capp. 2017-01-20 15:33:01 +05:30
Hasunie
9467c52707 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-20 15:31:53 +05:30
Hasunie
836bd5c65e fixing wstep url issue 2017-01-20 15:29:27 +05:30
Rasika Perera
3fc33d9e49 Merge pull request #552 from Jasintha/release-3.0.x
MQTT subscription topic patten should changed to this format to get policy updates
2017-01-20 14:56:59 +05:30