Commit Graph

5665 Commits

Author SHA1 Message Date
Rasika Perera
7860e02814
Merge pull request #1217 from lasanthaDLPDS/geet_3.3.0
Fix OAuth2ScopeValidator Issues
2018-03-12 16:32:40 +05:30
lasantha
9629101a85 Fix OAuth2ScopeValidator Issues
Due to the version bumping of the identity component, there were some references to the deprecated methods. Hence removed those and referred approved methods. In addition to that, to compatible with WSO2 cording standards, reformat the source as well.
2018-03-12 15:31:14 +05:30
WSO2 Builder
748798df4c [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare for next development iteration 2018-03-12 09:51:53 +00:00
WSO2 Builder
e0704671de [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare release v3.1.0 2018-03-12 09:51:43 +00:00
geethkokila
71f1ff96e6 Update device-mgt component version (3.1.0) 2018-03-12 14:57:21 +05:30
n-jay
7eab9e914d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-12 14:29:08 +05:30
n-jay
fedd2a3257 Added iOS DEP management page to navbar 2018-03-12 14:28:24 +05:30
n-jay
1cfcc3a599 Added iOS DEP API scopes in UI config file 2018-03-12 14:27:12 +05:30
WSO2 Builder
9ba315217c [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare for next development iteration 2018-03-12 08:42:09 +00:00
WSO2 Builder
96ee898b50 [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare release v3.0.244 2018-03-12 08:41:56 +00:00
geethkokila
7a25109882 Changing the carbon commons versions and api-registration endpoint 2018-03-12 11:30:28 +05:30
geethkokila
812c715c09 Bump the versions of other components
This commits changes the versions of other components and fixes the compilation errors and test failures
2018-03-12 11:30:28 +05:30
lasantha
f9559a510b Remove tenant id from the Application Release bean 2018-03-12 11:14:15 +05:30
lasantha
e00aa1be09 Fix build failure
Removed application release management service refernce from the ApplicationManagementUtil.java
2018-03-12 11:13:07 +05:30
lasantha
6f18a70d4b Add application release updating logic into the service layer
Adding application release updating logic and application release creating logic into the service layer.
2018-03-12 11:07:47 +05:30
lasantha
f83b466955 Format the application management API source 2018-03-12 11:00:29 +05:30
lasantha
8b505a7741 Reformat the DAO layer and add application release updating SQL logic
In order to fix DAO issues and improve the logic, modified the DAO layer. Further added generic application release SQL to update application release.
2018-03-12 10:57:23 +05:30
lasantha
1b7451327e Remove application release management service source.
The application release management service source is moved to application management service. Therefore removed the application release management service source from the application management component.
2018-03-12 10:45:45 +05:30
geethkokila
fbd7ba2afb Changing the carbon commons versions and api-registration endpoint 2018-03-12 09:24:53 +05:30
lasantha
8efcfca877 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-11 01:10:33 +05:30
WSO2 Builder
93422ae12d [WSO2 Release] [Jenkins #2945] [Release 3.0.243] prepare for next development iteration 2018-03-09 12:28:00 +00:00
WSO2 Builder
e4bc050806 [WSO2 Release] [Jenkins #2945] [Release 3.0.243] prepare release v3.0.243 2018-03-09 12:27:50 +00:00
Madhawa Perera
3fa513cabd
Fix UI loading issue on Safari 11.0.3 (#1212)
* Fix UI loading issue on Safari 11.0.3

Fix the issue of operation logs and location doesn't display on device detail page on safari browser 11.0.3

Fixes wso2/product-iots#1752

* Add comments describing code lines
2018-03-09 17:43:33 +05:30
geethkokila
62098b2c1c Bump the versions of other components
This commits changes the versions of other components and fixes the compilation errors and test failures
2018-03-09 16:57:21 +05:30
Arcane94
2fb5ec431a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-09 14:46:56 +05:30
WSO2 Builder
873bff0042 [WSO2 Release] [Jenkins #2943] [Release 3.0.242] prepare for next development iteration 2018-03-08 14:28:50 +00:00
WSO2 Builder
8b63813d84 [WSO2 Release] [Jenkins #2943] [Release 3.0.242] prepare release v3.0.242 2018-03-08 14:28:40 +00:00
shavidissa
b9cde9b936 Updated the swagger content - Groups (#1211)
* Updated the swagger content for the APIs used to add devices to groups

* Formatting the swagger content
2018-03-08 19:45:14 +05:30
lasantha
24a9a7f23d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-08 13:43:08 +05:30
geethkokila
9f9fd963a9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-08 10:22:36 +05:30
WSO2 Builder
997bf0d16b [WSO2 Release] [Jenkins #2941] [Release 3.0.241] prepare for next development iteration 2018-03-08 04:29:13 +00:00
WSO2 Builder
aabdc33dc1 [WSO2 Release] [Jenkins #2941] [Release 3.0.241] prepare release v3.0.241 2018-03-08 04:29:02 +00:00
Shavindri Dissanayake
ead0e202d6 updating the swagger content 2018-03-07 19:34:45 +05:30
lasantha
fc30d00ecd Fix minor DAO layer issues 2018-03-05 17:57:04 +05:30
lasantha
b0eafe7180 Fixed application management issues and improve functionalities 2018-03-05 17:15:40 +05:30
lasantha
7278408b44 Refactored the source code 2018-03-05 17:15:40 +05:30
lasantha
c3f04eeed0 refactored the Application management DAO layer 2018-03-05 17:15:39 +05:30
lasantha
6e3cc085ff Fixed application getting issues and improved the application getting functionality
Improved application functionalities. Modified service layer, DAO layer and API layer
2018-03-05 17:14:48 +05:30
lasantha
ef0e7ee738 adding sorting orders 2018-03-05 17:11:44 +05:30
lasantha
9f609964b7 adding application types 2018-03-05 17:11:44 +05:30
lasantha
6b0e281112 Adding APK file validation functionalty
To implement apk file validation we are using external library. APK parser: https://github.com/hsiafan/apk-parser
2018-03-05 17:11:44 +05:30
lasantha
460a356bee Adding Application management functionalities and API
Adding application, application lifecycle and application release management business logic and also API implementation
2018-03-05 17:11:44 +05:30
lasantha
5ee9983305 modified application management store API
This is WIP API and in order to avoid build failure commented few lines and those need to be fixed when the development continues
2018-03-05 17:11:44 +05:30
lasantha
c3d0b375a5 Adding App storing functionalities
Adding App deleting, editing and storing fucntionalities and fixed related bugs. To delete application artifacts, used recursive method and validation application is removed from the storage management. Since application validation is doing at application management and it is guaranteed that storage management is called after the application management removed the application validation from storage management
2018-03-05 17:11:44 +05:30
lasantha
2cbf78d464 Fixed issues in Generic DAO Impl 2018-03-05 17:11:44 +05:30
Arcane94
1716fc4500 logic changes of the fix 2018-03-05 16:46:50 +05:30
lasantha
0aef14bdbe Fix the issue in certificate-mgt-admin-v0.9 copyright text 2018-03-05 11:07:03 +05:30
lasantha
e30ce5bcbd Format certificate-mgt-v0.9 source 2018-03-05 10:59:29 +05:30
Arcane94
c0024ce26f Exception name change and minor modifications 2018-03-05 10:42:26 +05:30
geethkokila
b50c657b6b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-05 10:09:22 +05:30
lasantha
831fdcb335 Fix the issue in device-mgt-v0.9 copyright text 2018-03-05 01:29:32 +05:30
lasantha
1d53023fdc Fix the issue in certificate-mgt-v0.9 copyright text 2018-03-05 01:28:42 +05:30
lasantha
c86c976fe6 Format the source of geofence 2018-03-05 00:29:16 +05:30
WSO2 Builder
af430cba61 [WSO2 Release] [Jenkins #2939] [Release 3.0.240] prepare for next development iteration 2018-03-03 19:12:01 +00:00
WSO2 Builder
60190f36ef [WSO2 Release] [Jenkins #2939] [Release 3.0.240] prepare release v3.0.240 2018-03-03 19:11:50 +00:00
charitha
ab4f2b4833 Add response status to device property update API and improve db connection handling in device property update 2018-03-03 22:47:32 +05:30
charitha
dbc08da314 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-03 22:43:05 +05:30
WSO2 Builder
cafbfebfb1 [WSO2 Release] [Jenkins #2937] [Release 3.0.239] prepare for next development iteration 2018-03-03 16:24:17 +00:00
WSO2 Builder
08e9f918cf [WSO2 Release] [Jenkins #2937] [Release 3.0.239] prepare release v3.0.239 2018-03-03 16:24:06 +00:00
Rasika Perera
d3de6ea7f9
Merge pull request #1207 from rasika/rasika-geo
Fixing minor UI issue in Geo Analytics
2018-03-03 21:43:29 +05:30
Rasika Perera
97767fa6d4
Fixing minor UI issue in Geo Analytics 2018-03-03 21:27:23 +05:30
WSO2 Builder
ce73acb26e [WSO2 Release] [Jenkins #2935] [Release 3.0.238] prepare for next development iteration 2018-03-03 06:51:15 +00:00
WSO2 Builder
15de1dfd83 [WSO2 Release] [Jenkins #2935] [Release 3.0.238] prepare release v3.0.238 2018-03-03 06:51:05 +00:00
Madawa Soysa
e617273c3d Fix policy view interface loading issue (#1206)
* Fix policy view interface loading issue

When the policy view page is loaded some of the variables of the policyPayloadObj becomes undefined or null.  This commit checks for the empty and undefined variables.

Relates wso2/product-iots#1681

* Fix formatting issues
2018-03-03 12:09:54 +05:30
charitha
ad3f7928f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-02 17:46:21 +05:30
geethkokila
5fdf91d4ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-02 12:10:53 +05:30
WSO2 Builder
0bbdf7a65f [WSO2 Release] [Jenkins #2933] [Release 3.0.237] prepare for next development iteration 2018-03-01 17:52:06 +00:00
WSO2 Builder
13e63e41ac [WSO2 Release] [Jenkins #2933] [Release 3.0.237] prepare release v3.0.237 2018-03-01 17:51:55 +00:00
Arcane94
46dbbdbcb8 Year change in license details 2018-03-01 23:15:14 +05:30
lasantha
9c85c4afdd Fix operation log and device view displaying issue
As a result of syntax issue, device view and operation logs viewing is broken. Therefore fixed the syntax issue.

This Resolves wso2/product-iots#1728
2018-03-01 22:14:36 +05:30
WSO2 Builder
9a06578ac2 [WSO2 Release] [Jenkins #2931] [Release 3.0.236] prepare for next development iteration 2018-02-28 17:32:14 +00:00
WSO2 Builder
5d36bd5312 [WSO2 Release] [Jenkins #2931] [Release 3.0.236] prepare release v3.0.236 2018-02-28 17:32:02 +00:00
Rasika Perera
f8840547cf
Merge pull request #1204 from rasika/master
Add search by device name filter
2018-02-28 22:43:56 +05:30
Rasika Perera
170e6d5349 Add search by device name filter 2018-02-28 22:37:02 +05:30
WSO2 Builder
b7e85c213b [WSO2 Release] [Jenkins #2929] [Release 3.0.235] prepare for next development iteration 2018-02-28 16:54:14 +00:00
WSO2 Builder
b70e0252c4 [WSO2 Release] [Jenkins #2929] [Release 3.0.235] prepare release v3.0.235 2018-02-28 16:54:02 +00:00
Rasika Perera
88e1b925bb
Merge pull request #1202 from rasika/fix-1724
Fix the issue of an error printed when shutting down the IoT Server
2018-02-28 22:13:50 +05:30
Rasika Perera
f766e4c10e
Merge pull request #1203 from lasanthaDLPDS/master
Adding debug logs and formatting the source
2018-02-28 22:13:28 +05:30
WSO2 Builder
d2f18ddbc9 [WSO2 Release] [Jenkins #2927] [Release 3.0.234] prepare for next development iteration 2018-02-28 14:52:48 +00:00
WSO2 Builder
8f1f8eefe4 [WSO2 Release] [Jenkins #2927] [Release 3.0.234] prepare release v3.0.234 2018-02-28 14:52:38 +00:00
WSO2 Builder
62c9ed3e1e Merge commit '30bb2a866566422f83a21ac95ee661c28572e5ff' into 21083545-a8aa-47e3-8c3d-99350689e63e 2018-02-28 14:41:13 +00:00
WSO2 Builder
30bb2a8665 [WSO2 Release] [Jenkins #2926] [Release 3.0.233] prepare for next development iteration 2018-02-28 14:28:44 +00:00
lasantha
fc982eab67 remove unnecessary empty lines 2018-02-28 19:58:40 +05:30
WSO2 Builder
a325b3c6c0 [WSO2 Release] [Jenkins #2926] [Release 3.0.233] prepare release v3.0.233 2018-02-28 14:28:32 +00:00
lasantha
8df53899d6 remove unnecessary imports 2018-02-28 19:56:18 +05:30
lasantha
0ce103e1ad Format the source code
In order to equivalent with WSO2 coding standards modified the source code
2018-02-28 19:53:35 +05:30
Rasika Perera
6e6b9e963e
Merge pull request #1201 from rasika/master
Update documentation anchor links
2018-02-28 19:50:25 +05:30
Rasika Perera
7696319021
Merge pull request #1200 from milanperera/r-320
Fix issues in data archival feature
2018-02-28 19:47:17 +05:30
lasantha
18b1f7830d Add debug logs for Device Management Plugin Repository
It is important to have debugged logs when finding the root causes for some issues.Hence added those to the Device Management Plugin Repository.
2018-02-28 19:44:55 +05:30
Rasika Perera
7ad790be54 Fix error log printed when undeploying the devicemgt provider
Resolves https://github.com/wso2/product-iots/issues/1724

(cherry picked from commit c72d4ea)
2018-02-28 19:41:04 +05:30
Rasika Perera
028ae524c2 Updating v3.1.0 into v.3.2.0 2018-02-28 19:10:31 +05:30
WSO2 Builder
8a06a494c4 [WSO2 Release] [Jenkins #2924] [Release 3.0.232] prepare for next development iteration 2018-02-28 13:06:34 +00:00
WSO2 Builder
f7e3cd9c3c [WSO2 Release] [Jenkins #2924] [Release 3.0.232] prepare release v3.0.232 2018-02-28 13:06:24 +00:00
Rasika Perera
166b7b6891 Updating doc links
Resolving https://github.com/wso2/product-iots/issues/1694
2018-02-28 18:10:36 +05:30
Milan Perera
415aac1ce0 Fix issues in data archival feature
There were few issues regarding the data retreiving SQL query and archived config operations
2018-02-28 18:09:10 +05:30
geethkokila
3610d68fe6 Add alert ui view for the cookie policy and privacy policy
This changes the styles and wording for the privacy and cookie policy
2018-02-28 12:25:27 +05:30
nishadi
565087f4f2 Changed CommentManagementAPIImpl
Message of the errors were changed.
2018-02-28 12:16:20 +05:30
nishadi
b5c28943ee Changed CommentManagementAPIImpl
changed returning null into response ok.
2018-02-28 11:22:51 +05:30
nishadi
2981a1537e Changed CommentManagementAPIImpl
changed returning null into response ok.
2018-02-28 11:21:41 +05:30
geethkokila
b5dfe80e3d Add privacy and cookie policy url
Adding the cookie and privacy policy url to the register page
2018-02-28 10:33:10 +05:30
geethkokila
a277e7996a Add privacy and cookie policy url
Adding the cookie and privacy policy url to the login page
2018-02-28 10:27:10 +05:30
nishadi
f82368990f Changed CommentManagementAPIImpl 2018-02-27 17:23:49 +05:30
nishadi
0ac0efcf2e Add new methods
Exception handling test methods for rating methods
2018-02-27 17:22:08 +05:30
nishadi
e70899a193 Add new methods
Exception handling test methods for rating methods
2018-02-27 16:47:12 +05:30
nishadi
55a005e992 Add new methods
Exception handling test methods for rating methods
2018-02-27 15:36:27 +05:30
geethkokila
b78e6d6d01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-02-27 14:36:13 +05:30
nishadi
dab9208168 Add new methods
TestAddCommentInternalError and TestDeleteComment.
2018-02-27 13:04:38 +05:30
nishadi
dff3cf7645 Reformatted the codes 2018-02-26 23:30:11 +05:30
kamidu
8bab4601f4 Removing unsupported js operations
To enable IE support removed the => operation frommthe logic
2018-02-26 23:17:29 +05:30
nishadi
9936bda78b CommentManagementAPITest class
adding copyright message.
2018-02-26 23:14:17 +05:30
nishadi
891c3410ee CommentManagementAPITest class
adding copyright message.
2018-02-26 22:56:39 +05:30
kamidu
967582d0c3 changing the java scrip to support IE
The current or each funtion is not supported my IE and EGDE browsers so we replace that logic with JQuery each to suport IE and EDGE browsers
2018-02-26 15:45:23 +05:30
nishadi
87d48dca98 Reformat CommentManagementAPITest class 2018-02-24 19:14:10 +05:30
nishadi
37f595d382 Added CommentManagementAPITest class
Test of CommentManagementAPI class
2018-02-24 18:56:09 +05:30
nishadi
97915e29be Application mgt api Pom.xml changed 2018-02-24 18:40:18 +05:30
nishadi
20c1ba1052 CommentManager
Tenant Id variable was added to CommentManagerImpl class.
2018-02-24 18:39:25 +05:30
nishadi
471e6e3b21 CommentManagerImpl
Variable values changed.
2018-02-24 18:37:47 +05:30
nishadi
072d8b6455 CommentManagementAPIImpl 2018-02-24 18:34:27 +05:30
nishadi
7d22c45636 CommentManagementAPIImpl 2018-02-24 18:33:38 +05:30
nishadi
c26903c446 CommentManagementAPIImpl
variable redundant reduced.
2018-02-24 18:32:33 +05:30
nishadi
c3f8d15910 CommentManagementAPIImpl
newStar variable changed.
2018-02-24 18:31:10 +05:30
nishadi
ef059800e2 CommentManagementAPIImpl
CommentManagementAPIImpl class moved to store/api/services/impl directory.
2018-02-24 18:29:31 +05:30
nishadi
b60f3f0a9e CommentManagementApi
CommentManagementApi class moved to store/api/services directory.
2018-02-24 18:28:13 +05:30
nishadi
c216048b57 Test Resources
log4j.properties and testng.xml files added.
2018-02-24 18:25:48 +05:30
nishadi
09a2c484f0 CommentMgtTestHelper
Dummy data for comments Testing.
2018-02-24 18:21:32 +05:30
Arcane94
832eb0c6a8 Adding license details to AlertAlreadyExist class 2018-02-24 15:29:09 +05:30
Arcane94
50503fc7c0 Fixing the issue when defining alerts with same name 2018-02-24 15:15:36 +05:30
lashanfaliq95
7a1c17081b fixed the issues 2018-02-23 18:15:15 +05:30
WSO2 Builder
6b99197b54 [WSO2 Release] [Jenkins #2922] [Release 3.0.231] prepare for next development iteration 2018-02-23 10:20:25 +00:00
WSO2 Builder
313918c656 [WSO2 Release] [Jenkins #2922] [Release 3.0.231] prepare release v3.0.231 2018-02-23 10:20:15 +00:00
WSO2 Builder
13a116c7e3 Merge commit 'f0cbe36ebee1f2dde088a9f70d9009350d998775' into c95329e5-bd9c-4d79-820a-d63940dc2c8c 2018-02-23 10:07:54 +00:00
Madawa Soysa
de9480e721
Merge pull request #1196 from lasanthaDLPDS/master
Formatting device-location API
2018-02-23 15:26:07 +05:30
WSO2 Builder
f0cbe36ebe [WSO2 Release] [Jenkins #2921] [Release 3.0.230] prepare for next development iteration 2018-02-23 09:56:02 +00:00
WSO2 Builder
a688f56892 [WSO2 Release] [Jenkins #2921] [Release 3.0.230] prepare release v3.0.230 2018-02-23 09:55:52 +00:00
Kamidu Sachith Punchihewa
22929c3886
Merge pull request #1192 from Kamidu/master
Enable user's last name in the email template
2018-02-23 15:13:06 +05:30
lasantha
175c987b8a formatting device-location API 2018-02-23 14:29:49 +05:30
lashanfaliq95
65cfca7024 Updated the last-known api to be able to return a number of records. 2018-02-23 09:00:18 +05:30
geethkokila
2c0ca5c210 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-02-23 08:49:22 +05:30
WSO2 Builder
12e8639907 [WSO2 Release] [Jenkins #2919] [Release 3.0.229] prepare for next development iteration 2018-02-22 16:42:34 +00:00
WSO2 Builder
4f364288c5 [WSO2 Release] [Jenkins #2919] [Release 3.0.229] prepare release v3.0.229 2018-02-22 16:42:24 +00:00
Madawa Soysa
cecb988a01
Merge pull request #1188 from rasika/fix-1689
Fixing issue of the platform filter in devices listing page
2018-02-22 21:53:15 +05:30
kamidu
66a4e60b16 Enable user's last name in the email template
This is to enable the user's last name also to be included in the meta information list on email templates. When customizing the email template users can define to include both fist and last name to the content or title of the email
2018-02-22 17:53:24 +05:30
geethkokila
8cf1bd996c Adding the privacy api
This is has an api to delete device of users when they request
2018-02-22 15:54:09 +05:30
geethkokila
1d605d0921 Fixing the issue where Enrollment ID is not inclueded in some tables.
Fixing the issue where enrolment id is not included in the device-info, device-details, device-location, device-application-mapping tables. This fixes the https://github.com/wso2/product-iots/issues/1707
2018-02-22 15:54:08 +05:30
Ace
8895d0f94d Adding debug logs 2018-02-22 15:54:08 +05:30
Ace
a7b37a160b Removing un-necessary checks when retrieving getAllDeviceInfo 2018-02-22 15:54:08 +05:30
WSO2 Builder
5851c43e3f [WSO2 Release] [Jenkins #2917] [Release 3.0.228] prepare for next development iteration 2018-02-22 10:20:59 +00:00
WSO2 Builder
9e5ecfe204 [WSO2 Release] [Jenkins #2917] [Release 3.0.228] prepare release v3.0.228 2018-02-22 10:20:49 +00:00
Charitha Goonetilleke
c0615fee83
Merge pull request #1190 from ruwany/master
Removing code that leads to an exception when retrieved device count is 0
2018-02-22 15:27:23 +05:30
Ace
90d38bf699 Adding debug logs 2018-02-22 13:07:48 +05:30
Ace
fc7f80c543 Removing un-necessary checks when retrieving getAllDeviceInfo 2018-02-22 13:03:16 +05:30
WSO2 Builder
a29736e09e [WSO2 Release] [Jenkins #2915] [Release 3.0.227] prepare for next development iteration 2018-02-21 04:15:10 +00:00
WSO2 Builder
59265f4add [WSO2 Release] [Jenkins #2915] [Release 3.0.227] prepare release v3.0.227 2018-02-21 04:14:57 +00:00
Madawa Soysa
b911c9e169 Adding entity application mapping to the database
When an application installation request is made other than adding an application install operation a mapping between the devices and the installed applications are kept in the database. In a case where an enterprise wide installation happens a mapping is made with the respective entity and the application.

This commit implement the mapping function.

Related to issue wso2/product-iots#1688
2018-02-20 18:51:34 +05:30
kamidu
f87a3a6b08 Fixing the issue when marking as read notification
The issue occures when the notification id is larger than 45 due to the restiction on paramater size. I have removed the related validation in order to resolve the issue.
2018-02-20 14:33:33 +05:30
Rasika Perera
bc18d60c55 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1689 2018-02-20 14:28:21 +05:30
Rasika Perera
49f97f02e8 Fixing platform filtering not working correctly
Resolves https://github.com/wso2/product-iots/issues/1689
2018-02-20 14:28:03 +05:30
Ruwan
40ae5a09a2
Merge pull request #1184 from ruwany/master
Fixed https://github.com/wso2/carbon-device-mgt/issues/1175
2018-02-20 12:17:32 +05:30
Rasika Perera
8e3a298bb0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1689 2018-02-19 19:50:05 +05:30
Rasika Perera
528837ce1f Fixing platform filtering not working correctly
Resolves https://github.com/wso2/product-iots/issues/1689
2018-02-19 19:49:45 +05:30
WSO2 Builder
00b2ded5ea [WSO2 Release] [Jenkins #2910] [Release 3.0.226] prepare for next development iteration 2018-02-19 12:56:51 +00:00
WSO2 Builder
1a107902fe [WSO2 Release] [Jenkins #2910] [Release 3.0.226] prepare release v3.0.226 2018-02-19 12:56:37 +00:00
Charitha Goonetilleke
2832644d4b
Merge pull request #1187 from rasika/fix-1689
Fixing issue of devices listing page filters are not showing all the available filtering options
2018-02-19 18:14:21 +05:30
Rasika Perera
b5f4bd757a Fixing devices listing page filters are not showing all the available filtering options
Resolves https://github.com/wso2/product-iots/issues/1689
2018-02-19 17:23:22 +05:30
Madawa Soysa
debe93cb03 Improving application subscription API
Changing the DeviceIdentifier bean to the same as org.wso2.carbon.device.mgt.common.DeviceIdentifier and implement the install app device.

Adding an ApplicationInstallResponse as the response to respond with more information to the application install request.

related to wso2/product-iots#1688
2018-02-19 10:22:08 +05:30
Madawa Soysa
f66ff60ada Adding a method to retrieve Application by UUID
Application install request is made for a UUID which is associated with an application release. In order to get the details of the application to build the payload of the install application operation, it is required to get the application from the database related to the UUID.
2018-02-19 10:22:08 +05:30
Madawa Soysa
690eff6660 Refactoring mobile application subscription API 2018-02-19 10:22:08 +05:30
Ace
2516967159 Fixing test failure 2018-02-15 13:31:34 +05:30
lasantha
6792c21210 Rmoved the lifecycle managemt
Removed the lifecycle management core and formatted the source
2018-02-15 10:36:28 +05:30
Ace
e604532b28 Fixing fomatting issues 2018-02-15 08:50:16 +05:30
Ace
bba4b09284 Adding comments 2018-02-15 08:30:34 +05:30
Ace
81cb39a4a6 Fixed https://github.com/wso2/carbon-device-mgt/issues/1175 2018-02-14 21:27:39 +05:30
lasantha
9b1820dca5 Adding Lifecycle Management functionalities and fixed related bugs 2018-02-14 16:51:49 +05:30
WSO2 Builder
9c9a37b42b [WSO2 Release] [Jenkins #2908] [Release 3.0.225] prepare for next development iteration 2018-02-13 05:04:50 +00:00
WSO2 Builder
0d9364671a [WSO2 Release] [Jenkins #2908] [Release 3.0.225] prepare release v3.0.225 2018-02-13 05:04:36 +00:00
charitha
a876b65974 Fixed regression issues related to https://github.com/wso2/product-iots/issues/1671 2018-02-12 20:16:06 +05:30
Madawa Soysa
3a44421cea Fixing policy view interface not loading issue
When a policy is created and viewed the policy using the policy view icon the page keeps loading sometimes due to undefined deviceGroups variable inside the policyPayloadObj. 

This commit fixes this issue by improving the code where the null check has been made to check if the  deviceGroup is null. Also made few improvements in the code where the checks have been made.

Resolves wso2/product-iots#1681
2018-02-12 14:56:50 +05:30
WSO2 Builder
436fb63d93 [WSO2 Release] [Jenkins #2906] [Release 3.0.224] prepare for next development iteration 2018-02-10 17:15:41 +00:00
WSO2 Builder
3f095b4b6a [WSO2 Release] [Jenkins #2906] [Release 3.0.224] prepare release v3.0.224 2018-02-10 17:15:27 +00:00
charitha
c600719f3c Fixed https://github.com/wso2/product-iots/issues/1671 2018-02-10 21:48:30 +05:30
WSO2 Builder
ee53943d3e [WSO2 Release] [Jenkins #2904] [Release 3.0.223] prepare for next development iteration 2018-02-07 09:48:07 +00:00
WSO2 Builder
ac7126bc13 [WSO2 Release] [Jenkins #2904] [Release 3.0.223] prepare release v3.0.223 2018-02-07 09:47:53 +00:00
lasantha
fb8d9dd494 refactored the source and fixed some bugs 2018-02-07 00:14:01 +05:30
WSO2 Builder
01cd9eb3ef [WSO2 Release] [Jenkins #2902] [Release 3.0.222] prepare for next development iteration 2018-02-06 15:17:31 +00:00
WSO2 Builder
b5a10cc078 [WSO2 Release] [Jenkins #2902] [Release 3.0.222] prepare release v3.0.222 2018-02-06 15:17:16 +00:00
WSO2 Builder
65fe3ade2e [WSO2 Release] [Jenkins #2900] [Release 3.0.221] prepare for next development iteration 2018-02-06 10:02:17 +00:00
WSO2 Builder
2356b6114e [WSO2 Release] [Jenkins #2900] [Release 3.0.221] prepare release v3.0.221 2018-02-06 10:02:03 +00:00
Rasika Perera
afe66f237a Fix https://github.com/wso2/product-iots/issues/1659 (#1177) 2018-02-06 15:11:32 +05:30
lasantha
669881eae7 adding appliction release functionalites and fixed build failure 2018-02-05 19:23:57 +05:30
lasantha
f17c36d13f Added app release updating fucntionality and fixed APPM related bugs 2018-02-04 23:28:07 +05:30
lasantha
c392f0e57d merge with upstream and fixed conflicts 2018-02-04 04:13:14 +05:30
lasantha
fdac04dd3e complete app release getting flow and fixed related bugs 2018-02-04 04:05:04 +05:30
lasantha
569007514e Added app release creation method and fixed issues 2018-02-02 12:59:31 +05:30
WSO2 Builder
0b4882e667 [WSO2 Release] [Jenkins #2898] [Release 3.0.220] prepare for next development iteration 2018-02-01 06:22:08 +00:00
WSO2 Builder
647beefcab [WSO2 Release] [Jenkins #2898] [Release 3.0.220] prepare release v3.0.220 2018-02-01 06:21:54 +00:00
WSO2 Builder
82f2567255 [WSO2 Release] [Jenkins #2896] [Release 3.0.219] prepare for next development iteration 2018-01-29 12:03:48 +00:00
WSO2 Builder
14770bb7bd [WSO2 Release] [Jenkins #2896] [Release 3.0.219] prepare release v3.0.219 2018-01-29 12:03:34 +00:00
Rasika Perera
16b0615577
Merge pull request #1170 from rasika/fix-1629
Fixing group operations bar not shown when "Select All" is clicked
2018-01-29 17:11:00 +05:30
WSO2 Builder
83c74259cd [WSO2 Release] [Jenkins #2894] [Release 3.0.218] prepare for next development iteration 2018-01-29 11:23:51 +00:00
WSO2 Builder
5b4e6f1d4d [WSO2 Release] [Jenkins #2894] [Release 3.0.218] prepare release v3.0.218 2018-01-29 11:23:36 +00:00
Kamidu Sachith Punchihewa
952c1fe28d
Merge pull request #1173 from rasika/fix-1624
Fixing regression issues for the validations
2018-01-29 16:38:40 +05:30
Rasika Perera
7673dca496 Fixing regression issues 2018-01-29 16:24:36 +05:30
WSO2 Builder
9bbf7cc54a [WSO2 Release] [Jenkins #2892] [Release 3.0.217] prepare for next development iteration 2018-01-29 08:45:58 +00:00
WSO2 Builder
407ee4ed43 [WSO2 Release] [Jenkins #2892] [Release 3.0.217] prepare release v3.0.217 2018-01-29 08:45:43 +00:00
lasantha
317386afb8 bump version of the app manager component 2018-01-28 10:29:54 +05:30
lasantha
ae1c99f665 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into application-mgt-new 2018-01-28 09:27:16 +05:30
lasantha
02415dfd92 merge with upstream master 2018-01-28 09:26:30 +05:30
WSO2 Builder
3014089807 [WSO2 Release] [Jenkins #2890] [Release 3.0.216] prepare for next development iteration 2018-01-26 14:21:01 +00:00
WSO2 Builder
3dd8c8bf2f [WSO2 Release] [Jenkins #2890] [Release 3.0.216] prepare release v3.0.216 2018-01-26 14:20:44 +00:00
Rasika Perera
7db642a9be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1629 2018-01-26 19:43:55 +05:30
kamidu
bb0920ef7f code reformatted to resolve the exsisted code formatting issues 2018-01-26 17:56:38 +05:30
kamidu
3bcb1b729c improve the java script code of changing the text and visibility
Improved the logic in order to remove the unesssary text changes and visibility changes. and fix the code formatting issues found in the code.
2018-01-26 17:56:38 +05:30
kamidu
9cc76da4c2 Fix git issue https://github.com/wso2/product-iots/issues/1629
Fixes wso2/product-iots#1629
2018-01-26 17:56:38 +05:30
WSO2 Builder
2cd3b81aaa [WSO2 Release] [Jenkins #2888] [Release 3.0.215] prepare for next development iteration 2018-01-26 08:57:24 +00:00
WSO2 Builder
8301dda57d [WSO2 Release] [Jenkins #2888] [Release 3.0.215] prepare release v3.0.215 2018-01-26 08:57:10 +00:00
Rasika Perera
6c2f4e3c8d
Merge pull request #1165 from rasika/fix-1624
Adding additional validations to improve stability of the product
2018-01-26 14:14:30 +05:30
WSO2 Builder
6f6c3e2051 [maven-release-plugin] prepare for next development iteration 2018-01-26 06:54:56 +00:00
WSO2 Builder
a47115d92d [maven-release-plugin] prepare release v3.0.214 2018-01-26 06:54:41 +00:00
Rasika Perera
003ae9883b Fixing https://github.com/wso2/product-iots/issues/1629 2018-01-25 16:12:04 +05:30
charitha
3cf0d12181 Updated license year 2018-01-25 14:59:35 +05:30
charitha
c542c3efe9 Implemented operation response publishing to analytics 2018-01-25 14:52:32 +05:30
WSO2 Builder
b5ed177338 [WSO2 Release] [Jenkins #2878] [Release 3.0.212] prepare for next development iteration 2018-01-25 02:54:38 +00:00
WSO2 Builder
8569092e00 [WSO2 Release] [Jenkins #2878] [Release 3.0.212] prepare release v3.0.212 2018-01-25 02:54:22 +00:00
charitha
439fae4f8d Fixed https://github.com/wso2/product-iots/issues/1630 2018-01-24 22:53:50 +05:30
WSO2 Builder
d4a2b807aa [WSO2 Release] [Jenkins #2876] [Release 3.0.211] prepare for next development iteration 2018-01-24 06:54:45 +00:00
WSO2 Builder
97324f8c19 [WSO2 Release] [Jenkins #2876] [Release 3.0.211] prepare release v3.0.211 2018-01-24 06:54:31 +00:00
Ruwan
16cd6056a9
Merge pull request #1167 from ruwany/master
Fix for https://github.com/wso2/product-iots/issues/1399
2018-01-24 12:07:46 +05:30
WSO2 Builder
b885931c26 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare for next development iteration 2018-01-24 05:53:23 +00:00
WSO2 Builder
e1a5b3ec43 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare release v3.0.210 2018-01-24 05:53:08 +00:00
Ace
bc9450b7ff merging with upstream 2018-01-24 10:53:00 +05:30
Ace
327f49cfd9 Fix for https://github.com/wso2/product-iots/issues/1399 2018-01-24 10:52:33 +05:30
Rasika Perera
ab352015b7 Fixes for the https://github.com/wso2/product-iots/issues/1624 2018-01-24 07:26:56 +05:30
Rasika Perera
8a09e44c3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1624 2018-01-23 18:48:26 +05:30
WSO2 Builder
b428ecb931 [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare for next development iteration 2018-01-23 13:16:30 +00:00
WSO2 Builder
091da0326d [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare release v3.0.209 2018-01-23 13:16:15 +00:00
Rasika Perera
c5622c7b0b Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:35:10 +05:30
WSO2 Builder
45f778d2e4 Merge commit '774c20a09a0bb12b11dbec7c4ec9d5fb491575e2' into 1d9c0cda-191e-4c45-9fd9-32a2aa0808a4 2018-01-23 13:03:19 +00:00
WSO2 Builder
774c20a09a [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare for next development iteration 2018-01-23 12:48:12 +00:00
WSO2 Builder
4d35797a55 [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare release v3.0.208 2018-01-23 12:47:55 +00:00
Rasika Perera
f3860e42f7 Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:08:20 +05:30
Rasika Perera
5347930d95
Merge branch 'master' into fix-1623 2018-01-23 18:00:54 +05:30
Rasika Perera
a406dd0540
Merge pull request #1163 from rasika/fix-1611
Isolating Geo Location Enabling Configuration
2018-01-23 17:59:57 +05:30
Rasika Perera
c46a2037fe Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-23 16:02:17 +05:30
Rasika Perera
68a5415e0b Fixing https://github.com/wso2/product-iots/issues/1623 2018-01-23 15:19:03 +05:30
Rasika Perera
3a9261536e Renamed isEnabled into Enabled for the consistency 2018-01-23 14:59:52 +05:30
Rasika Perera
08f4f04101 Fixing a typo 2018-01-23 14:39:33 +05:30
WSO2 Builder
8776317dfe [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare for next development iteration 2018-01-22 11:14:43 +00:00
WSO2 Builder
21c406fe01 [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare release v3.0.207 2018-01-22 11:14:29 +00:00
Rasika Perera
394f45f4bd Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-22 15:43:07 +05:30
geethkokila
ca92c5029f Changing the variable name 2018-01-22 15:25:40 +05:30
geethkokila
a0a2817730 Changing the variable name 2018-01-22 15:19:24 +05:30
geethkokila
7c4ca89beb Removing extra lines 2018-01-22 15:13:43 +05:30
geethkokila
5c2c7dfc2a Removing commented lines 2018-01-22 15:11:29 +05:30
geethkokila
8f1d15c690 Removing commented lines 2018-01-22 15:10:47 +05:30
geethkokila
03570f3ad7 Improvements to policy monitoring framework
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
2018-01-22 14:39:29 +05:30
geethkokila
1a957666e3 Improvements to policy monitoring framework
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
2018-01-22 14:39:16 +05:30
WSO2 Builder
d8caf3baea [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare for next development iteration 2018-01-22 04:26:32 +00:00
WSO2 Builder
944d640d5f [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare release v3.0.206 2018-01-22 04:26:17 +00:00
Madhawa Perera
e56fb5f4de
New Activity Info Provider API resource which accept an array of activity IDs to get activity information (#1161)
* New Activity Info Provider API resource which accept an array of activity IDs to get activity information

* Modifications to the new activity info provider api

* Add acceptable activity list count validation

* Modifications to the new activity provider API resource

* Added license header to the test class

* Modifications to the new activity provider api
2018-01-22 09:38:51 +05:30
nishadi
c50de8e2de Modified CommentsDAOmpl
Removed concatenation.
2018-01-18 16:33:04 +05:30
nishadi
a321bf934b Modified CommentsManagerImpl
Reformatted.
2018-01-18 16:26:40 +05:30
nishadi
40771cbfcd Modified CommentDAOImpl
String sql change int constant.
2018-01-18 16:21:18 +05:30
nishadi
8f8ec9a86a parameter in the consumes annotation changed to application/json 2018-01-18 15:56:38 +05:30
nishadi
eced883e7f Error response message changed. 2018-01-18 15:54:34 +05:30
nishadi
7242c63e60 CommentId changed into commentId 2018-01-18 14:54:15 +05:30
nishadi
27d3862ac8 CommentId changed into commentId 2018-01-18 14:42:40 +05:30
nishadi
3b86f8a443 CommentId changed into commentId 2018-01-18 14:16:48 +05:30
nishadi
da0b147050 modified commentsManagerImpl
Reformatted.
2018-01-18 13:31:21 +05:30
nishadi
f02a0b9e6c Modified pom.xml at org.wso2.carbon.device.application.mgt.common
Extra dependency to "org.wso2.carbon.device.application.mgt.core" is removed.
2018-01-18 11:32:32 +05:30
nishadi
4ea87284f2 Modified CommentAPIImpl
Reformatted
2018-01-18 11:17:05 +05:30
nishadi
a1868939a7 Modified CommentDAOImpl
Reformatted
2018-01-18 02:44:56 +05:30
nishadi
30ae09b067 Modified CommentDAOImpl
Reformatted
2018-01-18 02:42:57 +05:30
nishadi
c35ccf9888 Modified CommentManagerImpl
Changed the messages of the Exceptions.
2018-01-18 02:06:15 +05:30
nishadi
62ac3455dd Changed license year 2018-01-18 00:11:52 +05:30
nishadi
ff3eacd0ba Removed suppressing deprecated warning. 2018-01-18 00:06:41 +05:30
nishadi
a6f2486ec6 Modified Comment ManagementAPiImpl
changed returning error response message into "return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();"
2018-01-18 00:03:46 +05:30
nishadi
919a7a8ddd Modified pom.xml at org.wso2.carbon.device.application.mgt.api
removed extra dependencies
2018-01-17 17:27:18 +05:30
nishadi
4c1d8dfa4d Modified APIUtil
Modified the osgi contexts and reformatted.
2018-01-17 16:28:17 +05:30
WSO2 Builder
15bea25074 [WSO2 Release] [Jenkins #2865] [Release 3.0.205] prepare for next development iteration 2018-01-17 10:53:13 +00:00
WSO2 Builder
f9484f286f [WSO2 Release] [Jenkins #2865] [Release 3.0.205] prepare release v3.0.205 2018-01-17 10:52:58 +00:00
WSO2 Builder
a4a1587cb3 Merge commit '955de2159ce36a8e784cd203466b5f8d9405e3ba' into b141a02b-f6a3-4cd5-b234-bea699286e00 2018-01-17 10:37:49 +00:00
nishadi
3cc15d0df0 Reformatted the code. 2018-01-17 16:06:41 +05:30
nishadi
3bfb2addbb Reformatted the code. 2018-01-17 15:58:01 +05:30
WSO2 Builder
955de2159c [WSO2 Release] [Jenkins #2864] [Release 3.0.204] prepare for next development iteration 2018-01-17 10:13:09 +00:00
WSO2 Builder
d7c66d1d67 [WSO2 Release] [Jenkins #2864] [Release 3.0.204] prepare release v3.0.204 2018-01-17 10:12:51 +00:00
nishadi
1bbd0b1aa5 Modified CommentManagerImpl ,CommentManagementAPIImpl,CommentManagementAPI
Modified the exceptions.
2018-01-17 15:32:59 +05:30
Rasika Perera
67a12dc57b
Merge pull request #1158 from Kamidu/master
validation improvements
2018-01-17 15:32:28 +05:30
nishadi
c1dca737f7 Modified CommentManager
Edited the comments.
2018-01-17 15:16:29 +05:30
nishadi
3bd6d03b4c Modified CommentManagerImpl and CommentManager
wrapped & thrown the sql and db exceptions with CommentManagementException and ApplicationManagementException.
2018-01-17 15:13:22 +05:30
nishadi
caa47417bc Modified CommentManagerImpl
removed catch (SQLException e) and catch (DBConnectionException e).
2018-01-17 14:27:44 +05:30
Rasika Perera
6651dbb64a Fixed a typo 2018-01-17 14:07:00 +05:30
Rasika Perera
b24095779a Fixing https://github.com/wso2/product-iots/issues/1142 2018-01-17 13:51:18 +05:30
nishadi
74ea82c926 Modified CommentManagerImpl
Renamed ApplicationManagementDAOFactory.getCommentDAO as commentDAO
2018-01-17 13:36:42 +05:30
nishadi
a45ba625fe Renamed apAppCommentId into CommentId 2018-01-17 12:26:42 +05:30
kamidu
e086ecf28a correct olad formatting issues 2018-01-17 12:22:45 +05:30
nishadi
906535eb24 Modify CommentsManagerImpl
Removed Not found Exception
2018-01-17 11:51:32 +05:30
nishadi
4fb77cbee8 Modify CommentsManagerImpl
Removed throwing NullPointerException;
2018-01-17 11:45:14 +05:30
nishadi
a1911432a6 Modify PaginationConfiguration
Removed commented codes.
2018-01-17 11:32:50 +05:30
nishadi
99b916d6ff Modify Comment
Removed commented codes.
2018-01-17 11:30:02 +05:30
nishadi
453559a07b Modify CommentManagementAPIImpl
returned Error Response.
2018-01-17 11:24:54 +05:30