Commit Graph

2511 Commits

Author SHA1 Message Date
lakshani
ffee269a0e Fixed the issue in server startup- removed error logs 2017-02-20 14:01:56 +05:30
Ruwan
46499667ea Merge pull request #580 from Savidude/master
Configuring the Raspberry Pi agent to run as a service
2017-02-14 12:58:21 +05:30
savi_wso2
8075d7cb32 Configuring the Raspberry Pi agent to run as a service 2017-02-11 03:17:00 +05:30
Ruwan
431c099bdb Merge pull request #579 from Savidude/master
Bug fixes on Raspberry Pi agent
2017-02-09 16:24:12 +05:30
savi_wso2
16f6bda20a Bug fixes on Raspberry Pi agent 2017-02-09 15:59:47 +05:30
Hasunie
f8471abff2 Merge pull request #578 from lakshani/devicestatus
Added "change device status" feature to mobile plugings
2017-02-07 10:59:32 +05:30
lakshani
3c349a71e6 removed unwanted repositories from restconnector 2017-02-07 10:42:28 +05:30
lakshani
edb8e71ac2 Added change device status feature to mobile plugings 2017-02-07 10:38:12 +05:30
Kamidu Sachith Punchihewa
475d5840f5 Merge pull request #577 from Kamidu/master
fix for the build issue
2017-02-03 17:21:47 +05:30
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
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
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
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
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
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