Commit Graph

6753 Commits

Author SHA1 Message Date
ayyoob
edd3d6efee removed duplicate line 2017-05-05 09:09:43 +05:30
ayyoob
5a25f15d08 removing the fix did in cloud setup - jasinthas 2017-05-05 03:21:13 +05:30
ayyoob
359184429e Added missing fixes that was done for multi tenancy in cloud branch 2017-05-05 01:57:48 +05:30
sinthuja
bbc8c8efce Fixing the issue in consuming the events for carbon.super from mqtt. 2017-05-04 22:15:36 +05:30
sinthuja
ff6b1e32b2 Fixing the virtual fire alarm device types. 2017-05-04 21:41:34 +05:30
sinthuja
485ddfc53d Fixing the ardino and raspberry device types. 2017-05-04 16:30:14 +05:30
sinthuja
1cfef0cd9b Adding cloud p2.inf for the analytics features as well. 2017-05-04 15:33:56 +05:30
sinthuja
d720fa1db6 Removing the obsolete android sense aggregated feature. 2017-05-04 15:22:07 +05:30
sinthuja
ef84791510 Finishing the android sense feature into sub features UI/BE/Analytics. 2017-05-04 15:21:24 +05:30
Ayyoob Hamza
d50b436ed7 Merge pull request #670 from wso2/revert-667-git_issue_666
Revert "Fixing cannot install androidsense device type into current pack"
2017-05-03 21:31:05 +05:30
Rasika Perera
1df315cb29 Revert "Fixing cannot install androidsense device type into current pack" 2017-05-03 21:26:55 +05:30
Amal Gunatilake
ba91b8961b Merge pull request #667 from rasika/git_issue_666
Fixing cannot install androidsense device type into current pack
2017-05-03 20:52:14 +05:30
sinthuja
ff9efe1c76 Merge branch 'wso2-master' 2017-05-03 16:39:31 +05:30
sinthuja
a524a8dee5 Adding android sense ui feature. 2017-05-03 16:36:42 +05:30
sinthuja
33b77942fd Merge pull request #669 from ruwany/master
Adding a build profile for cloud
2017-05-03 16:35:18 +05:30
Ace
637b1d4e0a merging and including profile specific p2.inf files 2017-05-03 16:29:15 +05:30
Ace
34c9e1cd82 Adding a build profile for cloud 2017-05-03 16:26:14 +05:30
sinthuja
e989103b9b Merge pull request #661 from amalhub/master
Updating carbon.devicemgt.version
2017-05-03 15:40:20 +05:30
Amal Gunatilake
f5093774df Merge branch 'master' into master 2017-05-03 14:41:32 +05:30
Amal Gunatilake
738a6bfcd1 Updating carbon.devicemgt.version 2017-05-03 14:40:23 +05:30
WSO2 Builder
a3dd43dadf [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration 2017-05-02 20:47:53 +05:30
WSO2 Builder
174cdd25fe [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration 2017-05-02 20:47:53 +05:30
WSO2 Builder
a7158f8105 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration 2017-05-02 20:47:53 +05:30
WSO2 Builder
e255cca04b [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration 2017-05-02 20:47:53 +05:30
WSO2 Builder
2db4069053 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration 2017-05-02 20:47:53 +05:30
WSO2 Builder
afb67abcbb [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 2017-05-02 20:47:39 +05:30
WSO2 Builder
e17adec4b5 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 2017-05-02 20:47:39 +05:30
WSO2 Builder
0e1b3c556d [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 2017-05-02 20:47:39 +05:30
WSO2 Builder
1c97ddf30f [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 2017-05-02 20:47:39 +05:30
WSO2 Builder
902d7e3cf2 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 2017-05-02 20:47:39 +05:30
Amal Gunatilake
ddc1e8bef4 Merge pull request #663 from janakamarasena/master
Add synapse configs to handle mutual ssl auth for android
2017-05-02 20:28:37 +05:30
Janak Amarasena
477ff6faee Changed CDM version 2017-05-02 17:30:58 +05:30
Geeth
5597d4370b Merge pull request #668 from warunalakshitha/master
Push notification scheduler Task
2017-05-02 17:04:22 +05:30
Janak Amarasena
67510b007f Removed unwanted handlers 2017-05-02 17:02:53 +05:30
warunalakshitha
543e68771e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-01 20:53:24 +05:30
WSO2 Builder
e2becd3169 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration 2017-05-01 19:57:06 +05:30
WSO2 Builder
1133a5b3d3 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration 2017-05-01 19:57:06 +05:30
WSO2 Builder
41bc498997 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration 2017-05-01 19:57:06 +05:30
WSO2 Builder
1750555ac8 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration 2017-05-01 19:57:06 +05:30
WSO2 Builder
e9d58bae68 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration 2017-05-01 19:57:06 +05:30
WSO2 Builder
85c36c0ca8 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 2017-05-01 19:56:48 +05:30
WSO2 Builder
dad263d2ae [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 2017-05-01 19:56:48 +05:30
WSO2 Builder
c680fa49c1 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 2017-05-01 19:56:48 +05:30
WSO2 Builder
a5c3b866e1 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 2017-05-01 19:56:48 +05:30
WSO2 Builder
9bcfdc3b70 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 2017-05-01 19:56:48 +05:30
Ayyoob Hamza
b71699dd13 Merge pull request #664 from rasika/master
Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue
2017-05-01 19:40:08 +05:30
Rasika Perera
9d00038199 #665 : Added some improvements to the fix 2017-05-01 19:38:16 +05:30
Rasika Perera
f7dbc156b3 #665 : Added some changes to reuse PropertyUtils.replaceTenantDomainProperty() 2017-05-01 19:15:11 +05:30
Rasika Perera
f3a817939d #666 : Fixing cannot install androidsense device type into current pack 2017-05-01 19:03:11 +05:30
Rasika Perera
be99ca571b #665 : Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue 2017-05-01 18:54:01 +05:30