Commit Graph

3648 Commits

Author SHA1 Message Date
WSO2 Builder
1e58f762da [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare for next development iteration 2017-06-15 16:23:05 +05:30
WSO2 Builder
bae931f3c5 [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare release v3.0.1 2017-06-15 16:22:51 +05:30
Ruwan
5d4c85b61e Merge pull request #778 from harshanL/master
Code refactored.
2017-06-15 15:20:37 +05:30
Janak Amarasena
b2bdc0b6c8 Add token validation classes to the same bundle 2017-06-15 15:04:59 +05:30
Harshan Liyanage
de9beb1f5b Code refatcored. 2017-06-15 14:49:40 +05:30
inoshperera
d63ef44e7b Merge pull request #777 from harshanL/master
Fixed wso2/product-iots#473
2017-06-15 12:03:01 +05:30
Harshan Liyanage
3857be50b9 Fixed wso2/product-iots#473 2017-06-15 11:58:22 +05:30
Ruwan
477608613e Merge pull request #776 from rasika/master
Fixing https://github.com/wso2/product-iots/issues/431
2017-06-15 11:31:19 +05:30
Rasika Perera
61c4db07a3 Fixing https://github.com/wso2/product-iots/issues/431 2017-06-15 11:27:37 +05:30
ayyoob
0d08c42f5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-15 09:48:00 +05:30
WSO2 Builder
69d2cff7bd [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare for next development iteration 2017-06-14 18:08:46 +05:30
WSO2 Builder
3795011895 [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare release v3.0.0 2017-06-14 18:08:31 +05:30
Harshan Liyanage
9e24338660 Added javadoc comments. 2017-06-14 14:55:25 +05:30
ayyoob
07bdd5cb6c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-14 13:19:07 +05:30
ayyoob
da68f8fac1 fixed on config operation flow 2017-06-14 12:38:56 +05:30
Chatura Dilan
38b7689e28 Merge pull request #773 from harshanL/master
Fixed java-doc comments issues and added comments to the configs.
2017-06-14 12:35:39 +05:30
Harshan Liyanage
b510a422b4 Fixed java-doc comments issues and added comments to the configs. 2017-06-14 12:28:16 +05:30
Geeth
115ccb739a Merge pull request #765 from harshanL/master
Added comments to the device status configs.
2017-06-14 11:42:21 +05:30
Rasika Perera
798e551673 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-14 10:43:19 +05:30
Rasika Perera
68d9b2d310 Adding focus on geo map 2017-06-14 07:48:57 +05:30
Rasika Perera
10c8bf7f42 Capilizing notification title 2017-06-14 07:47:01 +05:30
WSO2 Builder
16420433b5 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare for next development iteration 2017-06-13 17:26:56 +05:30
WSO2 Builder
5c06b9dcb2 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare release v2.0.75 2017-06-13 17:26:42 +05:30
Harshan Liyanage
43ba1e1b43 Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005 2017-06-13 17:08:26 +05:30
Vishanth
7da1067d68 fixing sql queries to compare owner in lowercase 2017-06-13 17:08:01 +05:30
Rasika Perera
4796f5934f Fixed geo alerts notifications 2017-06-13 00:44:20 +05:30
Rasika Perera
73ab6f28c1 Fixed sidebar notifications 2017-06-13 00:40:10 +05:30
Rasika Perera
6470e8e3d2 Fixed sidebar notifications 2017-06-13 00:39:58 +05:30
Rasika Perera
c970167299 UI fixes for geo fencing 2017-06-12 22:43:36 +05:30
Rasika Perera
ce6ab9b354 Refactoring "executionPlanType" -> "alertType" 2017-06-12 22:43:14 +05:30
Rasika Perera
e1c5c72b1b Adding geo fence exit alerts ui 2017-06-12 15:40:38 +05:30
Rasika Perera
6d02075a99 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-12 15:11:14 +05:30
ayyoob
22a4716443 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-12 11:35:43 +05:30
ayyoob
c93410eb92 added few changes after review 2017-06-12 11:35:33 +05:30
Harshan Liyanage
951cd7b001 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-12 10:36:51 +05:30
WSO2 Builder
8927158086 [WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare for next development iteration 2017-06-09 12:57:29 +05:30
WSO2 Builder
28423c45bc [WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare release v2.0.74 2017-06-09 12:57:15 +05:30
ayyoob
6c7f911cbc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
2017-06-08 14:39:51 +05:30
ayyoob
7ab52af66e add http pushnotification 2017-06-08 14:24:33 +05:30
Harshan Liyanage
f215b5ee44 Added comments to the device status configs. 2017-06-07 17:34:06 +05:30
Chatura Dilan
f2db2609bd Merge pull request #763 from janakamarasena/ouath-token-grant-v2
New OAuth grant type
2017-06-07 16:47:02 +05:30
Harshan Liyanage
a30982207b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-07 16:29:15 +05:30
Harshan Liyanage
3766ba0349 Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991 2017-06-07 16:29:05 +05:30
Janak Amarasena
bdaa4088a3 Resolve reference errors 2017-06-07 14:09:41 +05:30
Janak Amarasena
848c219efe Add scope validator 2017-06-07 14:09:41 +05:30
Janak Amarasena
a9a246c2c4 Add new oauth grant type 2017-06-07 14:09:41 +05:30
WSO2 Builder
e3dfbdfdbd [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
WSO2 Builder
598332b640 [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare release v2.0.73 2017-06-07 13:44:15 +05:30
inoshperera
9f9208cebc adding default values for timestamp 2017-06-07 09:25:16 +05:30
Rasika Perera
05b11a5099 Adding Exit Alerts feature 2017-06-06 14:55:04 +05:30
Rasika Perera
4f447305c9 Fixing minor issue in viewing geo fence 2017-06-06 14:50:52 +05:30
WSO2 Builder
73fa026eeb [WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare for next development iteration 2017-06-06 12:33:06 +05:30
WSO2 Builder
2415762ccb [WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare release v2.0.72 2017-06-06 12:32:53 +05:30
ayyoob
f3393080ba fixed few issues after testing 2017-06-06 11:00:59 +05:30
GDLMadushanka
36bd1c5daf Refactoring 2017-06-06 09:44:30 +05:30
Rasika Perera
8548e911aa Added an error message when gpl siddhi extension is not configured 2017-06-06 06:18:27 +05:30
Rasika Perera
c7a751b1ef Fixing location map height 2017-06-06 05:37:30 +05:30
Rasika Perera
ec343cef1a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-05 10:26:10 +05:30
Rasika Perera
dfb0e154c6 Added cdmf core dependency 2017-06-05 10:21:19 +05:30
Rasika Perera
6a2785cc8d Multitenancy added to event publisher 2017-06-05 10:18:31 +05:30
Rasika Perera
fb368caae4 Removed unused gson initization 2017-06-05 10:16:03 +05:30
Rasika Perera
9865a260d4 Publishing location operation response into iot location event stream 2017-06-05 10:12:22 +05:30
Rasika Perera
886eaec271 Geo service alerts history method added 2017-06-05 10:11:14 +05:30
Rasika Perera
2733197edc PublishLocationOperationResponse config element added to cdm-config.xml 2017-06-05 10:10:29 +05:30
Rasika Perera
76f4457462 Changes to geo dashboard ui in /devicemgt 2017-06-05 10:08:34 +05:30
GDLMadushanka
85d07dc9cb Redirecting to respective analytics pages depending on the device type 2017-06-05 09:35:46 +05:30
ayyoob
194e4d99b5 added policy compliance support 2017-06-05 00:12:59 +05:30
ayyoob
5b46dc03a5 few fixes on event reciever definition 2017-06-04 18:18:06 +05:30
ayyoob
7cba43ccbb few changes after testing HTTP and MQTT flow 2017-06-04 06:52:29 +05:30
ayyoob
a7ebc96cb7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-03 18:06:32 +05:30
ayyoob
a1b20f1663 changed response payload definition for pull notification 2017-06-03 13:27:08 +05:30
WSO2 Builder
39a7037821 [WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare for next development iteration 2017-06-02 16:44:55 +05:30
WSO2 Builder
22782ec125 [WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare release v2.0.71 2017-06-02 16:44:41 +05:30
Harshan Liyanage
9871122c0a Code refactoring of device-status-task which Resolves harshanl/product-iots#518 2017-06-02 15:36:56 +05:30
Harshan Liyanage
52bbdfcd78 Code refactoring of device-status-task which Resolves harshanl/product-iots#518 2017-06-02 15:23:51 +05:30
Harshan Liyanage
fda9410a2a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-02 15:07:48 +05:30
Harshan Liyanage
d3cb7ba70b Changed the device-status-task to use optimized queries which Resolves harshanl/product-iots#518 2017-06-02 15:07:39 +05:30
ayyoob
c46cbfafe5 Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt into devicetype-3.1.0 2017-06-01 17:23:42 +05:30
ayyoob
4dc0f69e28 updated version 2017-06-01 17:23:18 +05:30
ayyoob
04b8b74e4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-01 17:22:33 +05:30
ayyoob
a0d7518cbe Implemented Pull Notification Support 2017-06-01 17:19:25 +05:30
ayyoob
8a56161a43 Implemented Pull Notification Support 2017-06-01 17:19:14 +05:30
WSO2 Builder
c7fd70145d [WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare for next development iteration 2017-06-01 08:58:27 +05:30
WSO2 Builder
0c9d104401 [WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare release v2.0.70 2017-06-01 08:58:13 +05:30
Rasika Perera
aa0f9e0510 Merge pull request #744 from ayyoob/new-master
auto healing in case of app deletion and added device scope to handle to handle multiple session
2017-06-01 05:29:27 +05:30
Rasika Perera
5cb0f9bb94 Fixes to geo-fencing ui 2017-06-01 05:00:00 +05:30
Rasika Perera
ddfecba1a6 Added geo fencing unit 2017-05-31 10:58:51 +05:30
Malintha Fernando
07f2cb608b Fix : Store device type names as it is 2017-05-31 10:16:24 +05:30
Harshan Liyanage
4ec139608e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-05-30 17:00:52 +05:30
Harshan Liyanage
35d1c9897e Resolves harshanl/product-iots#518 2017-05-30 17:00:23 +05:30
Rasika Perera
0a8929c7ee Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-05-30 16:35:36 +05:30
WSO2 Builder
69a63baa43 [WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare for next development iteration 2017-05-30 11:24:51 +05:30
WSO2 Builder
713b948ea9 [WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare release v2.0.69 2017-05-30 11:24:37 +05:30
madhawap
c4d433a1a0 Fix for disabling reboot and upgrade-firmware operations on UI and Code formatting
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled. In addition change a c-style for loop to a foreach loop in PolicyManagementServiceImpl.java
2017-05-29 20:13:51 +05:30
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
ayyoob
f03155a702 fixed missing import package issue 2017-05-29 11:36:09 +05:30
ayyoob
dbdaa5a0e0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-05-29 05:44:36 +05:30
ayyoob
c3f23fa564 fixed multi tenant issues after testing custom device type impl 2017-05-29 01:00:16 +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
ayyoob
56faa75861 fixed analytics issues 2017-05-25 03:07:19 +05:30
ayyoob
75d6813d8a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-05-24 00:43:02 +05:30
ayyoob
5acf5912e4 added comment 2017-05-24 00:41:21 +05:30
ayyoob
a037f91f56 removed task Config from template 2017-05-24 00:27:13 +05:30
ayyoob
4d22bc7064 fixed UI Issues 2017-05-24 00:26:02 +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
ayyoob
dd1c2e4338 Added few fixes after testing and added default UI for device type management 2017-05-22 02:51:35 +05:30
ayyoob
6004ee7264 Adding back the sample definition file 2017-05-19 02:06:08 +05:30
ayyoob
f945da194d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-05-19 01:56:40 +05:30
ayyoob
abc9315f95 Added Pluggable Device Type 2017-05-19 01:49:10 +05:30
ayyoob
ed366867d1 Added Pluggable Device Type 2017-05-19 01:48:54 +05:30
ayyoob
6ab219c9dd Added Pluggable Device Type 2017-05-19 01:48:36 +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
1955b028d2 add tenancy to property table 2017-05-15 20:08:03 +05:30
ayyoob
fbb5f5ae88 merged with origin 2017-05-15 18:15:24 +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