community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,074 Commits 31 Branches 461 Tags 183 MiB
11ea50e8ab
Commit Graph

4905 Commits

Author SHA1 Message Date
sinthuja
a9c5188e0d Adding the specific imports. 2017-09-01 16:51:28 +05:30
WSO2 Builder
0e71daac2d Merge commit '88823569479ecd1dcbb00a4603c4ce878f29aa95' into c7e7e55b-2abf-4888-be5c-8aced62d2a18 2017-09-01 11:20:46 +00:00
sinthuja
e6b8af986b Adding the specific imports. 2017-09-01 16:48:50 +05:30
Pasindu
8000124f8c Fixes validation of role when creating new user 2017-09-01 16:48:30 +05:30
sinthuja
bb5afb07b7 Adding the class back which I mistaken deleted. 2017-09-01 16:47:33 +05:30
sinthuja
c4c30f5856 Fixing imports. 2017-09-01 16:45:23 +05:30
WSO2 Builder
8882356947 [WSO2 Release] [Jenkins #2632] [Release 3.0.102] prepare for next development iteration 2017-09-01 11:06:09 +00:00
WSO2 Builder
080cd54fef [WSO2 Release] [Jenkins #2632] [Release 3.0.102] prepare release v3.0.102 2017-09-01 11:04:45 +00:00
sinthuja
a1d6065c75 Sending email only when the mail transport is enabled. 2017-09-01 16:11:59 +05:30
sinthuja
3edc71f04d Merge branch 'wso2-master' 2017-09-01 16:08:51 +05:30
sinthuja
77c02fae46 Merge pull request #943 from Nirothipan/master 
Fixing User create form error when creating a new user. #1360
 2017-09-01 16:04:02 +05:30
Pasindu
f8f82e66db Fix validate error display issue 2017-09-01 15:51:57 +05:30
Nirothipan
dc9eac3ac8 fixing product-iots#1360 2017-09-01 15:51:54 +05:30
Pasindu
1581775aa6 Fixes validation issue in create group 2017-09-01 15:38:28 +05:30
sinthuja
61ac576d6c Fixing https://github.com/wso2/product-iots/issues/1376. 2017-09-01 15:34:34 +05:30
WSO2 Builder
4eec53f51c [WSO2 Release] [Jenkins #2630] [Release 3.0.101] prepare for next development iteration 2017-09-01 10:00:51 +00:00
WSO2 Builder
dbcc5c2935 [WSO2 Release] [Jenkins #2630] [Release 3.0.101] prepare release v3.0.101 2017-09-01 10:00:37 +00:00
amalhub
5fc833332a Resolves: https://github.com/wso2/product-iots/issues/1302 2017-09-01 15:27:06 +05:30
WSO2 Builder
0107012262 [WSO2 Release] [Jenkins #2628] [Release 3.0.100] prepare for next development iteration 2017-09-01 08:30:33 +00:00
WSO2 Builder
26e87c1865 [WSO2 Release] [Jenkins #2628] [Release 3.0.100] prepare release v3.0.100 2017-09-01 08:29:09 +00:00
sameeragunarathne
6cbedc2ed5 Merge pull request #941 from sinthuja/master 
Fixing https://github.com/wso2/product-iots/issues/1374.
 2017-09-01 13:55:29 +05:30
sinthuja
c53e027701 Fixing https://github.com/wso2/product-iots/issues/1374. 2017-09-01 13:02:13 +05:30
WSO2 Builder
5d6fb21dd5 [WSO2 Release] [Jenkins #2625] [Release 3.0.99] prepare for next development iteration 2017-08-31 14:38:28 +00:00
WSO2 Builder
65725501b8 [WSO2 Release] [Jenkins #2625] [Release 3.0.99] prepare release v3.0.99 2017-08-31 14:37:04 +00:00
Menaka Jayawardena
54b616985e Added check for updating admin user by typing the url + code formatting. 2017-08-31 19:30:40 +05:30
Menaka Jayawardena
21b0ed284b Removed hardcoded admin user name. 2017-08-31 19:30:40 +05:30
Menaka Jayawardena
b04bb5f1f1 Disabled edit button for admin role. 2017-08-31 19:30:40 +05:30
WSO2 Builder
7cf67b4be5 [WSO2 Release] [Jenkins #2623] [Release 3.0.98] prepare for next development iteration 2017-08-31 13:27:02 +00:00
WSO2 Builder
1d894b5d7d [WSO2 Release] [Jenkins #2623] [Release 3.0.98] prepare release v3.0.98 2017-08-31 13:26:49 +00:00
sameeragunarathne
57db0fffbf Merge pull request #940 from sinthuja/master 
Fixing https://github.com/wso2/product-iots/issues/354.
 2017-08-31 18:22:24 +05:30
sinthuja
c308147357 Fixing https://github.com/wso2/product-iots/issues/354. 2017-08-31 18:13:42 +05:30
WSO2 Builder
0a1197f4b1 [WSO2 Release] [Jenkins #2621] [Release 3.0.97] prepare for next development iteration 2017-08-31 12:16:54 +00:00
WSO2 Builder
1184da01eb [WSO2 Release] [Jenkins #2621] [Release 3.0.97] prepare release v3.0.97 2017-08-31 12:16:40 +00:00
Kamidu Sachith Punchihewa
8d880c50bd Merge pull request #939 from harshanL/master 
Fixes for product-iots#1367 and product-iots#1285
 2017-08-31 17:13:41 +05:30
sinthuja
ccda9b009c Merge pull request #938 from sinthuja/master 
Fixing https://github.com/wso2/product-iots/issues/353.
 2017-08-31 17:01:30 +05:30
Harshan Liyanage
b87d3898f6 Fixes for wso2/product-iots#1285 2017-08-31 16:59:43 +05:30
Harshan Liyanage
5996e6841b Added null check to resolve wso2/product-iots#1367 2017-08-31 16:56:53 +05:30
sinthuja
ddb8f4e9b3 Fixing https://github.com/wso2/product-iots/issues/353. 2017-08-31 16:53:57 +05:30
WSO2 Builder
cd0195b7e7 [WSO2 Release] [Jenkins #2619] [Release 3.0.96] prepare for next development iteration 2017-08-31 11:03:33 +00:00
WSO2 Builder
565fa83984 [WSO2 Release] [Jenkins #2619] [Release 3.0.96] prepare release v3.0.96 2017-08-31 11:03:20 +00:00
WSO2 Builder
afaee46693 Merge commit '3308898268f59b076e8baeec34fcb2766f4d9b81' into 5fe78a3a-1bdc-490d-a4ee-fefb5b48e31b 2017-08-31 10:22:35 +00:00
WSO2 Builder
3308898268 [WSO2 Release] [Jenkins #2618] [Release 3.0.95] prepare for next development iteration 2017-08-31 10:12:37 +00:00
WSO2 Builder
bedac61574 [WSO2 Release] [Jenkins #2618] [Release 3.0.95] prepare release v3.0.95 2017-08-31 10:11:13 +00:00
sinthuja
e6ff84918e Merge branch 'wso2-master' 
# Conflicts:
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/IntegrationClientServiceImpl.java
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/CredentialManagementResponseBuilder.java
 2017-08-31 15:38:00 +05:30
sinthuja
465d801f42 Fixing https://github.com/wso2/product-iots/issues/1356. 2017-08-31 15:34:33 +05:30
amalhub
308a2809ef Resolves: https://github.com/wso2/product-iots/issues/1161 2017-08-31 15:20:05 +05:30
WSO2 Builder
04eeb40649 [WSO2 Release] [Jenkins #2616] [Release 3.0.94] prepare for next development iteration 2017-08-31 08:45:03 +00:00
WSO2 Builder
9ee9b39fda [WSO2 Release] [Jenkins #2616] [Release 3.0.94] prepare release v3.0.94 2017-08-31 08:43:39 +00:00
WSO2 Builder
be3c7fc065 Merge commit 'ef63b2858c32817010a4f359b61cf861444f2ff3' into 2415c4fb-5619-4064-8917-b37679ac65e8 2017-08-31 08:19:55 +00:00
Charitha Goonetilleke
0f7e488d2b Merge pull request #934 from ruwany/master 
Adding fix for https://github.com/wso2/product-iots/issues/667
 2017-08-31 13:44:35 +05:30
WSO2 Builder
ef63b2858c [WSO2 Release] [Jenkins #2615] [Release 3.0.93] prepare for next development iteration 2017-08-31 08:04:50 +00:00
WSO2 Builder
23f72681b0 [WSO2 Release] [Jenkins #2615] [Release 3.0.93] prepare release v3.0.93 2017-08-31 08:03:26 +00:00
Ace
77152ca0a5 Adding fix for https://github.com/wso2/product-iots/issues/667 2017-08-31 12:49:57 +05:30
Menaka Jayawardena
8cac8a3bdc Added edit buttons for User and policy views. 2017-08-31 12:04:27 +05:30
Menaka Jayawardena
29086834eb Added tooltips for policy listing page. 2017-08-31 12:04:27 +05:30
WSO2 Builder
9324cc0668 [WSO2 Release] [Jenkins #2612] [Release 3.0.92] prepare for next development iteration 2017-08-30 13:15:18 +00:00
WSO2 Builder
98302eea71 [WSO2 Release] [Jenkins #2612] [Release 3.0.92] prepare release v3.0.92 2017-08-30 13:15:04 +00:00
WSO2 Builder
e03cd7650e Merge commit '04c4c961677ca7942aab73065376db57bf63d61d' into 6f2f9911-e57e-4379-83c0-4c6f6fb151ab 2017-08-30 18:19:30 +05:30
Geeth
00bebe5049 Merge pull request #932 from harshanL/master 
Resolved wso2/product-iots#1358
 2017-08-30 18:02:58 +05:30
WSO2 Builder
04c4c96167 [WSO2 Release] [Jenkins #2611] [Release 3.0.91] prepare for next development iteration 2017-08-30 17:58:44 +05:30
WSO2 Builder
585a4bf9a7 [WSO2 Release] [Jenkins #2611] [Release 3.0.91] prepare release v3.0.91 2017-08-30 17:58:30 +05:30
Menaka Jayawardena
9f2603a126 Bring the roles select list in-front of the modal and set colors of selected roles. 2017-08-30 17:47:13 +05:30
sinthuja
749f1ccdcf Merge pull request #931 from Nirothipan/master 
Fixes for [MDM-367] Proper "Error" message is not given when trying to invite a user without having the email transport properly configured. #504
 2017-08-30 17:40:05 +05:30
Harshan Liyanage
00c7dd0c63 Resolved wso2/product-iots#1358 2017-08-30 17:07:10 +05:30
Nirothipan
46921ac277 Resolving conflicts 2017-08-30 17:06:48 +05:30
WSO2 Builder
10d2388e8a [WSO2 Release] [Jenkins #2609] [Release 3.0.90] prepare for next development iteration 2017-08-30 11:24:43 +00:00
WSO2 Builder
3b920b82a9 [WSO2 Release] [Jenkins #2609] [Release 3.0.90] prepare release v3.0.90 2017-08-30 11:23:57 +00:00
Nirothipan
955fe4b4b5 checking message 2017-08-30 16:50:26 +05:30
Harshan Liyanage
ec78ba09f2 Merge pull request #924 from GDLMadushanka/master 
Logging errors in devmgt and groupmgt services
 2017-08-30 16:33:21 +05:30
GDLMadushanka
10a80fecf8 Refactoring 2017-08-30 16:29:08 +05:30
Nirothipan
9d3b2ebf42 fixes for product-iots #504 2017-08-30 16:20:32 +05:30
WSO2 Builder
be565626c4 [WSO2 Release] [Jenkins #2607] [Release 3.0.89] prepare for next development iteration 2017-08-30 15:30:26 +05:30
WSO2 Builder
8ee37f75e3 [WSO2 Release] [Jenkins #2607] [Release 3.0.89] prepare release v3.0.89 2017-08-30 15:30:12 +05:30
WSO2 Builder
34e8341c5e Merge commit '43cef091c593e47e67de0d80e958d970380a1dbc' into 35fc241c-ca48-4d6d-8da9-b9d2c41070d6 2017-08-30 15:05:11 +05:30
WSO2 Builder
43cef091c5 [WSO2 Release] [Jenkins #2606] [Release 3.0.88] prepare for next development iteration 2017-08-30 14:51:43 +05:30
WSO2 Builder
2f77cc99d8 [WSO2 Release] [Jenkins #2606] [Release 3.0.88] prepare release v3.0.88 2017-08-30 14:51:29 +05:30
Harshan Liyanage
28cc62b405 Merge pull request #929 from amalhub/master 
Resolves: https://github.com/wso2/product-iots/issues/1008
 2017-08-30 14:45:27 +05:30
amalhub
eed54aaf9f Resolves: https://github.com/wso2/product-iots/issues/1008 2017-08-30 14:32:21 +05:30
Ruwan
72956afd5a Merge pull request #928 from sinthuja/master 
Fixing the issue in resetting the password for the email user
 2017-08-30 14:32:07 +05:30
sinthuja
f08ade1a40 Fixing the issue in resetting the password for the email user - https://github.com/wso2/product-iots/issues/609. 2017-08-30 14:27:29 +05:30
WSO2 Builder
bad400f17f [WSO2 Release] [Jenkins #2604] [Release 3.0.87] prepare for next development iteration 2017-08-30 07:08:18 +00:00
WSO2 Builder
c8ce7837e4 [WSO2 Release] [Jenkins #2604] [Release 3.0.87] prepare release v3.0.87 2017-08-30 07:06:53 +00:00
amalhub
84ad02156b Resolves: https://github.com/wso2/product-iots/issues/1339, https://github.com/wso2/product-iots/issues/1300 2017-08-30 12:20:51 +05:30
GDLMadushanka
92d6624bbf refactoring error/debug logs 2017-08-30 11:33:39 +05:30
WSO2 Builder
721b059de7 [WSO2 Release] [Jenkins #2601] [Release 3.0.86] prepare for next development iteration 2017-08-29 13:04:12 +00:00
WSO2 Builder
a070585e89 [WSO2 Release] [Jenkins #2601] [Release 3.0.86] prepare release v3.0.86 2017-08-29 13:02:48 +00:00
Harshan Liyanage
4067a86ee9 Merge pull request #925 from menakaj/master 
Fixes wso2/product-iots#755
 2017-08-29 18:23:59 +05:30
Menaka Jayawardena
ba8e70320e Added tooltips for Role listing. 2017-08-29 18:18:43 +05:30
WSO2 Builder
c037770528 [WSO2 Release] [Jenkins #2599] [Release 3.0.85] prepare for next development iteration 2017-08-29 12:03:10 +00:00
WSO2 Builder
9ed6a6bb42 [WSO2 Release] [Jenkins #2599] [Release 3.0.85] prepare release v3.0.85 2017-08-29 12:02:57 +00:00
Madawa Soysa
62141db52e Merge pull request #922 from menakaj/master 
Redirecting to listing pages after creating and editing Roles, Users, Policies and Groups.
 2017-08-29 17:08:12 +05:30
Menaka Jayawardena
a32cf89757 Fixed formatting issues. 2017-08-29 17:06:12 +05:30
Menaka Jayawardena
adce200842 Typo fix in policy create js. 2017-08-29 15:39:36 +05:30
Menaka Jayawardena
85b437a0f0 Redirect to Policy Listing page after editing a policy. 2017-08-29 15:35:44 +05:30
Menaka Jayawardena
c754b64653 Redirect to Role Listing page after editing a Role. 2017-08-29 15:23:27 +05:30
Menaka Jayawardena
80a08a2744 Redirect to Group Listing page after creating a Group. 2017-08-29 15:17:36 +05:30
Menaka Jayawardena
d8a8f6adf7 Restructured the setTimeout function. 2017-08-29 15:13:39 +05:30
Menaka Jayawardena
e238cfd2f9 Redirect to user listing after editing the user. 2017-08-29 15:12:27 +05:30
Menaka Jayawardena
bf789b91f3 Added user creation success modal. 2017-08-29 14:58:24 +05:30
Menaka Jayawardena
9ee5056967 Redirect to Permission listing after creating permission. 2017-08-29 14:52:57 +05:30
WSO2 Builder
463b843b8b [WSO2 Release] [Jenkins #2597] [Release 3.0.84] prepare for next development iteration 2017-08-29 08:55:49 +00:00
WSO2 Builder
aed8496a2b [WSO2 Release] [Jenkins #2597] [Release 3.0.84] prepare release v3.0.84 2017-08-29 08:54:25 +00:00
GDLMadushanka
78d60b1a92 Refactoring 2017-08-29 14:15:26 +05:30
GDLMadushanka
d7220d39af logging errors in devmgt service and groupmgt service 2017-08-29 14:12:17 +05:30
WSO2 Builder
0c6eab198c Merge commit '68a49d7e666f0b4895de3b6048d599c579bf9429' into d6a2ef64-9f2a-4574-b4e9-d995eb90a0c9 2017-08-29 08:33:49 +00:00
Harshan Liyanage
2d8139cc18 Changed the group related messages which resolves wso2/product-iots#984 2017-08-29 13:57:19 +05:30
WSO2 Builder
68a49d7e66 [WSO2 Release] [Jenkins #2596] [Release 3.0.83] prepare for next development iteration 2017-08-29 08:22:43 +00:00
WSO2 Builder
3c319811ef [WSO2 Release] [Jenkins #2596] [Release 3.0.83] prepare release v3.0.83 2017-08-29 08:21:19 +00:00
Menaka Jayawardena
815d92bd27 Removed repeated 'be' in policy create. 2017-08-29 13:25:08 +05:30
Milan Perera
eda93ad6aa Merge pull request #921 from menakaj/master 
Set redirection to policy listing page after creating policy.
 2017-08-29 13:18:45 +05:30
Menaka Jayawardena
31448ec07c Set redirection to policy listing page after creating policy. 2017-08-29 13:14:33 +05:30
WSO2 Builder
2d6393a2c5 [WSO2 Release] [Jenkins #2594] [Release 3.0.82] prepare for next development iteration 2017-08-29 07:09:44 +00:00
sinthuja
c04e4d3c42 Committing initial refactoring for visibility change. 2017-08-29 12:39:21 +05:30
WSO2 Builder
887102d822 [WSO2 Release] [Jenkins #2594] [Release 3.0.82] prepare release v3.0.82 2017-08-29 07:08:20 +00:00
WSO2 Builder
778528e9c8 Merge commit 'f4cef3817a30c433bc0d3d79c7ba37fe6d175864' into f88e4078-c010-415b-8eca-acfe71205eb5 2017-08-29 06:48:43 +00:00
Dileesha Rajapakse
c23809b362 Corrected typos in config files 2017-08-29 12:13:39 +05:30
Dileesha Rajapakse
3ff16ee6d1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-29 12:09:51 +05:30
Dileesha Rajapakse
3cdb3439eb Fixing product-iots#1236 
Fixed https://github.com/wso2/product-iots/issues/1236
 2017-08-29 12:09:38 +05:30
WSO2 Builder
f4cef3817a [WSO2 Release] [Jenkins #2593] [Release 3.0.81] prepare for next development iteration 2017-08-29 06:36:31 +00:00
WSO2 Builder
02cc2a37c1 [WSO2 Release] [Jenkins #2593] [Release 3.0.81] prepare release v3.0.81 2017-08-29 06:35:07 +00:00
Harshan Liyanage
0cca31dd06 Updated config.json file which resolves wso2/product-iots#1293 2017-08-29 11:57:52 +05:30
megala21
9c31b93937 Fixing minor issues 2017-08-29 09:52:35 +05:30
WSO2 Builder
8b3feec052 [WSO2 Release] [Jenkins #2590] [Release 3.0.80] prepare for next development iteration 2017-08-28 16:43:58 +00:00
WSO2 Builder
87ac798344 [WSO2 Release] [Jenkins #2590] [Release 3.0.80] prepare release v3.0.80 2017-08-28 16:42:34 +00:00
Ruwan
08a46cbf89 Merge pull request #917 from charithag/master 
Fix for wso2/product-iots#1305
 2017-08-28 21:57:35 +05:30
WSO2 Builder
8c7d23a754 [WSO2 Release] [Jenkins #2588] [Release 3.0.79] prepare for next development iteration 2017-08-28 15:37:51 +00:00
WSO2 Builder
c0735b5842 [WSO2 Release] [Jenkins #2588] [Release 3.0.79] prepare release v3.0.79 2017-08-28 15:36:27 +00:00
Ruwan
d6dbe5ed8a Merge pull request #918 from menakaj/master 
Fixes wso2/product-iots#743
 2017-08-28 21:05:47 +05:30
Menaka Jayawardena
7f93ebedb2 Fixes wso2/product-iots#743 2017-08-28 21:03:22 +05:30
charitha
b9abacfc61 Revert automatic reformatting 2017-08-28 19:18:26 +05:30
charitha
7b266fc64e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-28 19:09:42 +05:30
charitha
3bce479b4b Fix for https://github.com/wso2/product-iots/issues/1305 2017-08-28 18:57:37 +05:30
WSO2 Builder
709015ea6d [WSO2 Release] [Jenkins #2586] [Release 3.0.78] prepare for next development iteration 2017-08-28 12:46:49 +00:00
WSO2 Builder
22b43af120 [WSO2 Release] [Jenkins #2586] [Release 3.0.78] prepare release v3.0.78 2017-08-28 12:45:25 +00:00
Milan Perera
672b556937 Merge pull request #916 from menakaj/master 
Fixes product-iots#745
 2017-08-28 18:13:27 +05:30
Menaka Jayawardena
7c88653bd9 Fixes /wso2/product-iots#745 2017-08-28 18:09:46 +05:30
WSO2 Builder
897f0451e3 [WSO2 Release] [Jenkins #2584] [Release 3.0.77] prepare for next development iteration 2017-08-28 09:50:17 +00:00
WSO2 Builder
e810157df4 [WSO2 Release] [Jenkins #2584] [Release 3.0.77] prepare release v3.0.77 2017-08-28 09:48:52 +00:00
amalhub
a7e213c9fb Fix issue: https://github.com/wso2/product-iots/issues/1133 2017-08-28 15:12:24 +05:30
amalhub
c145b77158 Implimenting API classes for App-mgt Store 2017-08-28 11:44:11 +05:30
WSO2 Builder
6921656997 [WSO2 Release] [Jenkins #2577] [Release 3.0.76] prepare for next development iteration 2017-08-23 11:54:15 +00:00
WSO2 Builder
29af5cfdbb [WSO2 Release] [Jenkins #2577] [Release 3.0.76] prepare release v3.0.76 2017-08-23 11:52:51 +00:00
Megala Uthayakumar
c10f4e3587 Merge pull request #913 from Megala21/appm_new 
Fixing some tenant related issues in Application Management and some improvements
 2017-08-23 16:38:56 +05:30
megala21
053008932d Minor fixes to mysql script and refactoring 2017-08-23 16:36:11 +05:30
Harshan Liyanage
8621fb8d90 Updated the theme for adding extra space in error message icon related to wso2/product-iots#1307 2017-08-23 16:34:38 +05:30
megala21
17c23b9674 Fixing some issues 2017-08-22 21:34:04 +05:30
WSO2 Builder
8c02393f2f [WSO2 Release] [Jenkins #2574] [Release 3.0.75] prepare for next development iteration 2017-08-22 11:38:57 +00:00
WSO2 Builder
9ef8dbda65 [WSO2 Release] [Jenkins #2574] [Release 3.0.75] prepare release v3.0.75 2017-08-22 11:37:33 +00:00
Megala Uthayakumar
9460c4fb63 Merge pull request #902 from menakaj/application-mgt 
App Publisher UI : Basic Layout.
 2017-08-22 16:00:48 +05:30
Dileesha Rajapakse
293eca0620 Fixing product-iots#1313 
Fixed https://github.com/wso2/product-iots/issues/1313
 2017-08-22 15:44:58 +05:30
WSO2 Builder
c18f63d607 [WSO2 Release] [Jenkins #2572] [Release 3.0.74] prepare for next development iteration 2017-08-22 07:13:11 +00:00
WSO2 Builder
e75d78cd3f [WSO2 Release] [Jenkins #2572] [Release 3.0.74] prepare release v3.0.74 2017-08-22 07:11:46 +00:00
Harshan Liyanage
5b3e88d7d5 Removed top device-name search input from device-listing page which resolves wso2/product-iots#1320 2017-08-22 12:33:30 +05:30
Dileesha Rajapakse
f6c93261a1 Refactored device-view.js 2017-08-22 10:50:47 +05:30
Dileesha Rajapakse
4ec8894a3d Fixing product-iots#1308 
Fixed https://github.com/wso2/product-iots/issues/1308
 2017-08-22 10:47:00 +05:30
Menaka Jayawardena
dc2aa386bf Fixed license header and removed empty tags. 2017-08-22 01:44:16 +05:30
Dileesha Rajapakse
ae4442f4f3 Refactored the device group view 2017-08-22 00:11:35 +05:30
Dileesha Rajapakse
2b8f56e790 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-21 23:18:45 +05:30
megala21
884511fd68 Fixing issues for mysql database and adding CRUD operations to application release 2017-08-21 17:39:27 +05:30
Dileesha Rajapakse
2e5261b025 Added a Refresh button to the application list tab in the device view 2017-08-21 17:37:39 +05:30
WSO2 Builder
8016ccb3d4 [WSO2 Release] [Jenkins #2567] [Release 3.0.73] prepare for next development iteration 2017-08-21 11:26:59 +00:00
WSO2 Builder
709aad6bd3 [WSO2 Release] [Jenkins #2567] [Release 3.0.73] prepare release v3.0.73 2017-08-21 11:25:34 +00:00
Harshan Liyanage
829bde940d Enabled advacne search - resolves wso2/product-iots#1321 2017-08-21 16:51:20 +05:30
Menaka Jayawardena
cbc061f739 Changes as per the comments. 2017-08-21 16:49:06 +05:30
WSO2 Builder
7294298c4b [WSO2 Release] [Jenkins #2565] [Release 3.0.72] prepare for next development iteration 2017-08-21 09:55:02 +00:00
WSO2 Builder
8738d1dde1 [WSO2 Release] [Jenkins #2565] [Release 3.0.72] prepare release v3.0.72 2017-08-21 09:53:38 +00:00
Dileesha Rajapakse
d35fa791aa Refactored the device-view.js script 2017-08-21 15:20:56 +05:30
Dileesha Rajapakse
2bea7309fd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-21 15:04:14 +05:30
Dileesha Rajapakse
c41a704a35 Fixing product-iots#1322 
Fixed https://github.com/wso2/product-iots/issues/1322
 2017-08-21 15:04:01 +05:30
WSO2 Builder
a057d4d1e8 [WSO2 Release] [Jenkins #2563] [Release 3.0.71] prepare for next development iteration 2017-08-21 08:40:45 +00:00
WSO2 Builder
c9901f480f [WSO2 Release] [Jenkins #2563] [Release 3.0.71] prepare release v3.0.71 2017-08-21 08:39:21 +00:00
Dileesha Rajapakse
c6d6d61df6 Fixed formatting issues 2017-08-21 14:01:55 +05:30
Dileesha Rajapakse
d518ebd271 Fixing product-iots#1314 
Fixed https://github.com/wso2/product-iots/issues/1314
 2017-08-21 13:54:58 +05:30
megala21
7fd7fbb30e Adding refactoring as per maven checkstyle plugin 2017-08-20 23:31:57 +05:30
Menaka Jayawardena
4d16d73b23 Created the Step 2 and 3 basic forms. Code Formatting. 2017-08-20 13:39:37 +05:30
Menaka Jayawardena
d2705b1427 Added the stepper and App creation first step. 2017-08-20 01:44:12 +05:30
megala21
5a8bf10d5a Adding Artifacts download APIS 2017-08-18 17:33:24 +05:30
WSO2 Builder
9caea327d6 [WSO2 Release] [Jenkins #2558] [Release 3.0.70] prepare for next development iteration 2017-08-18 07:14:10 +00:00
WSO2 Builder
e0a0c9618d [WSO2 Release] [Jenkins #2558] [Release 3.0.70] prepare release v3.0.70 2017-08-18 07:12:46 +00:00
Kamidu Sachith Punchihewa
dd27c32981 Merge pull request #894 from wso2/rasika-patch-1 
Update user-menu.js
 2017-08-18 12:34:33 +05:30
megala21
f5feb897f9 Adding initial application release related artifacts 2017-08-18 09:29:14 +05:30
Menaka Jayawardena
c7c0f62ca2 The base layout completed. 2017-08-17 23:59:01 +05:30
Menaka Jayawardena
44737750b8 Created the login page. 2017-08-16 21:07:57 +05:30
Menaka Jayawardena
03b6faa7c2 Created the project file structure. 2017-08-16 21:07:14 +05:30
WSO2 Builder
e358b9106b [WSO2 Release] [Jenkins #2553] [Release 3.0.69] prepare for next development iteration 2017-08-15 14:31:05 +00:00
WSO2 Builder
b794b55740 [WSO2 Release] [Jenkins #2553] [Release 3.0.69] prepare release v3.0.69 2017-08-15 14:29:41 +00:00
Rasika Perera
41e9833c5b Merge pull request #892 from Kamidu/master 
Device cloud related ui improvments
 2017-08-15 19:30:56 +05:30
Menaka Jayawardena
72f0e195b7 Created basic directory structure 2017-08-15 16:04:42 +05:30
Menaka Jayawardena
d948d85bbb App Publisher React application. Initial Commit. 2017-08-15 14:57:52 +05:30
megala21
c428cf1067 Refactoring 2017-08-14 23:07:22 +05:30
megala21
9ec12587c7 Fixing issues with Application Management with mysql 2017-08-14 17:39:45 +05:30
megala21
41fa1cb524 Adding fixed life-cyle related operations for application 2017-08-14 00:06:50 +05:30
WSO2 Builder
c2406a86c5 [WSO2 Release] [Jenkins #2547] [Release 3.0.68] prepare for next development iteration 2017-08-11 17:14:15 +00:00
WSO2 Builder
2561305378 [WSO2 Release] [Jenkins #2547] [Release 3.0.68] prepare release v3.0.68 2017-08-11 17:12:52 +00:00
Imesh Chandrasiri
f4d8b46152 fixes wso2/product-iots#1295 2017-08-11 22:32:12 +05:30
Rasika Perera
04f1f9fb42 Update user-menu.js 2017-08-11 14:40:01 +05:30
WSO2 Builder
e795f0e86d [WSO2 Release] [Jenkins #2545] [Release 3.0.67] prepare for next development iteration 2017-08-11 10:47:47 +05:30
WSO2 Builder
2bf79704e5 [WSO2 Release] [Jenkins #2545] [Release 3.0.67] prepare release v3.0.67 2017-08-11 10:47:31 +05:30
megala21
48fa95d7c7 Re-factoring 2017-08-10 22:23:24 +05:30
megala21
1b6dcca408 Fixing geo fencing issue when having multiple devices 2017-08-10 22:19:58 +05:30
megala21
6e912fccfc Adding initial fixes for lifecycle state 2017-08-10 19:50:05 +05:30
WSO2 Builder
c4733eb480 [WSO2 Release] [Jenkins #2542] [Release 3.0.66] prepare for next development iteration 2017-08-10 11:52:06 +00:00
WSO2 Builder
47778d40c0 [WSO2 Release] [Jenkins #2542] [Release 3.0.66] prepare release v3.0.66 2017-08-10 11:51:52 +00:00
kamidu
19a4204254 fixes ui related isses 2017-08-10 17:21:47 +05:30
Madawa Soysa
3e13588554 Merge pull request #891 from rasika/master 
Geo fencing improvements : Error Messages not shown
 2017-08-10 17:16:05 +05:30
Rasika Perera
5317b05643 Geo fencing improvements 2017-08-10 17:13:45 +05:30
kamidu
326afc3f06 Enabling ios platform configurations on Device cloud 2017-08-10 16:51:08 +05:30
kamidu
b7433ccbbb fixing the ui text issues in device cloud 2017-08-10 16:50:26 +05:30
kamidu
9a12dfb91b enable JS level audit logs for device cloud 2017-08-10 16:49:02 +05:30
WSO2 Builder
c92a21b4db [WSO2 Release] [Jenkins #2539] [Release 3.0.65] prepare for next development iteration 2017-08-09 12:27:50 +00:00
WSO2 Builder
1ec11c94e1 [WSO2 Release] [Jenkins #2539] [Release 3.0.65] prepare release v3.0.65 2017-08-09 12:26:26 +00:00
lasantha
1afe61eb48 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-09 17:36:56 +05:30
lasantha
c2d8c6522b fixing minor issues 2017-08-09 17:28:49 +05:30
lasantha
8376948013 Fixed geo-dashoard stream connection issue 2017-08-09 17:21:53 +05:30
WSO2 Builder
b3fac5908f [WSO2 Release] [Jenkins #2537] [Release 3.0.64] prepare for next development iteration 2017-08-09 07:35:08 +00:00
WSO2 Builder
bb5fddf56b [WSO2 Release] [Jenkins #2537] [Release 3.0.64] prepare release v3.0.64 2017-08-09 07:33:44 +00:00
Dileesha Rajapakse
83de69a66e Fixing product-iots#1281 (#889) 
Fixed https://github.com/wso2/product-iots/issues/1281
 2017-08-09 12:58:36 +05:30
Chathura Ekanayake
9f76f51ee0 lifecycle management changes 2017-08-08 16:13:49 +05:30
WSO2 Builder
442e0ab6a6 [WSO2 Release] [Jenkins #2534] [Release 3.0.63] prepare for next development iteration 2017-08-08 08:03:35 +00:00
WSO2 Builder
9680fa8ee1 [WSO2 Release] [Jenkins #2534] [Release 3.0.63] prepare release v3.0.63 2017-08-08 08:03:22 +00:00
Chathura Ekanayake
3f279918eb merging platform management 2017-08-08 11:22:56 +05:30
Chathura Ekanayake
071e45129d implementing application lifecycle management 2017-08-08 10:22:48 +05:30
megala21
8dc7e2786d Adding javadoc comments 2017-08-08 09:45:50 +05:30
WSO2 Builder
d78d443b1f [WSO2 Release] [Jenkins #2531] [Release 3.0.62] prepare for next development iteration 2017-08-07 17:49:32 +00:00
WSO2 Builder
d604f9048c [WSO2 Release] [Jenkins #2531] [Release 3.0.62] prepare release v3.0.62 2017-08-07 17:48:07 +00:00
Dharmakeerhi Lasantha
919a16affb resolved broken pipe issue (#885) 2017-08-07 23:13:23 +05:30
megala21
1ab9807dbd Adding postgre mssql database supports for PlatformManagement 2017-08-06 22:19:43 +05:30
megala21
612905bc5f Adding oracle scripts and impl for PlatformManagement 2017-08-06 00:26:41 +05:30
WSO2 Builder
dfad4c3707 [WSO2 Release] [Jenkins #2527] [Release 3.0.61] prepare for next development iteration 2017-08-05 10:02:54 +00:00
WSO2 Builder
acf4fb59f1 [WSO2 Release] [Jenkins #2527] [Release 3.0.61] prepare release v3.0.61 2017-08-05 10:01:30 +00:00
WSO2 Builder
4539e47fac [WSO2 Release] [Jenkins #2526] [Release 3.0.60] prepare for next development iteration 2017-08-05 09:30:33 +00:00
WSO2 Builder
bba6c32e62 [WSO2 Release] [Jenkins #2526] [Release 3.0.60] prepare release v3.0.60 2017-08-05 09:29:09 +00:00
Lahiru Madushanka
c001d96877 Fix for 1261 (#884) 2017-08-05 14:53:44 +05:30
Madawa Soysa
db325a637e Truncating applist version if length greater than allowed length (#881) 
In this commit, the application version is truncated if the version length is greater than the maximum allowed length in the database level.
 2017-08-05 14:53:32 +05:30
WSO2 Builder
f166be7d54 [WSO2 Release] [Jenkins #2523] [Release 3.0.59] prepare for next development iteration 2017-08-04 10:36:13 +05:30
WSO2 Builder
cbdf9ff922 [WSO2 Release] [Jenkins #2523] [Release 3.0.59] prepare release v3.0.59 2017-08-04 10:35:58 +05:30
Milan Perera
25840a1279 Fixed NPE in API publisher client (#882) 2017-08-04 09:33:37 +05:30
megala21
ec0be0183e Re-structuring and adding changes after testing 2017-08-03 22:15:02 +05:30
WSO2 Builder
7abc9e5844 [WSO2 Release] [Jenkins #2520] [Release 3.0.58] prepare for next development iteration 2017-08-03 15:35:34 +00:00
WSO2 Builder
b204d2f17d [WSO2 Release] [Jenkins #2520] [Release 3.0.58] prepare release v3.0.58 2017-08-03 15:34:09 +00:00
lasantha
1fc66ed180 Adding generate link api 2017-08-03 20:24:39 +05:30
megala21
9bc069a957 Adding Axis2Oberserver and improving the databse queries 2017-08-02 17:12:07 +05:30
WSO2 Builder
63a0082c40 [WSO2 Release] [Jenkins #2517] [Release 3.0.57] prepare for next development iteration 2017-08-02 10:55:31 +00:00
WSO2 Builder
534a6b4235 [WSO2 Release] [Jenkins #2517] [Release 3.0.57] prepare release v3.0.57 2017-08-02 10:54:06 +00:00
Geeth
d8d8b6f644 Merge pull request #880 from milanperera/iot-master 
Fixed JWT properties reading issue
 2017-08-02 16:23:16 +05:30
Milan Perera
43eda69c62 Fixed JWT properties reading issue 
Previously JWT properties file was read to get the defult-jwt-client properties. If someone wants to avoid reading the default keystores, it can only be done by uploading a jwt properties to registry and reading from itself.
This fix changes the default properties reading mechanism to get the properties from the file and creates a jwt client without being the default
 2017-08-02 15:58:27 +05:30
WSO2 Builder
161657a790 [WSO2 Release] [Jenkins #2515] [Release 3.0.56] prepare for next development iteration 2017-08-02 09:45:58 +00:00
WSO2 Builder
9949209364 [WSO2 Release] [Jenkins #2515] [Release 3.0.56] prepare release v3.0.56 2017-08-02 09:44:34 +00:00
WSO2 Builder
787defbc55 [WSO2 Release] [Jenkins #2513] [Release 3.0.55] prepare for next development iteration 2017-08-02 07:39:39 +00:00
WSO2 Builder
c75b82c400 [WSO2 Release] [Jenkins #2513] [Release 3.0.55] prepare release v3.0.55 2017-08-02 07:38:14 +00:00
Imesh Chandrasiri
b8e496f57e Fix for tooltip not showing issue in device details page 2017-08-02 12:49:43 +05:30
WSO2 Builder
11c915863c [WSO2 Release] [Jenkins #2510] [Release 3.0.54] prepare for next development iteration 2017-08-01 11:35:57 +00:00
WSO2 Builder
4c5ea04c09 [WSO2 Release] [Jenkins #2510] [Release 3.0.54] prepare release v3.0.54 2017-08-01 11:34:33 +00:00
megala21
2ab43c89ac Merge remote-tracking branch 'upstream/application-mgt' into appm_new 2017-08-01 15:55:50 +05:30
megala21
7d191d63c5 Fixing minor issues in PlatformDeployment 2017-08-01 15:55:46 +05:30
megala21
eda5b5909c Adding platform removal 2017-08-01 14:11:37 +05:30
Chathura Ekanayake
6605c1372b improvements to database transaction handling and implementing application delete. 2017-08-01 13:34:33 +05:30
megala21
f16b03ffee Fixing minor issues in closing the database statements and resultsets 2017-07-31 17:37:35 +05:30
megala21
e79c9b4919 Fixing minor issues with database queries 2017-07-31 15:34:02 +05:30
WSO2 Builder
21f53fc7fe [WSO2 Release] [Jenkins #2507] [Release 3.0.53] prepare for next development iteration 2017-07-31 08:21:19 +00:00
WSO2 Builder
28d9c15b82 [WSO2 Release] [Jenkins #2507] [Release 3.0.53] prepare release v3.0.53 2017-07-31 08:21:02 +00:00
Madhawa Perera
55770caab1 Merge pull request #869 from DimalChandrasiri/master 
Fixing [Policies] Policy deactivate option is not available
 2017-07-31 11:39:59 +05:30
megala21
b1fc0fcfdb Fixing minor issues related with platform 2017-07-30 15:06:31 +05:30
Rasika Perera
176738b14b Geo Fencing improvements 2017-07-29 16:46:00 +05:30
megala21
55484be24b Added the datasourceService 2017-07-28 14:30:24 +05:30
Imesh Chandrasiri
4427348f69 fixes wso2/product-iot#1243 2017-07-27 18:06:28 +05:30
megala21
64cfee3822 Reverting the change 2017-07-27 16:54:32 +05:30
megala21
7b5b504f5f Reverting the cahnges to API name 2017-07-27 16:41:43 +05:30
megala21
9845855099 Changing the check style plugin 2017-07-27 16:26:57 +05:30
megala21
8f42786749 Resolving merge conflicts 2017-07-27 16:21:39 +05:30
Chathura Ekanayake
28f1ecfb5b Implementing application operations for app management 2017-07-27 15:52:12 +05:30
megala21
4140e212d7 Adding Maven Code style check 2017-07-27 15:31:07 +05:30
Imesh Chandrasiri
aa6d0da3fd fixes wso2/product-iot#1243 2017-07-27 14:23:14 +05:30
WSO2 Builder
5d603d3bbe [WSO2 Release] [Jenkins #2500] [Release 3.0.52] prepare for next development iteration 2017-07-26 23:53:03 +05:30
WSO2 Builder
941c09fb2d [WSO2 Release] [Jenkins #2500] [Release 3.0.52] prepare release v3.0.52 2017-07-26 23:52:50 +05:30
lasantha
e6a7d26ac3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-26 20:31:40 +05:30
WSO2 Builder
58880d57bc [WSO2 Release] [Jenkins #2498] [Release 3.0.51] prepare for next development iteration 2017-07-26 20:01:33 +05:30
WSO2 Builder
384debd845 [WSO2 Release] [Jenkins #2498] [Release 3.0.51] prepare release v3.0.51 2017-07-26 20:01:20 +05:30
WSO2 Builder
c3de199818 [WSO2 Release] [Jenkins #2497] [Release 3.0.50] prepare for next development iteration 2017-07-26 19:21:53 +05:30
WSO2 Builder
4d215fa3e9 [WSO2 Release] [Jenkins #2497] [Release 3.0.50] prepare release v3.0.50 2017-07-26 19:21:36 +05:30
lasantha
960b3ebc78 Fixing permission issue of creating new device type 2017-07-26 19:14:07 +05:30
Madhawa Perera
831e214f01 Merge pull request #866 from chathurace/rc3 
backend fix for the issue with getting next pending operation of cust…
 2017-07-26 18:53:41 +05:30
Imesh Chandrasiri
9ce1baa920 change CONFIG keyword to PROFILE 2017-07-26 17:31:45 +05:30
Imesh Chandrasiri
4fe1cd8ccb Fixing device type log not showing issue 2017-07-26 15:06:13 +05:30
Chathura Ekanayake
4092254b19 backend fix for the issue with getting next pending operation of custom devices. 2017-07-26 12:39:25 +05:30
WSO2 Builder
9e10af8abf [WSO2 Release] [Jenkins #2494] [Release 3.0.49] prepare for next development iteration 2017-07-25 21:27:53 +05:30
WSO2 Builder
9e19ca3202 [WSO2 Release] [Jenkins #2494] [Release 3.0.49] prepare release v3.0.49 2017-07-25 21:27:40 +05:30
WSO2 Builder
6969161053 Merge commit '1436561d5dfc66bcf0bac12ee1cc4b12e071816c' into 926f77e3-1750-45d1-a162-eae4b503cf49 2017-07-25 21:08:19 +05:30
WSO2 Builder
1436561d5d [WSO2 Release] [Jenkins #2493] [Release 3.0.48] prepare for next development iteration 2017-07-25 21:00:11 +05:30
WSO2 Builder
67ec2233f7 [WSO2 Release] [Jenkins #2493] [Release 3.0.48] prepare release v3.0.48 2017-07-25 20:59:57 +05:30
Madhawa Perera
b4f678870d Merge pull request #863 from Kamidu/master 
fixing typo in the error message
 2017-07-25 20:50:20 +05:30
Rasika Perera
b5948b4e58 Fixing text fields alignments 2017-07-25 20:35:42 +05:30
Rasika Perera
54eafe8ac9 Fixing geo fencing issues 2017-07-25 17:25:59 +05:30
WSO2 Builder
fd2c6b3341 [WSO2 Release] [Jenkins #2491] [Release 3.0.47] prepare for next development iteration 2017-07-25 16:13:01 +05:30
WSO2 Builder
0eba67108e [WSO2 Release] [Jenkins #2491] [Release 3.0.47] prepare release v3.0.47 2017-07-25 16:12:47 +05:30
Kamidu Sachith Punchihewa
18cf92dc40 Merge pull request #862 from DimalChandrasiri/master 
Fixing the issue where bulk actions are shown without bulk action getting triggered in cloud
 2017-07-25 15:49:59 +05:30
WSO2 Builder
e55611e006 [WSO2 Release] [Jenkins #2489] [Release 3.0.46] prepare for next development iteration 2017-07-25 06:46:27 +00:00
WSO2 Builder
df463350de [WSO2 Release] [Jenkins #2489] [Release 3.0.46] prepare release v3.0.46 2017-07-25 06:46:14 +00:00
megala21
f3bca0f88c Merging with master 2017-07-25 11:19:46 +05:30
Rasika Perera
669ffcdb94 Fixing Log-in api call per every page load. 2017-07-25 10:55:31 +05:30
kamidu
ff18e27ed9 fixing typo in the error message 
;
 2017-07-24 18:00:56 +05:30
Imesh Chandrasiri
9a4807b069 Changed code structuring. 2017-07-24 15:52:54 +05:30
Imesh Chandrasiri
13b3f0999d Fixing the issue where bulk actions are shown without bulk action getting triggered in cloud 2017-07-24 14:43:18 +05:30
WSO2 Builder
b7d28754c6 [WSO2 Release] [Jenkins #2483] [Release 3.0.45] prepare for next development iteration 2017-07-21 07:38:40 +05:30
WSO2 Builder
7e0a2aceb9 [WSO2 Release] [Jenkins #2483] [Release 3.0.45] prepare release v3.0.45 2017-07-21 07:38:26 +05:30
Madhawa Perera
69eb68afec Merge pull request #859 from geethkokila/master 
Fixing the activity issue with large data set
 2017-07-21 01:57:09 +05:30
WSO2 Builder
d2900dd395 [WSO2 Release] [Jenkins #2481] [Release 3.0.44] prepare for next development iteration 2017-07-20 23:40:42 +05:30
WSO2 Builder
ef8f4acc8c [WSO2 Release] [Jenkins #2481] [Release 3.0.44] prepare release v3.0.44 2017-07-20 23:40:29 +05:30
Dileesha Rajapakse
fc5e84796f Fixing Device Status search filter 2017-07-20 23:15:32 +05:30
Dileesha Rajapakse
d8ffa23a42 Fixing Device Type search filter 2017-07-20 22:11:15 +05:30
geethkokila
fe371ae693 Fixing the activity issue with large data set 2017-07-20 20:26:59 +05:30
WSO2 Builder
c7c9432768 [WSO2 Release] [Jenkins #2479] [Release 3.0.43] prepare for next development iteration 2017-07-20 19:36:16 +05:30
WSO2 Builder
75be6d2884 [WSO2 Release] [Jenkins #2479] [Release 3.0.43] prepare release v3.0.43 2017-07-20 19:36:00 +05:30
WSO2 Builder
993c1d7d2c [WSO2 Release] [Jenkins #2478] [Release 3.0.42] prepare for next development iteration 2017-07-20 18:55:48 +05:30
WSO2 Builder
e958d0b2a9 [WSO2 Release] [Jenkins #2478] [Release 3.0.42] prepare release v3.0.42 2017-07-20 18:55:30 +05:30
Madhawa Perera
8934dc2055 Merge pull request #857 from rasika/geo-fence-issues 
Avoid calling geo service when geoFencing disabled
 2017-07-20 18:28:08 +05:30
Rasika Perera
575d06f513 Geofencing refactoring 2017-07-20 17:26:44 +05:30
Chatura Dilan
5811eb6a9e removed externsions from api 2017-07-20 11:11:50 +05:30
Rasika Perera
ba0a869cdd Avoid calling geo service when geoFencing disabled 2017-07-19 20:46:47 +05:30
WSO2 Builder
09607fc4c2 [WSO2 Release] [Jenkins #2475] [Release 3.0.41] prepare for next development iteration 2017-07-19 19:11:43 +05:30
WSO2 Builder
791a85e79b [WSO2 Release] [Jenkins #2475] [Release 3.0.41] prepare release v3.0.41 2017-07-19 19:11:30 +05:30
kamidu
999ca58f7e registry version bump 2017-07-19 18:37:48 +05:30
WSO2 Builder
5b968f4fe5 [WSO2 Release] [Jenkins #2473] [Release 3.0.40] prepare for next development iteration 2017-07-19 07:24:26 +00:00
WSO2 Builder
122678f3d4 [WSO2 Release] [Jenkins #2473] [Release 3.0.40] prepare release v3.0.40 2017-07-19 07:24:14 +00:00
Dileesha Rajapakse
2d050102af Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-18 14:29:43 +05:30
Hasunie
ac3e110583 fixing updateEnrollment status issue 2017-07-18 13:45:03 +05:30
Dileesha Rajapakse
18ccb8ec03 Refactored device.js 2017-07-18 10:28:35 +05:30
WSO2 Builder
8fd9960913 [WSO2 Release] [Jenkins #2468] [Release 3.0.39] prepare for next development iteration 2017-07-18 04:19:56 +00:00
WSO2 Builder
92aa96ee18 [WSO2 Release] [Jenkins #2468] [Release 3.0.39] prepare release v3.0.39 2017-07-18 04:19:43 +00:00
Dileesha Rajapakse
6cff453b24 Fixing redirection upon user session expiration issues 2017-07-18 09:46:04 +05:30
Dileesha Rajapakse
eadb7ea02a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-18 09:42:12 +05:30
sameera910409
9db742e95a fixing https://github.com/wso2/product-iots/issues/1136 : DeviceDetailsRetrieverTask attempts to add operations to a device that has been removed 2017-07-18 00:17:26 +05:30
Dileesha Rajapakse
90099449d3 Fixing issue 1184 - Redirection not handled upon session expiration 2017-07-17 17:11:34 +05:30
Imesh Chandrasiri
4bfdec95f9 Temparory remove of device statistics 2017-07-17 15:12:29 +05:30
geethkokila
afe312152f Fixing https://github.com/wso2/product-iots/issues/1007 2017-07-17 14:43:06 +05:30
WSO2 Builder
94d270863e [WSO2 Release] [Jenkins #2466] [Release 3.0.38] prepare for next development iteration 2017-07-17 07:10:59 +00:00
WSO2 Builder
c29d83afeb [WSO2 Release] [Jenkins #2466] [Release 3.0.38] prepare release v3.0.38 2017-07-17 07:10:46 +00:00
Rasika Perera
c6cce05b11 Merge pull request #845 from rasika/cloud-fixes 
Cloud fixes
 2017-07-17 11:14:55 +05:30
WSO2 Builder
47ce6f4271 [WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare for next development iteration 2017-07-16 22:21:47 +05:30
WSO2 Builder
5dc7dc5442 [WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare release v3.0.37 2017-07-16 22:21:33 +05:30
WSO2 Builder
5acea60aef Merge commit '91456df809816dfecda50082aeafe1192ee09fc0' into 240ffbb1-c967-4109-b74d-1eb6335f277e 2017-07-16 22:02:13 +05:30
WSO2 Builder
91456df809 [WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare for next development iteration 2017-07-16 21:54:30 +05:30
WSO2 Builder
25598c12d4 [WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare release v3.0.36 2017-07-16 21:54:16 +05:30
Madhawa Perera
efde7df025 Merge pull request #851 from rasika/geo-fence-issues 
Fixing geofence issues
 2017-07-16 21:36:56 +05:30
Madhawa Perera
731d88d96e Merge pull request #850 from rasika/temp-fix-api-subscribe 
Temporary fixing download issue with adding /admin/manage/api/subscribe permission
 2017-07-16 21:36:30 +05:30
Madhawa Perera
f45b0bf863 Merge pull request #849 from rasika/logo-fix 
Changing IoT Server logo into sharp .svg format
 2017-07-16 21:36:04 +05:30
Madhawa Perera
357a78215f Merge pull request #842 from warunalakshitha/master 
Add new config to sample.xml
 2017-07-16 21:35:22 +05:30
Rasika Perera
c31461d278 Fixes https://github.com/wso2/product-iots/issues/1096 2017-07-16 19:01:06 +05:30
Rasika Perera
f3eaac15c7 Fixes https://github.com/wso2/product-iots/issues/1096 2017-07-16 18:53:05 +05:30
Rasika Perera
661925ca54 Fixes https://github.com/wso2/product-iots/issues/1134 : Temporary fixing issue with adding /admin/manage/api/subscribe permission 2017-07-16 18:20:16 +05:30
WSO2 Builder
94c1fd0ad6 [WSO2 Release] [Jenkins #2461] [Release 3.0.35] prepare for next development iteration 2017-07-16 18:05:31 +05:30
WSO2 Builder
ce87e69859 [WSO2 Release] [Jenkins #2461] [Release 3.0.35] prepare release v3.0.35 2017-07-16 18:05:17 +05:30
Geeth
ed3327834b Merge pull request #848 from rasika/location-column-fix 
Location column fix
 2017-07-16 17:42:21 +05:30
Rasika Perera
f15713ae85 Changing IoT Server logo into sharp .svg format 2017-07-16 16:11:39 +05:30
Rasika Perera
78187c4ec1 Increasing location street column size 2017-07-16 16:00:19 +05:30
WSO2 Builder
2894d9ed00 Merge commit '5f8dab6916d6136102f0320464c1092369f7697d' into 43d6a75e-06b6-4777-86d7-21aee6dc4b99 2017-07-14 13:16:08 +05:30
WSO2 Builder
5f8dab6916 [WSO2 Release] [Jenkins #2457] [Release 3.0.34] prepare for next development iteration 2017-07-14 12:53:35 +05:30
WSO2 Builder
7c5fc0bf5d [WSO2 Release] [Jenkins #2457] [Release 3.0.34] prepare release v3.0.34 2017-07-14 12:53:19 +05:30
Imesh Chandrasiri
46b22e438d fixes wso2/product-iots#1152 2017-07-14 12:25:17 +05:30
Rasika Perera
9683b066dd Cloud fixes 2017-07-14 11:08:18 +05:30
Imesh Chandrasiri
4b87209e04 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-14 11:08:01 +05:30
Imesh Chandrasiri
f7c8578758 fixes wso2/product-iots#1141 2017-07-14 11:07:49 +05:30
WSO2 Builder
2673a7ae3c [WSO2 Release] [Jenkins #2454] [Release 3.0.33] prepare for next development iteration 2017-07-13 15:38:51 +05:30
WSO2 Builder
14f8bacb65 [WSO2 Release] [Jenkins #2454] [Release 3.0.33] prepare release v3.0.33 2017-07-13 15:38:38 +05:30
Imesh Chandrasiri
6d62f3b425 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-13 15:14:51 +05:30
Imesh Chandrasiri
7547599b09 fixes wso2/product-iots#1164 2017-07-13 15:14:40 +05:30
WSO2 Builder
2a6d35bdf5 [WSO2 Release] [Jenkins #2452] [Release 3.0.32] prepare for next development iteration 2017-07-13 12:25:52 +05:30
WSO2 Builder
a1a6649213 [WSO2 Release] [Jenkins #2452] [Release 3.0.32] prepare release v3.0.32 2017-07-13 12:25:38 +05:30
Imesh Chandrasiri
eabeb71a9c fixes wso2/product-iots#1166 2017-07-13 11:57:24 +05:30
Imesh Chandrasiri
a753ce1648 fixes wso2/product-iots#1170 2017-07-13 11:39:32 +05:30
Imesh Chandrasiri
c46cbb34ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-13 11:20:01 +05:30
Imesh Chandrasiri
a014cb0f60 fixes wso2/product-iots#1168 2017-07-13 11:17:41 +05:30
Waruna Lakshitha
222e1f6e7f add configuration change 2017-07-12 13:48:43 +05:30
warunalakshitha
61f6fdeca9 Revert "Add multiple push notification support and transport config for features" 
This reverts commit ad9ec1f994.
 2017-07-12 12:33:16 +05:30
warunalakshitha
a3c5118d5e Merge branch 'master' of https://github.com/warunalakshitha/carbon-device-mgt 2017-07-12 12:23:04 +05:30
WSO2 Builder
f398de79c4 [WSO2 Release] [Jenkins #2449] [Release 3.0.31] prepare for next development iteration 2017-07-11 15:35:38 +05:30
WSO2 Builder
757e93c301 [WSO2 Release] [Jenkins #2449] [Release 3.0.31] prepare release v3.0.31 2017-07-11 15:35:22 +05:30
WSO2 Builder
8d0e7a2086 [WSO2 Release] [Jenkins #2448] [Release 3.0.30] prepare for next development iteration 2017-07-11 14:16:42 +05:30
WSO2 Builder
6b30b11de9 [WSO2 Release] [Jenkins #2448] [Release 3.0.30] prepare release v3.0.30 2017-07-11 14:16:25 +05:30
Jasintha
4bae413f72 Fixing Filstream closing issue and few formatting errors 2017-07-11 13:01:09 +05:30
Jasintha
b1d5a58d6b Fixing weekTrustManger Imple issue 2017-07-11 10:12:07 +05:30
WSO2 Builder
3a991b8bf7 [WSO2 Release] [Jenkins #2446] [Release 3.0.29] prepare for next development iteration 2017-07-10 17:50:16 +05:30
WSO2 Builder
9ecc6f7281 [WSO2 Release] [Jenkins #2446] [Release 3.0.29] prepare release v3.0.29 2017-07-10 17:50:02 +05:30
kamidu
19dc0a08c7 merge the css changes 2017-07-10 17:23:49 +05:30
kamidu
ee4e3df66d enable device owner flag in policy 2017-07-10 17:21:18 +05:30
WSO2 Builder
71e3cdffdd [WSO2 Release] [Jenkins #2444] [Release 3.0.28] prepare for next development iteration 2017-07-10 14:54:49 +05:30
WSO2 Builder
2519d86874 [WSO2 Release] [Jenkins #2444] [Release 3.0.28] prepare release v3.0.28 2017-07-10 14:54:40 +05:30
Imesh Chandrasiri
ca760581a5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-10 12:40:20 +05:30
Imesh Chandrasiri
66a7fe454c Fixes datatable miss rendering in device detail view. 2017-07-10 12:25:58 +05:30
WSO2 Builder
c63c04f5a6 [WSO2 Release] [Jenkins #2441] [Release 3.0.27] prepare for next development iteration 2017-07-09 09:50:34 +05:30
WSO2 Builder
9d2fd5273e [WSO2 Release] [Jenkins #2441] [Release 3.0.27] prepare release v3.0.27 2017-07-09 09:50:19 +05:30
sumedharubasinghe
77eadc7b5a Merge pull request #836 from rasika/operation-bar 
Changes for the operation bar
 2017-07-09 07:58:45 +05:30
Rasika Perera
6e748ae799 Hiding geo-fencing related buttons when geoservices disabled 2017-07-08 21:10:04 +05:30
Rasika Perera
389173f505 Fixes https://github.com/wso2/product-iots/issues/1084 2017-07-08 19:17:52 +05:30
Rasika Perera
394d97e1c8 Fixed operations not loaded correctly 2017-07-08 18:47:00 +05:30
WSO2 Builder
5d27e40e76 [WSO2 Release] [Jenkins #2438] [Release 3.0.26] prepare for next development iteration 2017-07-07 19:11:59 +05:30
WSO2 Builder
3930a7cfb1 [WSO2 Release] [Jenkins #2438] [Release 3.0.26] prepare release v3.0.26 2017-07-07 19:11:44 +05:30
WSO2 Builder
2cc05f5b74 Merge commit 'b429d8b902afeac2ee9bb8437453823f22d7558f' into 58d25041-0381-457c-88f6-091b7d94faa6 2017-07-07 18:51:02 +05:30
Rasika Perera
9db4ddd4df Merge pull request #832 from rasika/geo-fencing 
Hiding geo dashboard tools when GeoLocationConfiguration is Disabled
 2017-07-07 18:39:02 +05:30
Rasika Perera
bd5276117a Merge pull request #834 from rasika/master 
Fixes device status inconsistency issues
 2017-07-07 18:38:00 +05:30
WSO2 Builder
b429d8b902 [WSO2 Release] [Jenkins #2437] [Release 3.0.25] prepare for next development iteration 2017-07-07 18:30:31 +05:30
WSO2 Builder
8ac3291551 [WSO2 Release] [Jenkins #2437] [Release 3.0.25] prepare release v3.0.25 2017-07-07 18:30:16 +05:30
geethkokila
38756ffe4e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-07 17:59:35 +05:30
geethkokila
3e42cf426f Fixing the null pointer 2017-07-07 17:59:28 +05:30
Rasika Perera
972465b61e Fixes https://github.com/wso2/product-iots/issues/1089, https://github.com/wso2/product-iots/issues/1120 2017-07-07 17:16:28 +05:30
WSO2 Builder
8287bfa6d5 [WSO2 Release] [Jenkins #2435] [Release 3.0.24] prepare for next development iteration 2017-07-07 16:24:55 +05:30
WSO2 Builder
f3c6548937 [WSO2 Release] [Jenkins #2435] [Release 3.0.24] prepare release v3.0.24 2017-07-07 16:24:39 +05:30
Imesh Chandrasiri
4a638836ca Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-07 12:42:28 +05:30
Imesh Chandrasiri
b43a2f72d9 Fixes wso2/product-iots#1118 2017-07-07 12:42:18 +05:30
Rasika Perera
83d0793a35 Hiding geo dashboard tools when GeoLocationConfiguration is Disabled 2017-07-07 06:58:58 +05:30
WSO2 Builder
ab606238d9 [WSO2 Release] [Jenkins #2432] [Release 3.0.23] prepare for next development iteration 2017-07-07 00:09:32 +05:30
WSO2 Builder
23cdc06244 [WSO2 Release] [Jenkins #2432] [Release 3.0.23] prepare release v3.0.23 2017-07-07 00:09:19 +05:30
lasantha
edc14aa46d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 23:40:06 +05:30
lasantha
f32f5e4fdc Fixed operation label centering issue 2017-07-06 21:49:22 +05:30
WSO2 Builder
407fdf66da [WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare for next development iteration 2017-07-06 15:02:03 +05:30
WSO2 Builder
ba0a0c4687 [WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare release v3.0.22 2017-07-06 15:01:52 +05:30
Imesh Chandrasiri
1893d035a3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 14:17:27 +05:30
Imesh Chandrasiri
e1857099a7 Fixes wso2/product-iots#1083 2017-07-06 14:17:16 +05:30
Madhawa Perera
597b450cfb Merge pull request #829 from lasanthaDLPDS/master 
Adding checkbox and radio options to device.operation-bar
 2017-07-06 13:57:13 +05:30
lasantha
cb8208b8b7 Adding UI validation to check whether radio or checkbox options are selected or not. 2017-07-06 13:15:52 +05:30
geethkokila
fe67d251d5 Fixing the #460 issue 2017-07-06 11:57:04 +05:30
lasantha
e05eda5e18 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 09:42:22 +05:30
lasantha
c9e533dd2a adding ui params option to operations 2017-07-06 09:36:40 +05:30
WSO2 Builder
1950126459 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare for next development iteration 2017-07-05 23:45:39 +05:30
WSO2 Builder
2388bd5f05 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare release v3.0.21 2017-07-05 23:45:24 +05:30
Rasika Perera
3e118d8800 Fixing https://github.com/wso2/product-iots/issues/1063: Adding filter out features 2017-07-05 23:20:41 +05:30
WSO2 Builder
f106a914bb [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare for next development iteration 2017-07-05 14:59:52 +05:30
WSO2 Builder
0cc8f902ae [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare release v3.0.20 2017-07-05 14:59:38 +05:30
Imesh Chandrasiri
c17b2fbd98 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-05 12:10:26 +05:30
Imesh Chandrasiri
d38714b7e6 fixes wso2/product-iots#1113 2017-07-05 12:08:45 +05:30
Rasika Perera
5e87ce2d66 Merge pull request #824 from rasika/monetize-cloud 
Fixing https://github.com/wso2/product-iots/issues/1119: monetization
 2017-07-05 11:10:11 +05:30
Rasika Perera
f8fa314359 Fixing https://github.com/wso2/product-iots/issues/1096: Hiding table when no alerts avaialble 2017-07-05 10:49:55 +05:30
Rasika Perera
7bc3ab7bec Fixing https://github.com/wso2/product-iots/issues/1096: Stationery -> Stationary 2017-07-05 07:17:52 +05:30
Rasika Perera
fb12c3cb04 Fixing https://github.com/wso2/product-iots/issues/1096: i.e. colombo -> e.g. colombo 2017-07-05 07:17:26 +05:30
Rasika Perera
8223588e82 Fixing https://github.com/wso2/product-iots/issues/1119: monetization 2017-07-05 06:27:42 +05:30
WSO2 Builder
09bf240ff6 [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare for next development iteration 2017-07-04 19:13:38 +05:30
WSO2 Builder
3c63162f7a [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare release v3.0.19 2017-07-04 19:13:23 +05:30
Imesh Chandrasiri
73d4a213c6 fix for issue [#1112] 2017-07-04 17:13:52 +05:30
WSO2 Builder
e65f0b1afa [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare for next development iteration 2017-07-03 18:31:48 +05:30
WSO2 Builder
e1bbc9fe47 [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare release v3.0.18 2017-07-03 18:31:35 +05:30
Nirothipan
ce741c3993 Security policy updated, allowing to autofill password if users have saved it 2017-07-03 14:15:07 +05:30
WSO2 Builder
7a02ecbe68 [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare for next development iteration 2017-07-01 12:47:09 +05:30
WSO2 Builder
5b32f7813a [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare release v3.0.17 2017-07-01 12:46:54 +05:30
Madhawa Perera
96c650f699 Merge pull request #820 from janakamarasena/bug-fixes-2 
Added tenant domain to username in AccessToken grant
 2017-07-01 08:04:58 +05:30
Madhawa Perera
031c648a2e Merge pull request #816 from dunithd/master 
Checking whether the geo location service has been enabled before reading stats from analytics server
 2017-07-01 08:04:39 +05:30
WSO2 Builder
c376208943 [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare for next development iteration 2017-06-30 17:44:28 +05:30
WSO2 Builder
5c013a3abd [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare release v3.0.16 2017-06-30 17:44:14 +05:30
Supun94
8d38f6490c MQTT Dashboard UI code refactor 2017-06-30 16:31:43 +05:30
Janak Amarasena
7218174d46 Add tenant domain to username 2017-06-30 16:13:41 +05:30
Supun94
022e1eefe3 Adding MQTT Dashboard UI page 2017-06-30 15:55:56 +05:30
WSO2 Builder
4396704616 Merge commit 'cc13b1446e3465b67a1bf7aea681102cabb96412' into 5c4b0f95-b6c1-4250-9ab6-e420a526a091 2017-06-30 15:54:00 +05:30
Ayyoob Hamza
83fc26b722 Merge pull request #819 from lasanthaDLPDS/master 
Fixing UI issues in device type API
 2017-06-30 15:47:35 +05:30
WSO2 Builder
cc13b1446e [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare for next development iteration 2017-06-30 15:46:09 +05:30
WSO2 Builder
08831cb9f4 [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare release v3.0.15 2017-06-30 15:45:56 +05:30
lasantha
8f225bc623 Fixing minor UI issues 2017-06-30 15:38:06 +05:30
Madhawa Perera
b503b531bd Merge pull request #818 from rasika/master 
When user removed, all associated devices are removed now
 2017-06-30 15:15:10 +05:30
Rasika Perera
186b49395e Fixing https://github.com/wso2/product-iots/issues/685: When user removed, all associated devices removed 2017-06-30 14:59:24 +05:30
lasantha
d5fac0c569 Removing device type clicking option 2017-06-30 14:36:08 +05:30
Imesh Chandrasiri
eda30cbf3c adding chevron arrow when clicking op.log 2017-06-30 14:24:25 +05:30
lasantha
70138c3c6e removing select bar in device types page 2017-06-30 10:49:25 +05:30
dunithd
cffecfaf3a Removing the warning message and changing the HTTP response status code to 400 2017-06-30 10:45:40 +05:30
dunithd
07c525667c Removing an unused import 2017-06-29 18:27:04 +05:30
dunithd
0d3701be88 Checking whether the geo location service has been enabled before reading stats from analytics server 2017-06-29 18:25:28 +05:30
Imesh Chandrasiri
131bf2d3b4 Fix for long length device name 2017-06-29 15:22:24 +05:30
WSO2 Builder
6330164676 [WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare for next development iteration 2017-06-29 14:54:03 +05:30
WSO2 Builder
153fb3984e [WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare release v3.0.14 2017-06-29 14:53:50 +05:30
Imesh Chandrasiri
f35fb92668 Fixes #437 issue where propper validation message is needed 2017-06-29 12:03:36 +05:30
Imesh Chandrasiri
b9cc3c73cd Fix for github issue #1064 2017-06-29 11:32:36 +05:30
WSO2 Builder
fc41a165a8 [WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare for next development iteration 2017-06-28 19:26:16 +05:30
WSO2 Builder
7acd8e70c4 [WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare release v3.0.13 2017-06-28 19:26:02 +05:30
Geeth
63a7a2bb28 Merge pull request #813 from milanperera/iot-master 
Fixed issue wso2/product-iots#427
 2017-06-28 18:35:43 +05:30
Milan Perera
4994fddfd8 Fixed issue wso2/product-iots#427 2017-06-28 18:32:21 +05:30
WSO2 Builder
cb078fbb0f [WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare for next development iteration 2017-06-28 18:26:18 +05:30
WSO2 Builder
8e874b2ef0 [WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare release v3.0.12 2017-06-28 18:26:05 +05:30
Milan Perera
c605ffbd58 Fixed issue wso2/product-iots#475 2017-06-28 17:56:50 +05:30
Milan Perera
a60566a417 Removed DCR dependancies 2017-06-28 12:19:09 +05:30
Milan Perera
72a19085ad Removed DCR feature 2017-06-28 08:41:41 +05:30
Milan Perera
eb89aa4ff4 Removed DCR feature 2017-06-27 23:20:04 +05:30
WSO2 Builder
c03e1ec1d1 [WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare for next development iteration 2017-06-27 12:15:35 +05:30
WSO2 Builder
997affda65 [WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare release v3.0.11 2017-06-27 12:15:21 +05:30
Janak Amarasena
21a9df97bb Add proper handling when invalid token is received 2017-06-26 18:37:01 +05:30
warunalakshitha
ad9ec1f994 Add multiple push notification support and transport config for features 2017-06-26 11:45:15 +05:30
WSO2 Builder
e23ef52e61 [maven-release-plugin]prepare for next development iteration 2017-06-23 20:27:17 +05:30
WSO2 Builder
c333f28461 [maven-release-plugin]prepare release v3.0.10 2017-06-23 20:27:03 +05:30
Madhawa Perera
25aaf92641 Merge pull request #810 from sinthuja/master 
Updating source/target versions to jdk 1.8.
 2017-06-23 18:12:45 +05:30
Madhawa Perera
6adc8e6aef Merge pull request #809 from janakamarasena/high-priority-fixes-2 
Fixes NPE when using Access Token grant handler
 2017-06-23 18:00:42 +05:30
sinthuja
fce84b9942 Updating source/target versions to jdk 1.8. 2017-06-23 18:00:06 +05:30
Janak Amarasena
0f41dce394 Fixed spacing 2017-06-23 17:53:32 +05:30
Janak Amarasena
88bdad18b1 Fixes NPE 2017-06-23 17:50:42 +05:30
Harshan Liyanage
188c80f52a Merge pull request #808 from hasuniea/master 
Fixing issue wso2/product-iot#527
 2017-06-23 17:49:23 +05:30
Hasunie
9206f74790 Fixing issue wso2/product-iot##527 2017-06-23 17:39:42 +05:30
Kamidu Sachith Punchihewa
e556193647 Merge pull request #807 from DimalChandrasiri/master 
Fix for application listing app name clipping issue
 2017-06-23 17:30:31 +05:30
WSO2 Builder
27e494f153 [WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare for next development iteration 2017-06-23 17:22:32 +05:30
WSO2 Builder
21ab65e6d5 [WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare release v3.0.9 2017-06-23 17:22:20 +05:30
Imesh Chandrasiri
930dccaa4d fix for application listing app name clipping issue 2017-06-23 17:09:21 +05:30
Ayyoob Hamza
bd65b1d73b Merge pull request #806 from rasika/master 
Fixing android geo fencing ui
 2017-06-23 16:48:52 +05:30
Rasika Perera
fcf41d6511 Reducing the map height 2017-06-23 16:43:13 +05:30
Rasika Perera
bfbaf00e34 Fixing android geo fencing ui 2017-06-23 16:37:22 +05:30
Rasika Perera
139bc99cc7 Adding error logs when unexpected error from gateway 2017-06-23 16:37:08 +05:30
lasantha
88328b6be3 Adding latest Font WSO2 2017-06-23 14:58:39 +05:30
WSO2 Builder
54d25522ba [WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare for next development iteration 2017-06-22 20:09:55 +05:30
WSO2 Builder
69b168f3b2 [WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare release v3.0.8 2017-06-22 20:09:41 +05:30
Geeth
63c8e87d98 Merge pull request #803 from ayyoob/devicetype-3.1.0 
Adding Device type API Implementation
 2017-06-22 19:46:33 +05:30
ayyoob
d70cea2e46 fixed commit issues 2017-06-22 19:29:04 +05:30
ayyoob
536d100fd6 fixed comment issues 2017-06-22 17:44:54 +05:30
ayyoob
abacc0ce2a fixed comment issues 2017-06-22 17:28:37 +05:30
Kamidu Sachith Punchihewa
f868fa2d35 Merge pull request #804 from DimalChandrasiri/master 
Fix for removed device selection in Data Table
 2017-06-22 17:13:59 +05:30
Imesh Chandrasiri
cba8f5243e Fix for removed device selection in datatable 2017-06-22 17:07:59 +05:30
Kamidu Sachith Punchihewa
3c5e65c047 Merge pull request #802 from dunithd/master 
Adding refresh button for the operations log tab
 2017-06-22 17:00:22 +05:30
ayyoob
2dab109ad3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-22 16:56:34 +05:30
dunithd
b3642730ad Adding refresh button for the operations log tab 2017-06-22 16:49:01 +05:30
inoshperera
ae8452adcb Merge pull request #801 from geethkokila/master 
Fixing the task for all the tenants
 2017-06-22 15:56:08 +05:30
geethkokila
1655b512b0 Fixing formating issues 2017-06-22 15:55:22 +05:30
geethkokila
5f71313af1 Fixing formating issues 2017-06-22 15:53:11 +05:30
geethkokila
07357124b0 Fixing the task for all the tenants 2017-06-22 15:45:11 +05:30
Ace
ac01fef7be Adding import enhancements 2017-06-22 15:34:03 +05:30
Ace
dcbffac198 Adding fixes for https://github.com/wso2/product-iots/issues/997 2017-06-22 15:12:40 +05:30
Hasunie
b2c6bc5453 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-22 10:50:51 +05:30
ayyoob
9f4037b7e1 few changes to ui 2017-06-22 06:50:20 +05:30
ayyoob
6c041c7b6a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-22 04:34:45 +05:30
Geeth
a47d2a6672 Merge pull request #797 from sinthuja/master 
Fixing issues in IoT core with MSSQL.
 2017-06-21 23:02:46 +05:30
Kamidu Sachith Punchihewa
a895c1f4dd Merge pull request #795 from janakamarasena/high-priority-fixes-2 
Added bottom margin to 'Show All Notifications' button
 2017-06-21 19:34:50 +05:30
kamidu
525c0958d9 fixing the password reset issue 2017-06-21 18:53:56 +05:30
Janak Amarasena
db98663c78 Added bottom margin to Show All Notifications button 2017-06-21 18:04:11 +05:30
sinthuja
ee8f29503d Merge branch 'wso2-master' 2017-06-21 16:31:06 +05:30
sinthuja
8197547383 Fixing MSSQL related issues, and dbscript issues. 2017-06-21 16:30:19 +05:30
Geeth
d6fcdf500b Merge pull request #794 from milanperera/iot-master 
Changing error logs to debug
 2017-06-21 14:31:31 +05:30
Milan Perera
cda5a0b216 Changing error logs to debug 2017-06-21 13:10:24 +05:30
Imesh Chandrasiri
66d9ea4bde Merge branch 'master' of https://github.com/DimalChandrasiri/carbon-device-mgt 2017-06-21 12:36:46 +05:30
Rasika Perera
fc4576082c Changing artifact uploader admin service resource path 2017-06-21 10:57:50 +05:30
ayyoob
80cc690a42 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-21 04:11:40 +05:30
WSO2 Builder
68cb8d3f81 [WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare for next development iteration 2017-06-20 22:37:58 +05:30
WSO2 Builder
d0f52c48ef [WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare release v3.0.7 2017-06-20 22:37:45 +05:30
Geeth
3deffa99dd Merge pull request #790 from dunithd/master 
Adding an API method to retrieve an activity by it's ID and a device ID
 2017-06-20 22:27:42 +05:30
Imesh Chandrasiri
1546411814 Fixed Multiple ajax calls when filtering 2017-06-20 20:25:57 +05:30
dunithd
d0058b982c Adding new UX styles CSS 2017-06-20 19:40:58 +05:30
dunithd
c832f1b5a9 Applying new UX design for device details default unit 2017-06-20 19:39:52 +05:30
ayyoob
3224f3a50c few changes in dbscript 2017-06-20 19:33:24 +05:30
Megala Uthayakumar
7431ed4997 Merge pull request #791 from sinthuja/master 
Fixing mssql related issue.
 2017-06-20 19:03:44 +05:30
sinthuja
4bfd35cc74 Fixing issue in mssql database issue in processor. 2017-06-20 18:54:36 +05:30
sinthuja
5570349cd1 Reverting back the other databases to use the arrays. 2017-06-20 18:05:39 +05:30
WSO2 Builder
2896b55f5e [WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare for next development iteration 2017-06-20 18:03:42 +05:30
WSO2 Builder
bdb57383b1 [WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare release v3.0.6 2017-06-20 18:03:28 +05:30
dunithd
4cf3e2d421 Adding an API method to retrieve an activity by it's ID and a device ID 2017-06-20 17:44:22 +05:30
Geeth
c7a8f83f54 Merge pull request #789 from harshanL/master 
Updated title bar app name to IoT Server.
 2017-06-20 17:37:56 +05:30
Harshan Liyanage
eebbcbb6fa Merge pull request #782 from janakamarasena/high-priority-fixes 
UI fixes
 2017-06-20 17:04:03 +05:30
sinthuja
4018d582ed Adding comments to the batch size config. 2017-06-20 16:17:07 +05:30
sinthuja
f2ea96efde Reverting the changes done to GenericFeatureDAOImpl. 2017-06-20 16:16:10 +05:30
sinthuja
ce5ca09e51 Adding oracle server specific impl. 2017-06-20 16:15:12 +05:30
Chatura Dilan
10f1158c45 Refactor code 2017-06-20 15:21:50 +05:30
sinthuja
f59202c0c3 Reverting back to the debug logs. 2017-06-20 13:46:39 +05:30
sinthuja
ade596d3c4 Merging the AS clause removal queries with generic DAO from oracle. 2017-06-20 13:17:03 +05:30
sinthuja
9398e7ee0b Merge branch 'wso2-master' 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationMappingDAOImpl.java
 2017-06-19 23:10:15 +05:30
sinthuja
124c0b4cf8 Fixing issues related to oracle database. 2017-06-19 23:05:05 +05:30
Hasunie
19495321d2 removing unnecessary lines 2017-06-19 19:23:01 +05:30
Hasunie
3333ed0381 Fixing permission issue which resolves wso2/product-iots#430 2017-06-19 19:18:34 +05:30
Harshan Liyanage
50e82eb80d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-19 17:34:45 +05:30
Harshan Liyanage
fecc5e1b72 Changed devicemgt app name to IoT Server. 2017-06-19 17:33:43 +05:30
WSO2 Builder
8badc2bc37 [WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare for next development iteration 2017-06-19 17:23:13 +05:30
WSO2 Builder
43182aede9 [WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare release v3.0.5 2017-06-19 17:22:58 +05:30
Harshan Liyanage
b8f085da20 Added null checks for device cache in-case cache is disabled. 2017-06-19 16:58:42 +05:30
WSO2 Builder
f70535ed20 [WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare for next development iteration 2017-06-19 16:22:55 +05:30
WSO2 Builder
c3d154ee65 [WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare release v3.0.4 2017-06-19 16:22:42 +05:30
Chatura Dilan
d3f87a30ed Refactor edit apps functionality 2017-06-19 12:58:09 +05:30
Harshan Liyanage
a21c374b00 Code refactoring. 2017-06-19 12:52:31 +05:30
Harshan Liyanage
074ceeb0c7 Merged with master 2017-06-19 12:46:22 +05:30
Harshan Liyanage
967efa1fee Fixed user enrolled device showing problem which resolves wso2/product-iots#406 2017-06-19 12:41:22 +05:30
inoshperera
88054f9075 removing non-compliance action. 2017-06-19 12:04:59 +05:30
geethkokila
0eca5a0152 Fixing the build failure 2017-06-19 11:44:47 +05:30
ayyoob
6dffac4191 fixes in ui 2017-06-18 16:41:38 +05:30
ayyoob
3b7d4d8966 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-17 19:17:42 +05:30
ayyoob
ca33f035df merge ui fixes 2017-06-17 18:52:25 +05:30
Ayyoob Hamza
2875fb2ca0 Merge pull request #755 from rasika/geo-fencing 
Added Geo Service into Device Mgt Core
 2017-06-17 12:20:10 +05:30
WSO2 Builder
e924a86d73 [WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare for next development iteration 2017-06-16 17:40:41 +05:30
WSO2 Builder
b35aaab992 [WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare release v3.0.3 2017-06-16 17:40:27 +05:30
Janak Amarasena
3f17e66e8c UI fixes 2017-06-16 16:51:49 +05:30
Harshan Liyanage
d8b756df3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-16 16:48:30 +05:30
Harshan Liyanage
8b9420766f Fixed SQL syntax issue in DeviceStatusMonitoring Task when running on PostgreSQL. 2017-06-16 16:47:34 +05:30
Harshan Liyanage
51c18d2108 Added pagination support for group-management for major db engines. 2017-06-16 16:46:30 +05:30
Rasika Perera
8da1f62cd9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-16 15:50:45 +05:30
Madawa Soysa
98e8dfea68 Merge pull request #781 from inoshperera/master 
fixing the agent unable to enroll issue
 2017-06-16 15:29:22 +05:30
inoshperera
58b2bf8b3c fixing the agent unable to enroll issue 2017-06-16 15:23:41 +05:30
Rasika Perera
a5c18b3c26 Geo Fencing UI fixes 2017-06-16 14:42:05 +05:30
madhawap
648659a781 Sets values taken from system varibales to iot-api-config.xml 
iot-api-config.xml consists with system varibales like iot.core.host, iot.keymanager.host etc. But values set to those varibales were not pass into these places. This commit fixes that
 2017-06-16 13:16:29 +05:30
madhawap
a115cff4db reformatting code 2017-06-16 13:16:29 +05:30
Rasika Perera
d3f24bb8ba Making alert danger into alert info in stationary alerts 2017-06-16 12:48:03 +05:30
Rasika Perera
c8d41c7b3e Few more improvements into geo-dashboard 2017-06-16 12:45:29 +05:30
Rasika Perera
3fd2c6b705 Adding deploy geo analytics button into platform configuration 2017-06-16 12:30:24 +05:30
sinthuja
1c13269fc8 Fixing https://github.com/wso2/product-iots/issues/495. 2017-06-16 11:50:54 +05:30
WSO2 Builder
2b76317f40 [WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare for next development iteration 2017-06-16 11:00:40 +05:30
WSO2 Builder
02bc10e6d2 [WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare release v3.0.2 2017-06-16 11:00:26 +05:30
Supun94
df06953069 Adding MQTT pagination details 2017-06-16 10:50:47 +05:30
Supun94
8ca85f1177 Adding UI permissions for topics view 2017-06-16 10:50:47 +05:30
Rasika Perera
d0a1132060 Improving geo fence ui 2017-06-16 10:10:57 +05:30
Ayyoob Hamza
0551598988 Merge pull request #779 from janakamarasena/oauth-token-grant-refractor 
Access token grant handler
 2017-06-16 06:52:36 +05:30
ayyoob
f47d0deb1a few changes after testing. 2017-06-16 03:48:08 +05:30
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
Chatura Dilan
58eab35123 Merge branch 'application-mgt' of github.com:wso2/carbon-device-mgt into application-mgt 2017-06-14 17:27:14 +05:30
Chatura Dilan
6d6aa50b2a Added functionailty to update app 2017-06-14 17:27:01 +05:30
sinthuja
fe3325ebf2 Merge remote-tracking branch 'wso2/application-mgt' into wso2-application-mgt 
# Conflicts:
#	components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/PlatformDAO.java
#	components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/platform/GenericPlatformDAOImpl.java
 2017-06-14 16:13:38 +05:30
sinthuja
e5704ac05d Using the platformManger service instead of using the DAO. 2017-06-14 16:10:54 +05:30
sinthuja
a7569456ce fixing the build issue due to removing the method in platform manager. 2017-06-14 16:09:08 +05:30
sinthuja
59f43886cf Adding the update platform API. 2017-06-14 16:07:16 +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
Chatura Dilan
d7b784b073 Removed published from platforms 2017-06-14 12:45:15 +05:30
Chatura Dilan
ac871fdbce Fixed exception class to PlatformDAOException 2017-06-14 12:40:11 +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
Chatura Dilan
52b2739bee Refactoring DAOs 2017-06-14 12:28:13 +05:30
Chatura Dilan
6a18d7ab4c Fixed conflicts 2017-06-14 12:15:49 +05:30
Chatura Dilan
2b0ae8c5a4 Added creating app functionality 2017-06-14 11:59:06 +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
sinthuja
6020b3fb65 Adding platform manager first API. 2017-06-13 18:15:58 +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
sinthuja
fe26352ec9 Adding platform manager first API. 2017-06-13 13:55:04 +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
sinthuja
b183ec3e89 Merge remote-tracking branch 'wso2/application-mgt' into wso2-application-mgt 2017-06-09 19:04:11 +05:30
sinthuja
41def8fe76 Adding first cut of platform manager capabilities. 2017-06-09 19:04:02 +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
352c881c24 Refactor code 2017-06-07 17:22:31 +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
Chatura Dilan
b25f14668e Fixed issue in Lifecycle class 2017-06-01 11:29:29 +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
sinthuja
8d6e4cfa01 Fixing issues in resolving the configuration resolving. 2017-05-31 18:01:07 +05:30
sinthuja
fd18ab711c Fixing issues in resolving the configuration resolving. 2017-05-31 16:03:37 +05:30
sinthuja
242cf06f42 Refactoring the APP manager code, second phase. 2017-05-31 13:50:03 +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
sinthuja
810c0383a8 Fixing the compilation failure issues. 2017-05-30 12:41:23 +05:30
sinthuja
d882a05833 Reverting back to runtime exceptions. 2017-05-30 12:03:56 +05:30
sinthuja
dd6e70ce86 First cut of refactoring the code. 2017-05-30 11:44:24 +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
Chatura Dilan
9343032c88 Changes to App Management Externsions Framework 2017-05-29 18:35:37 +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
Chatura Dilan
c89491b93e Changes to schema 2017-05-29 10:22:17 +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
Chatura Dilan
23ea67deb1 Fixes for filter properties 2017-05-26 15:15:36 +05:30
warunalakshitha
1a26595472 Fix issue with using enrollment id for device id 2017-05-26 14:54:04 +05:30
Chatura Dilan
69ace64091 Refactoring services classes 2017-05-26 14:21:54 +05:30
Chatura Dilan
43ef32b37c Refactor services 2017-05-25 14:37:16 +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
Harshan Liyanage
d5ba266583 Fixed H2 database issue in App-Mgr. 2017-05-22 18:10:58 +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
Harshan Liyanage
0d3598d214 Refactored Application-Mgt DAO layer. 2017-05-18 17:07:51 +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
Harshan Liyanage
6abd289cc6 Removed unnecessary packages for application-mgt core. 2017-05-17 17:33:38 +05:30
sinthuja
e7490dd278 Fixing https://github.com/wso2/product-iots/issues/443. 2017-05-17 17:24:37 +05:30
Harshan Liyanage
9dde786705 Refactored Application-Mgt Database access layer. 2017-05-17 16:58:27 +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
Harshan Liyanage
2c1500818d Refactored Application Mgt DTO layer. 2017-05-16 15:56:53 +05:30
Chatura Dilan
34366f4e78 Merge branch 'application-mgt' of github.com:wso2/carbon-device-mgt into application-mgt 2017-05-16 15:30:28 +05:30
Harshan Liyanage
8b32cf9f09 Added Security filter configs. 2017-05-16 15:28:31 +05:30
Harshan Liyanage
5361ad2025 Refactored Application-Mgt code. 2017-05-16 15:20:08 +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
Chatura Dilan
c957894acb Merge branch 'application-mgt' of github.com:wso2/carbon-device-mgt into application-mgt 2017-05-15 17:39:25 +05:30
Harshan Liyanage
84c6443971 Fixed build issues. 2017-05-15 17:30:46 +05:30
Chatura Dilan
baed4318b5 Added properties to platform and subscription 2017-05-15 17:00:46 +05:30
Harshan Liyanage
04d1082b4e Resolved conflicts. 2017-05-15 16:58:00 +05:30
Harshan Liyanage
2128c3f13e Added application-mgt UI feature 2017-05-15 14:52:50 +05:30
Chatura Dilan
954cb3e195 Fixed the issue in the insterface ApplicationManagementAPI 2017-05-15 12:01:52 +05:30
Chatura Dilan
0d68322bb7 Fixing issues in db fileds 2017-05-15 10:27:16 +05:30
Chatura Dilan
b548094862 fixed API version 2017-05-14 17:46:34 +05:30
Chatura Dilan
5d8b8ab697 Added DAOs 2017-05-14 16:08:59 +05:30
Chatura Dilan
f09905a2ec Changes to DB queries 2017-05-12 16:43:53 +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
Harshan Liyanage
ff211708a1 Added application-mgt features. 2017-05-09 19:07:35 +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
Harshan Liyanage
aba2ffec63 Removed unnecessary test suites. 2017-05-09 11:32:27 +05:30
Harshan Liyanage
a15b179d49 Added testng files 2017-05-09 11:32:11 +05:30
Chatura Dilan
76342ee7e3 Added filiter to app list 2017-05-09 11:31:06 +05:30
Chatura Dilan
9d5e912d11 Added MySQL DAO 2017-05-09 11:30:53 +05:30
Chatura Dilan
493de22d85 Added Response DTO 2017-05-09 11:30:38 +05:30
Chatura Dilan
ec78984cca Fixes for Error handling 2017-05-09 11:30:24 +05:30
Chatura Dilan
29bd1283d0 Initialize application management DAOs 2017-05-09 11:30:11 +05:30
Chatura Dilan
b808fa02ae Added aplication management component 2017-05-09 11:29:55 +05:30