Commit Graph

2478 Commits

Author SHA1 Message Date
ayyoob
73eb590a7c renamed grant type to default 2017-02-01 00:08:32 +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
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
ayyoob
caccc557f0 removed cdmc dependency from core 2017-01-24 19:33:18 +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
Jasintha
d515dc6d03 Fixing policy topic chanaged issue 2017-01-20 14:28:38 +05:30
Hasunie
636eb91a0a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-20 10:21:10 +05:30
Rasika Perera
58b53f1501 Merge pull request #550 from wso2/release-3.0.7
Release 3.0.7
2017-01-20 10:14:50 +05:30
Rasika Perera
ecbe68aaf0 Merge pull request #549 from madhawap/release-3.0.x
fix to windows synase configs
2017-01-20 10:14:00 +05:30
madhawap
c4d54f35e7 fix to windows synase configs 2017-01-20 10:10:29 +05:30
Hasunie
b3d096f02c removining app restriction policy from policy edit UI 2017-01-20 08:07:46 +05:30
WSO2 Builder
9687362258 [maven-release-plugin] prepare for next development iteration 2017-01-20 02:04:54 +00:00
WSO2 Builder
ee063a1a43 [maven-release-plugin] prepare release v3.0.7 2017-01-20 02:03:09 +00:00
Rasika Perera
da2d99f78e Version bumping cdmf into [2.0.8] 2017-01-20 07:22:21 +05:30
Rasika Perera
c0c3f5d494 Add image for arduino 2017-01-19 23:40:38 +05:30
Rasika Perera
0d6dd3b96e Merge pull request #548 from hasuniea/windows10
Removing windows app restriction policy from Policy UI
2017-01-19 23:34:08 +05:30
Hasunie
68631a2dbd removing windows app restriction policy from Policy UI 2017-01-19 23:26:43 +05:30
Hasunie
968e1a8a07 adding system iot core,host and port 2017-01-19 23:16:18 +05:30
Chatura Dilan
1a87f61eaf Merge pull request #547 from chaturadilan/release-3.0.x
updating android agent
2017-01-19 22:55:30 +05:30
Chatura Dilan
57d6fb12ce updating android agent 2017-01-19 22:54:34 +05:30
Rasika Perera
3cc2746ef6 Merge pull request #545 from Kamidu/release-3.0.x
improving the location history
2017-01-19 22:45:08 +05:30
kamidu
c6d0c4ba44 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-19 22:39:15 +05:30