Commit Graph

5023 Commits

Author SHA1 Message Date
WSO2 Builder
eac2de37b2 Merge commit 'a73300b693013ab64bdf11dab9f626e4837eec04' into 34580e6a-6593-4c6a-8b11-5da48c102194 2018-03-14 10:16:37 +00:00
WSO2 Builder
a73300b693 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare for next development iteration 2018-03-14 09:53:11 +00:00
WSO2 Builder
fa5300cec1 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare release v3.1.7 2018-03-14 09:52:58 +00:00
Rasika Perera
108675261f
Merge pull request #1193 from lashanfaliq95/master
Updated the last-known api to be able to return a number of records.
2018-03-14 15:14:07 +05:30
WSO2 Builder
8282e69e12 Merge commit '46c4111b1dbaf85b9c413254f376c651488a5f57' into e61b2ead-a0d6-41af-8fb3-d2c404e569e2 2018-03-14 09:33:55 +00:00
lashanfaliq95
d60b885045 changed the parameters "type" and "deviceId" as required for the last-know api. 2018-03-14 14:44:47 +05:30
WSO2 Builder
46c4111b1d [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare for next development iteration 2018-03-14 09:08:39 +00:00
WSO2 Builder
28ec21a4f3 [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare release v3.1.6 2018-03-14 09:08:27 +00:00
Rasika Perera
5ea66b2125
Merge pull request #1214 from n-jay/dep-ui2
UI implementation for DEP management of iOS devices
2018-03-14 14:22:12 +05:30
Rasika Perera
815cea8ab1
Merge pull request #1215 from Arcane94/geoFencing
Adding geofencing feature to geo devices dashboard
2018-03-14 14:20:39 +05:30
Ruwan
af4f3302ad
Merge pull request #1222 from rasika/master
Adding an extension point into the PaginationRequest class
2018-03-14 13:59:10 +05:30
lashanfaliq95
b4f78337fa last-known api
updated the comment of the api and handled the error when a negative
value is passed as the limit.
2018-03-14 13:49:11 +05:30
Rasika Perera
e996f1f9f0 Adding an extension point into the PaginationRequest class
This allows other APIs which has additional parameters to be passed into
the backend DAOs
2018-03-14 13:20:11 +05:30
Arcane94
50a14e4321 Requested changes 2018-03-14 12:05:21 +05:30
Arcane94
e778700a5e Some more license year changes 2018-03-14 12:05:21 +05:30
Arcane94
0aff4193d3 License year changes and comment changes 2018-03-14 12:05:21 +05:30
Arcane94
8c303911b0 Final frontend and backend changes 2018-03-14 12:05:21 +05:30
Arcane94
1ffaad6fb7 rolling back some imports 2018-03-14 11:59:54 +05:30
Arcane94
27ae7cfed8 Fix for adding alerts twice with same name bug 2018-03-14 11:57:01 +05:30
Arcane94
9e64c8971d Minor changes in execution plans 2018-03-14 11:46:38 +05:30
Arcane94
7c88dfa0b3 Minor changes in backend APIs 2018-03-14 11:46:38 +05:30
Arcane94
7583957e16 Execution Plans and other updates 2018-03-14 11:46:38 +05:30
Arcane94
790f91b3b7 Add method overloads 2018-03-14 11:46:38 +05:30
WSO2 Builder
10f32aa150 [WSO2 Release] [Jenkins #2961] [Release 3.1.5] prepare for next development iteration 2018-03-14 06:01:28 +00:00
WSO2 Builder
b2c969ef85 [WSO2 Release] [Jenkins #2961] [Release 3.1.5] prepare release v3.1.5 2018-03-14 06:01:18 +00:00
Charitha Goonetilleke
6922a8693f
Merge pull request #1221 from geethkokila/master
Add GDPR fixes
2018-03-14 05:46:06 +00:00
n-jay
84c683a02b Edit nav-menu to include change DEP management page visibility logic 2018-03-14 11:03:37 +05:30
n-jay
43feaf7bc7 Add DEP management icon to navmenu
The DEP management page is formed once the iOS plugin has been deployed
within the IoT Home. Till then, any functionality with regards to DEP
management is not present within the server.
An icon in the navmenu allows users to access the DEP management page.

This commit includes the feature where the navmenu detects if the iOS
plugin has been deployed and accordingly displays the icon to access
the DEP management page.
2018-03-14 10:56:47 +05:30
WSO2 Builder
ffb28d018b [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare for next development iteration 2018-03-14 04:57:03 +00:00
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