Commit Graph

5044 Commits

Author SHA1 Message Date
WSO2 Builder
66591d3680 [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare release v3.1.4 2018-03-14 04:56:53 +00:00
geethkokila
ec3f814133 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 10:05:48 +05:30
Charitha Goonetilleke
329e41b04c
Merge pull request #1197 from Arcane94/master
Fixed https://github.com/wso2/carbon-device-mgt/issues/1194
2018-03-14 04:25:21 +00:00
n-jay
280a63bdbd Remove UI API scopes from config file 2018-03-13 15:13:22 +05:30
Lashan Faliq
51753ebbbf Merge branch 'master' into master 2018-03-13 14:48:50 +05:30
n-jay
a36a5aa279 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-13 12:23:41 +05:30
Kamidu Sachith Punchihewa
5bd42415b2
Merge pull request #1209 from lasanthaDLPDS/master
Fix formatting issues
2018-03-13 11:05:23 +05:30
n-jay
69ac1edc9b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into dep-ui2 2018-03-13 09:48:19 +05:30
WSO2 Builder
0f272ff4ed [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare for next development iteration 2018-03-13 04:16:58 +00:00
WSO2 Builder
ac9d20af2f [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare release v3.1.3 2018-03-13 04:16:48 +00:00
WSO2 Builder
bbe144e25f [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare for next development iteration 2018-03-12 11:42:26 +00:00
WSO2 Builder
7ee1bdacb6 [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare release v3.1.2 2018-03-12 11:42:16 +00:00
WSO2 Builder
b31c31b410 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare for next development iteration 2018-03-12 11:15:23 +00:00
WSO2 Builder
ab8cd3f8e3 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare release v3.1.1 2018-03-12 11:15:13 +00:00
lasantha
04527696eb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-12 16:36:33 +05:30
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
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
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
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