Commit Graph

6541 Commits

Author SHA1 Message Date
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
eb01e72930
Merge pull request #1198 from Kamidu/master
Changing the javascript to support IE
2018-02-28 18:23:28 +05:30
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
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
geethkokila
b78e6d6d01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-02-27 14:36:13 +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
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
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
6588bf7b81 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-02-22 15:54:39 +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
Geeth
6c46ffe9e5
Merge pull request #1189 from Kamidu/master
Fixing The issue occurs when the marking a single notification as read.
2018-02-21 09:31:42 +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