Commit Graph

3430 Commits

Author SHA1 Message Date
Rasika Perera
f864506f62 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-05-29 13:09:21 +05:30
Rasika Perera
7b0295ff01 Added geo-fencing to the devicemgt app 2017-05-29 12:58:06 +05:30
Rasika Perera
ea3ed9c444 Added Geo Service into Device Mgt Core 2017-05-29 11:51:41 +05:30
Amal Gunatilake
2ac5a56ad0 Merge pull request #749 from madawas/master
Fixing wso2/product-iots##467
2017-05-26 15:25:25 +05:30
warunalakshitha
1a26595472 Fix issue with using enrollment id for device id 2017-05-26 14:54:04 +05:30
WSO2 Builder
7e83b53bb4 [WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare for next development iteration 2017-05-22 15:33:56 +05:30
WSO2 Builder
768073ea51 [WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare release v2.0.68 2017-05-22 15:33:42 +05:30
Amal Gunatilake
3f7543bee8 Merge pull request #742 from milanperera/iot-master
Removed unnecessary interace methods from Device Manager
2017-05-22 15:27:41 +05:30
WSO2 Builder
88bab85750 [WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare for next development iteration 2017-05-18 17:33:39 +05:30
WSO2 Builder
4e506a547e [WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare release v2.0.67 2017-05-18 17:33:25 +05:30
Megala Uthayakumar
47bdbc7c14 Merge pull request #751 from sinthuja/master
adding the if condition for only newRoles list iteration.
2017-05-18 16:03:06 +05:30
sinthuja
3340d94acf adding the if condition for only newRoles list iteration. 2017-05-18 16:00:25 +05:30
megala21
f41a692bf3 Reformatting code 2017-05-18 14:21:24 +05:30
megala21
25e0b989d2 Fixing issues in group sharing 2017-05-18 14:17:03 +05:30
Madawa Soysa
20999f4cd5 Fixing wso2/product-iots##467 2017-05-18 10:54:54 +05:30
WSO2 Builder
3092423d4d [WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare for next development iteration 2017-05-17 19:11:50 +05:30
WSO2 Builder
e21520392c [WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare release v2.0.66 2017-05-17 19:11:36 +05:30
Megala Uthayakumar
39439c5c50 Merge pull request #748 from sinthuja/master
Fixing issues in editing policy
2017-05-17 18:38:31 +05:30
sinthuja
e7490dd278 Fixing https://github.com/wso2/product-iots/issues/443. 2017-05-17 17:24:37 +05:30
Megala Uthayakumar
8830d627e9 Merge pull request #747 from sinthuja/master
Fixing some issues reported for product-iots.
2017-05-17 16:18:32 +05:30
sinthuja
9c110bb59c Fixing https://github.com/wso2/product-iots/issues/444. 2017-05-16 18:41:07 +05:30
WSO2 Builder
d4baa72328 [WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare for next development iteration 2017-05-16 18:34:27 +05:30
WSO2 Builder
7b549f623d [WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare release v2.0.65 2017-05-16 18:34:13 +05:30
sinthuja
4df590caa1 Fixing https://github.com/wso2/product-iots/issues/447. 2017-05-16 18:17:45 +05:30
Madawa Soysa
c7d002a6a9 Fix for https://github.com/wso2/product-iots/issues/449 2017-05-16 17:18:16 +05:30
ayyoob
42cb383804 auto healing in case of app deletion and added device scope to handle multiple session with same user 2017-05-11 21:21:53 +05:30
WSO2 Builder
84d305dcd4 [WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare for next development iteration 2017-05-11 09:15:49 +05:30
WSO2 Builder
3bf945fe95 [WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare release v2.0.64 2017-05-11 09:15:33 +05:30
ayyoob
d2d7be6fd6 fixed tenant related issue for mqtt push notification and stream artifact publishing 2017-05-10 13:50:06 +05:30
ayyoob
1c3a89f57c fixed issues raised through comments - commits 2017-05-10 13:49:20 +05:30
ayyoob
035403495c made default stat permission as constant 2017-05-09 16:45:47 +05:30
ayyoob
cb9db4dd1d fixed null pointer in the initial operations 2017-05-09 16:16:14 +05:30
ayyoob
483d09ebf1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into new-master 2017-05-09 16:13:35 +05:30
ayyoob
ea48ee425c added default configuration for tenant specific push notification provider 2017-05-09 16:09:24 +05:30
Milan Perera
64d656b5e7 Removed unnecessary interace methods from Device Manager 2017-05-09 15:09:21 +05:30
WSO2 Builder
f7300645a5 [WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare for next development iteration 2017-05-09 15:05:26 +05:30
WSO2 Builder
ca83609703 [WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare release v2.0.63 2017-05-09 15:05:11 +05:30
Milan Perera
53f2c555c4 Added method to test device manager 2017-05-09 14:44:01 +05:30
Milan Perera
17ecadb913 Added a feature to pick default platform configurations 2017-05-09 11:52:21 +05:30
ayyoob
b36ff4b874 added a authorisation resource for stat 2017-05-09 00:54:49 +05:30
ayyoob
3feb6c70dc created per tenant push notification for each transport type 2017-05-09 00:54:34 +05:30
ayyoob
77ceed5368 renamed device type publisher service to DeviceAnalyticsArtifactUploaderAdminService 2017-05-09 00:54:01 +05:30
WSO2 Builder
964eae6f92 [WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare for next development iteration 2017-05-08 17:42:41 +05:30
WSO2 Builder
31f91f80b9 [WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare release v2.0.62 2017-05-08 17:42:28 +05:30
Hasunie
9947085d08 Merge pull request #739 from harshanL/master
#738:Fixed issue 738.
2017-05-08 17:36:03 +05:30
Harshan Liyanage
447e0561b9 #738:Fixed issue 738. 2017-05-08 17:33:45 +05:30
megala21
f14e2c2d6a Removing cloud_type from config.json 2017-05-08 15:19:51 +05:30
megala21
8d0efd3289 Adding request new device type button for cloud 2017-05-08 13:58:59 +05:30
WSO2 Builder
639eeb225a [WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare for next development iteration 2017-05-05 11:41:19 +05:30
WSO2 Builder
7d3025a25b [WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare release v2.0.61 2017-05-05 11:41:03 +05:30
Amal Gunatilake
a4072615af Merge pull request #733 from rasika/improvement_getuser
Fixing typo and getCarbonUser() replaced with context.user
2017-05-05 11:26:01 +05:30
Amal Gunatilake
d898a7dc8e Merge pull request #732 from rasika/git_issue_731
Hide IoT Server version when isCloud is TRUE
2017-05-05 11:25:55 +05:30
ayyoob
cedb6cb798 fixed device stats loading page issue 2017-05-05 03:02:35 +05:30
WSO2 Builder
a546355cf3 [WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare for next development iteration 2017-05-04 15:42:27 +05:30
WSO2 Builder
eb6b1db3fe [WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare release v2.0.60 2017-05-04 15:42:14 +05:30
Madawa Soysa
c4d0ca7134 Merge pull request #734 from madhawap/master
Removed commented lines
2017-05-04 15:36:00 +05:30
madhawap
c4ba14376e Removed commented lines 2017-05-04 15:32:25 +05:30
Rasika Perera
776bafcd73 Fixing typo and getCarbonUser() replaced with context.user 2017-05-03 23:22:25 +05:30
Rasika Perera
d247b07b4a #731 : Hide IoT Server version when isCloud is TRUE 2017-05-03 23:04:55 +05:30
WSO2 Builder
4797fc9600 [WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare for next development iteration 2017-05-03 20:29:05 +05:30
WSO2 Builder
896bc24f21 [WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare release v2.0.59 2017-05-03 20:28:51 +05:30
Rasika Perera
5dc9259fc0 Merge pull request #728 from rasika/git_issue_726
Resolving cannot log into devicemgt app when tenant is not loaded in API Manager
2017-05-03 20:23:07 +05:30
Rasika Perera
2831bfaf2c #726 : Resolving cannot log into devicemgt app when tenant is not loaded in API Manager 2017-05-03 19:59:17 +05:30
WSO2 Builder
98991fe89b [WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare for next development iteration 2017-05-03 15:28:16 +05:30
WSO2 Builder
8b31b93181 [WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare release v2.0.58 2017-05-03 15:28:02 +05:30
Amal Gunatilake
e736659204 Merge pull request #730 from janakamarasena/cert-mgt
Store cert by cert serial
2017-05-03 14:09:23 +05:30
Janak Amarasena
44940f3136 Store cert by cert serial 2017-05-03 13:58:06 +05:30
WSO2 Builder
6fddf9c8d0 [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare for next development iteration 2017-05-03 08:28:19 +05:30
WSO2 Builder
2f4051019c [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare release v2.0.57 2017-05-03 08:28:05 +05:30
Ace
b54bf3000f Adding fix for status 500 in device listing page 2017-05-03 07:13:06 +05:30
WSO2 Builder
80bf3c8fbd [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare for next development iteration 2017-05-02 18:01:00 +05:30
WSO2 Builder
2a7173c66d [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare release v2.0.56 2017-05-02 18:00:46 +05:30
WSO2 Builder
95a80301e9 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare for next development iteration 2017-05-02 17:15:09 +05:30
WSO2 Builder
236db75700 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare release v2.0.55 2017-05-02 17:14:54 +05:30
Chatura Dilan
309352df1e Merge pull request #722 from janakamarasena/mutual-ssl-handler
Added mutual SSL authentication handling for android
2017-05-02 17:04:38 +05:30
Geeth
6798dea68a Merge pull request #725 from warunalakshitha/master
Add Scheduler Task for Sending Push Notification
2017-05-02 17:04:03 +05:30
WSO2 Builder
43e76e4678 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare for next development iteration 2017-05-02 09:37:33 +05:30
WSO2 Builder
34865f0d25 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare release v2.0.54 2017-05-02 09:37:16 +05:30
warunalakshitha
e1e2b14b5f Rename push status to push notification status and add configurable initial delay for scheduler task 2017-05-01 20:44:30 +05:30
lasantha
43f2f15c5f #395: Resolved current device owner incorrectly selecting and processing issue when the same device is enrolled to multiple users 2017-05-01 15:48:25 +05:30
warunalakshitha
3938064210 Add opeerations mapping map for tenants and fixes for code review 2017-04-30 14:29:30 +05:30
warunalakshitha
8df87b23bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-30 13:56:12 +05:30
warunalakshitha
a5759f9818 Add tenant based operation mappings 2017-04-30 13:56:06 +05:30
Janak Amarasena
2b0800794d Minor improvements to the code 2017-04-28 16:32:57 +05:30
Janak Amarasena
3ecb6da575 Remove unwanted code 2017-04-28 16:32:57 +05:30
Janak Amarasena
e5bd7566d3 Add Mutual SSL handling to AuthHandler 2017-04-28 16:32:57 +05:30
WSO2 Builder
3a9986d054 [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare for next development iteration 2017-04-28 10:29:44 +05:30
WSO2 Builder
b53610ff8b [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare release v2.0.53 2017-04-28 10:29:35 +05:30
megala21
47ce861b49 Fixing basic authenticator issue 2017-04-28 10:01:54 +05:30
megala21
4560348697 Fixing isses in authentication 2017-04-27 23:21:29 +05:30
megala21
b5e4c22c31 Merge remote-tracking branch 'upstream/master' 2017-04-27 21:55:32 +05:30
megala21
121c289b39 Adding security filters to web.xml 2017-04-27 17:36:10 +05:30
Harshan Liyanage
7744ee2aea Merge pull request #716 from rasika/analytics-url
Enabling Statics URL
2017-04-27 12:44:55 +05:30
Harshan Liyanage
b9691988a9 Merge pull request #710 from rasika/master
Fixing Policy view and policy edit doesn't honor isCloud param
2017-04-27 12:44:16 +05:30
warunalakshitha
003c9c5907 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-27 12:23:17 +05:30
warunalakshitha
76f8d963f7 Improve push notifications for request with device list less than batch size 2017-04-27 12:23:01 +05:30
WSO2 Builder
726422dc81 [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare for next development iteration 2017-04-26 21:31:21 +05:30
WSO2 Builder
4bf6bf73cc [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare release v2.0.52 2017-04-26 21:31:08 +05:30
Ayyoob Hamza
3526e6425f Merge pull request #709 from madawas/master
Fixing multitenant issue in certificate verification endpoint
2017-04-26 21:25:24 +05:30
Madawa Soysa
9ba509b512 Removing unnecessary variable.
These changes are suggested by a review.
2017-04-26 15:28:24 +05:30