harshanl
8fa311e119
Removed unnecessary properties from EnrollmentInfo object
2016-08-10 18:25:35 +05:30
prabathabey
90889824e3
Further improving the performance of activity info retrieval
2016-08-10 17:52:22 +05:30
prabathabey
c161d7b659
Adding indexes to improve performance of entity retrieval and fixing a sytax error in the SQL query used to retrieve activities
2016-08-10 15:01:11 +05:30
prabathabey
213836541f
Fixing missing columns returned in the query that returns the list of acitivities
2016-08-10 14:54:31 +05:30
prabathabey
3abe837de3
Improving retrieval of activities
2016-08-10 14:30:13 +05:30
prabathabey
fc5021a0d5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-10 14:24:33 +05:30
prabathabey
c7730adbcb
Improving the retrieval of activities
2016-08-10 14:24:21 +05:30
harshanl
eb801696bf
Fixed EMM-1492
2016-08-10 12:55:58 +05:30
harshanl
f82ce82648
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-10 11:14:53 +05:30
harshanl
08ff70bb3c
Refactored CertMgt component
2016-08-10 11:14:46 +05:30
Rasika Perera
c01db9c773
Replaced emm specific unit implementation with old generalized cdmf unit
2016-08-10 08:40:48 +05:30
Rasika Perera
bb526513e8
Removed enrollment url calculation
2016-08-10 08:33:28 +05:30
mharindu
55acb7e7d3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-09 19:08:24 +05:30
mharindu
bd41e4f4fb
Implemented scope based authorization in device-mgt UI module
2016-08-09 19:08:07 +05:30
madhawap
d0d101297f
changes to removeCertificate endpoint, fix for the jira EMM-1490
2016-08-09 11:27:04 +05:30
madhawap
f12d2a5d69
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-09 11:17:01 +05:30
madhawap
324e7fd4c6
changes to removeCertificate endpoint, fix for the jira EMM-1490
2016-08-09 11:16:37 +05:30
Ace
aa7d3385ce
Adding missed role-listing changes
2016-08-09 08:10:51 +05:30
Ace
c693a11d7c
Fixing user,device,role listing pages
2016-08-09 07:56:56 +05:30
mharindu
5bdb4630af
Fixed conflicts and merged
2016-08-08 19:38:49 +05:30
mharindu
734aaa8c9e
Fixed null pointer exception
2016-08-08 19:24:57 +05:30
mharindu
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-08-08 18:49:40 +05:30
hasuniea
48543862c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-08 18:28:49 +05:30
dilanua
952905c60d
Adding Policy Edit UI
2016-08-08 18:26:50 +05:30
mharindu
2e79dd290e
Modified scopes
2016-08-08 18:24:44 +05:30
hasuniea
1b07b18678
adding security fixes
2016-08-08 18:05:12 +05:30
dilanua
fa0891d9a2
Adding Policy View UI
2016-08-08 14:23:11 +05:30
mharindu
acf6d7ecd7
Fixed conflicts and merged
2016-08-08 10:42:30 +05:30
dilanua
13126fe398
Adding policy create UI
2016-08-07 20:25:23 +05:30
dilanua
87cdfa209e
Updating policy management
2016-08-06 17:13:58 +05:30
harshanl
f1c1c67656
Removed unused policy.mgt module from device core bundle
2016-08-05 11:34:11 +05:30
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
2016-08-04 20:40:40 +05:30
harshanl
35ea88b9de
Fixed EMM-1476.
2016-08-04 20:39:31 +05:30
mharindu
ed4c762bfd
Refactored scopes
2016-08-04 17:46:46 +05:30
ayyoob
a7074e2e4e
refactored general configuration
2016-08-03 17:23:16 +05:30
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
2016-08-03 14:12:24 +05:30
mharindu
eb5216091e
Fixed conflicts and merged
2016-08-03 12:36:56 +05:30
madhawap
5bd879545b
fix for the iOS device operations blocker
2016-08-02 19:45:39 +05:30
madhawap
2e71c21378
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-02 19:04:54 +05:30
madhawap
d315e739e4
fix for the iOS device operations blocker
2016-08-02 19:04:28 +05:30
kamidu
23fe8b1fdb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-02 18:51:55 +05:30
kamidu
160d8c2feb
Fix the policy create wizard ui issues
2016-08-02 18:51:31 +05:30
dilanua
2ec9f68135
Removing the deprecation of operation.js as it seems to have one dependancy to plugins
2016-08-02 18:47:14 +05:30
Rasika Perera
b8bf855378
Calculating enrollment url when generalConfig.host config exists
2016-08-02 15:48:04 +05:30
inoshperera
2e8df6a16a
Merge pull request #322 from charithag/master
...
Fix issues in sql statements
2016-08-02 14:33:30 +05:30
charitha
efcd5272d2
Fix issues in sql statements
2016-08-02 14:31:12 +05:30
harshanl
01e2408ece
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-02 13:48:49 +05:30
mharindu
34f1d9ee38
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-08-02 11:03:29 +05:30
kamidu
9510554f67
Fix the notification view internal server error issue
2016-08-02 00:05:23 +05:30
dilanua
c7f4bba8bf
Deprecating operation.js module from UI
2016-08-01 22:45:30 +05:30
dilanua
e125871de0
Adding business-controllers to UI Modules
2016-08-01 22:42:53 +05:30
harshanl
06f72c014e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-01 20:29:51 +05:30
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
2016-08-01 20:29:21 +05:30
dilanua
ec7f8ccd1f
disabling testing info logs at token-protected-service-invokers.js
2016-08-01 20:28:39 +05:30
dilanua
89cebcdb9e
Updating UI oauth module with suppressed warnings for verified, but unresolved variables and functions
2016-08-01 19:28:05 +05:30
dilanua
39b14c9bc5
Adding conf-reader to UI modules
2016-08-01 19:06:04 +05:30
dilanua
bbff93adcc
Updating token-handler-utils with suppressed warnings for java packg imports
2016-08-01 18:50:47 +05:30
mharindu
ccdcea0109
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-08-01 12:27:25 +05:30
dilanua
303f16e747
Deprecating obsolete UI functions - device.js
2016-07-31 11:15:40 +05:30
dilanua
bc4192280c
Updating OAuth UI Module
2016-07-30 20:38:32 +05:30
dilanua
020f35cb4e
Updating OAuth UI Module
2016-07-30 19:47:34 +05:30
dilanua
7017f6e32b
Updating OAuth module dependants
2016-07-30 13:52:44 +05:30
dilanua
032b5d129a
Adding OAUTH module to UI
2016-07-29 16:48:20 +05:30
dilanua
b86be8375c
Refactoring OAuth utilities at UI Layer
2016-07-29 15:41:43 +05:30
dilanua
70074e2f3e
Refactoring OAuth utilities at UI Layer
2016-07-29 15:37:27 +05:30
dilanua
76385a1c9b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-29 15:15:21 +05:30
dilanua
a4c5aa5951
Refactoring OAuth utilities at UI Layer
2016-07-29 15:15:02 +05:30
Milan Perera
59b862dfc7
Merge pull request #321 from ayyoob/com
...
few fixes in JWT Client
2016-07-29 15:00:52 +05:30
dilanua
f7509f698d
Removing obsolete UI modules
2016-07-29 14:51:37 +05:30
dilanua
2efdc30177
Refactoring OAuth utilities at UI Layer
2016-07-29 14:44:16 +05:30
mharindu
84090fb16c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-29 12:39:05 +05:30
ayyoob
c71e5ead00
few fixes in JWT Client
2016-07-29 12:05:23 +05:30
ayyoob
b57db836d3
removed error message
2016-07-28 16:16:52 +05:30
Milan Perera
c49dc435e1
Merge pull request #319 from ayyoob/transport
...
Updated grant type implementation
2016-07-28 14:14:03 +05:30
dilanua
4b39a877ad
Updating oauth token handlers
2016-07-28 13:49:27 +05:30
ayyoob
d5e756c205
Updated Grant Type Implementation
2016-07-27 14:43:44 +05:30
dilanua
1172e759ca
Deprecating serverAdress.js
2016-07-27 06:50:06 +05:30
prabathabey
5ed3174a28
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-26 23:37:48 +05:30
prabathabey
5adfab9f8a
Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API
2016-07-26 23:37:42 +05:30
Ace
07b12fe4ea
Bug fixes
2016-07-26 22:03:14 +05:30
Ace
0d94a293a4
Adding notification and fixing QR code
2016-07-26 20:57:38 +05:30
prabathabey
c63818b78f
Avoiding multiple device data getting retrieved upon the same id
2016-07-26 19:31:44 +05:30
prabathabey
e27905792f
Code cleanup
2016-07-26 19:14:43 +05:30
prabathabey
5bc7cf7c30
Simplifying operation management related implementations
2016-07-26 18:32:00 +05:30
dilanua
8550bcb145
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-26 17:36:14 +05:30
dilanua
d2ec81b12b
Refactoring oauth token handling functions and dependants
2016-07-26 17:35:50 +05:30
Ace
1ed0481ec3
Changing nav-bar base-unit implementation
2016-07-26 16:59:57 +05:30
mharindu
6e742ee6ac
Added scope beans
2016-07-26 16:40:04 +05:30
mharindu
564c2b280e
Fixed conflicts and merged
2016-07-26 16:38:51 +05:30
Chatura Dilan
046cd6586c
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2016-07-26 12:00:17 +05:30
Chatura Dilan
7af8ecc686
Added userstore for role listing
2016-07-26 11:59:10 +05:30
dilanua
34edbce1a0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-26 11:35:17 +05:30
dilanua
c228f03481
Refactoring oauth token handling functions and dependants
2016-07-26 11:34:52 +05:30
prabathabey
89634a9c38
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-26 11:28:43 +05:30
prabathabey
bd1322e801
Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl
2016-07-26 11:28:31 +05:30
dilanua
2e5d046fbf
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-26 11:15:29 +05:30
dilanua
b72d099641
Refactoring oauth token handling functions
2016-07-26 11:14:46 +05:30
hasuniea
70f23b0919
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-26 10:22:42 +05:30
hasuniea
a02f7a5db1
fixing formatting issue
2016-07-26 10:21:25 +05:30
dilanua
d05c6e2170
Deprecating /api/token.jag (unused)
2016-07-25 22:23:22 +05:30
mharindu
3457bba4a3
Adding Annotation reading fix for device-mgt-extensions
2016-07-25 19:21:08 +05:30
dilanua
87dbb5f9e1
Refactoring ui token handling functions
2016-07-25 15:32:39 +05:30
dilanua
7facff4b58
Updating ui init logic
2016-07-25 15:28:41 +05:30
mharindu
19275634a1
Fixed webapp name resolving issue
2016-07-25 12:04:30 +05:30
dilanua
c57c75945c
Deprecating invoker-request-wrapper (unused)
2016-07-25 10:11:39 +05:30
dilanua
00f98f5cce
Updating base ui app config reader
2016-07-25 05:50:49 +05:30
dilanua
d04cb54ae8
Refactoring base ui app config reader
2016-07-24 21:34:22 +05:30
dilanua
c12630e65c
Refactoring base ui app config reader
2016-07-24 21:20:51 +05:30
dilanua
1916c4df5f
Refactoring cdmf product page layout
2016-07-24 20:35:52 +05:30
dilanua
7d9cde3cfb
Refactoring Navigation Bar
2016-07-24 12:46:40 +05:30
dilanua
99aca9b90a
Updating user-listing
2016-07-23 20:23:21 +05:30
dilanua
bbce1a3d8a
Refactoring user-listing front-end logic
2016-07-22 19:07:33 +05:30
dilanua
8f81f2bb01
Refactoring data-tables-invoker-api
2016-07-22 18:23:02 +05:30
dilanua
225b1ddc45
Refactoring device-mgt-props
2016-07-22 17:08:55 +05:30
mharindu
3331604699
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-22 16:42:00 +05:30
mharindu
827567733c
Fixed scope update issue in API update
2016-07-22 16:41:40 +05:30
dilanua
7e7549437b
Refactoring user module
2016-07-22 15:31:00 +05:30
dilanua
24d846a328
Refactoring user-create page and related modules
2016-07-22 15:25:33 +05:30
dilanua
b636738be3
Fixing issue: user-list not getting updated upon user-removal
2016-07-22 11:54:35 +05:30
madhawap
86fdc85d13
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-22 10:59:34 +05:30
madhawap
d79de070f1
fix to iOS device enrolment
2016-07-22 10:58:50 +05:30
ayyoob
250ce1f77c
added device mgt grant types
2016-07-21 20:14:43 +05:30
mharindu
b3d309583d
Fixed issues in scope service
2016-07-21 20:13:38 +05:30
dilanua
da6ff6e7fa
Refactoring user-listing page
2016-07-21 18:04:51 +05:30
dilanua
177b7cf3df
Refactoring data-tables-extended-unit
2016-07-21 17:58:59 +05:30
Ace
c8b37207fc
Fixing context issue in service-invoker
2016-07-21 15:03:17 +05:30
mharindu
b8f2457046
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-21 14:32:26 +05:30
dilanua
31b62e6336
Adding jaggery.conf url mapping for data-tables-invoker-api
2016-07-21 12:54:39 +05:30
mharindu
7f1e2fdf0b
Implemented scope management service
2016-07-21 12:43:21 +05:30
Ace
b8635db485
Adding changes to common modules to accomodate ui restructuring
2016-07-21 07:42:20 +05:30
mharindu
bdec8880bb
Fixed conflicts and merged
2016-07-18 20:22:27 +05:30
mharindu
9932f061fb
Fixed webapp name resolving issue
2016-07-18 20:09:16 +05:30
mharindu
186432e1df
Fixed webapp name resolving issue
2016-07-18 20:08:51 +05:30
Dulitha Wijewantha
03f323d6e2
Fixed a bug where getBoolean wasn't used
2016-07-18 12:29:58 +05:30
Ace
ca8859c80a
Fixing broken build due to new javax.xml imports
2016-07-18 09:09:29 +05:30
Timo Briddigkeit
ed07774552
Fixed literal string comparison.
...
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");
A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
2016-07-15 16:25:31 +02:00
mharindu
80f737822e
Fixed enrollment device mapping issue
2016-07-15 19:45:04 +05:30
Prabath Abeysekara
fbb09a7f58
Merge pull request #316 from xenobyte/master
...
Fixed predictable pseudorandom number generator
2016-07-15 13:17:23 +05:30
Timo Briddigkeit
0ac4752b2b
Fixed null pointer dereference
2016-07-15 09:47:08 +02:00
Timo Briddigkeit
0ea2c458e7
instanceof will return false for null references, the null check is not needed.
2016-07-15 09:39:50 +02:00
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
2016-07-15 09:26:27 +02:00
Ace
15ae91d1c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-15 11:59:42 +05:30
Ace
ca10ad53bb
Adding emm apis as common modules
2016-07-15 11:59:15 +05:30
prabathabey
40b43a8b97
DAO exceptions thrown while retrieving advance details of devices appears to have been swallowen at the REST API implementation that exposes the aforementioned functionality. This particular fix resolves it
2016-07-14 01:24:00 +05:30
Timo Briddigkeit
b674304087
Made constants real constant using final
2016-07-13 15:57:12 +02:00
Timo Briddigkeit
ee5b077e6a
Fixed various XML External Entity (XXE) attack vulnerabilities
2016-07-13 15:02:11 +02:00
Timo Briddigkeit
09020ccb9f
Fixed predictable pseudorandom number generator
2016-07-13 14:35:55 +02:00
mharindu
99664b23c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-13 11:05:35 +05:30
Dilan U. Ariyaratne
ab5aa3e31c
Merge pull request #315 from madhawap/master
...
Added missing end-point to the permissions.xml
2016-07-12 10:28:38 +05:30
madhawap
0b338a1d25
Added missing end-point to the permissions.xml
2016-07-12 10:24:05 +05:30