Commit Graph

2077 Commits

Author SHA1 Message Date
dilanua
fbd51e31c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-19 10:50:31 +05:30
dilanua
13e2381293 Updating OAuth Utils - UI 2016-08-19 10:50:12 +05:30
Chatura Dilan Perera
654e1d9938 [maven-release-plugin] prepare for next development iteration 2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667 [maven-release-plugin] prepare release v1.1.2 2016-08-18 22:09:33 +05:30
harshanl
67942d5c1d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-18 19:45:47 +05:30
dilanua
0ba6edf36d Updating utility.js and removing unused config files - UI 2016-08-18 18:41:07 +05:30
dilanua
e32c9c0bdb Updating init.js module - UI 2016-08-18 18:27:24 +05:30
dilanua
f61b929bfd Updating data-tables API - UI 2016-08-18 18:11:31 +05:30
dilanua
78b5cf9fb3 Updating user APIs - UI 2016-08-18 16:27:07 +05:30
dilanua
4eaa3be491 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-18 16:24:22 +05:30
dilanua
83498b1039 Updating operation APIs 2016-08-18 16:23:57 +05:30
kamidu
8eeabcee2c Fix for Jira issue EMM-1418 2016-08-18 15:21:52 +05:30
hasuniea
1ba598a93e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-18 15:12:50 +05:30
dilanua
6b4ab635af Fixing jiras: EMM-1472, EMM-1505 2016-08-18 14:30:53 +05:30
charitha
3d19d9ed2e Add MySQLOperationDAOImpl for row locking. 2016-08-18 14:26:53 +05:30
hasuniea
6db619317c fixing app-install issue 2016-08-17 15:29:51 +05:30
harshanl
2cb8f0b313 Fixed EMM-1392 2016-08-16 18:02:30 +05:30
harshanl
d81733a4d6 Removed unused class 2016-08-16 18:01:49 +05:30
kamidu
4506db3647 Fix notification view issue 2016-08-16 14:53:44 +05:30
kamidu
77a8fed7de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-16 10:39:10 +05:30
hasuniea
5c57b664ad fixing getAllActivity H2 issue 2016-08-16 09:57:32 +05:30
Ruwan
6134f94e3c Merge pull request #332 from ayyoob/com
fixing commit issues
2016-08-16 08:27:17 +05:30
hasuniea
282f53bf09 Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3 2016-08-15 21:00:23 +05:30
hasuniea
c269f35ef2 fixing getAllActivity H2 issue 2016-08-15 21:00:15 +05:30
harshanl
d628699e8b Fixed repeating task operations. 2016-08-15 20:58:04 +05:30
mharindu
af286b8aaf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-15 20:31:00 +05:30
mharindu
7346313d27 Modified scope management service 2016-08-15 20:30:45 +05:30
harshanl
2bf6f562df Fixed repeating task operations. 2016-08-15 20:17:20 +05:30
kamidu
28760d2bee Enable advanced search for devices 2016-08-15 18:05:10 +05:30
dilanua
b37687cb58 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-15 17:56:19 +05:30
dilanua
8cb26b3264 Fixing no api resource found issue: changing user credentials 2016-08-15 17:55:46 +05:30
ayyoob
a7c201363c logged exception trace 2016-08-15 15:20:37 +05:30
ayyoob
442c2b86da fixed formatting issues 2016-08-15 15:19:18 +05:30
ayyoob
892d5cee20 avoided lazy inialization 2016-08-15 15:13:39 +05:30
harshanl
a7d7c689e8 Removed unsupported roleName parameter from device API 2016-08-15 13:59:30 +05:30
harshanl
671ba46fae Removed unnecessary properties from EnrollmentInfo object 2016-08-15 13:44:10 +05:30
harshanl
d401741d9b Fixed EMM-1492 2016-08-15 13:43:54 +05:30
Ace
e5a4c0f795 Adding role add/update/delete related changes 2016-08-15 11:37:57 +05:30
ayyoob
e45ba68a90 changing the context of device-types api 2016-08-13 10:54:32 +05:30
ayyoob
3b56668af0 merged with upstream 2016-08-13 10:47:18 +05:30
ayyoob
c04edef151 Added Certificate Configuration 2016-08-13 10:38:09 +05:30
dilanua
fcff1f0854 Fixing user menu reg exp issue 2016-08-12 20:00:46 +05:30
dilanua
106051a0a5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 17:57:49 +05:30
dilanua
e07991174d Adding user password change UI 2016-08-12 17:57:28 +05:30
kamidu
83cbd56b03 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 17:41:33 +05:30
kamidu
0be419d6cc Fix ui issues in device view section 2016-08-12 17:41:27 +05:30
dilanua
f71106d011 Fixing issues on Password Reset UI 2016-08-12 15:01:51 +05:30
dilanua
0836b2c99e Fixing user create page QR-generation issues 2016-08-12 14:46:17 +05:30
kamidu
42b6882cc1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 14:32:12 +05:30
dilanua
73b4abc46b Updating user remove UI 2016-08-12 14:24:38 +05:30
dilanua
4acfde1511 Adding user edit UI and fixes 2016-08-12 14:08:46 +05:30
kamidu
3219ac2101 Fixing the notification listing ui 2016-08-12 14:04:16 +05:30
dilanua
312f9d3f26 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 13:50:00 +05:30
dilanua
280c5e496d Adding user edit UI and fixes 2016-08-12 13:49:38 +05:30
Ace
d8c6720857 Removing previous query 2016-08-12 13:44:26 +05:30
Ace
74b7af7be7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 13:40:57 +05:30
Ace
aa01c7a52e Adding query improvements to activities retrieval query 2016-08-12 13:40:49 +05:30
madhawap
ecfe94235f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 12:46:27 +05:30
madhawap
c6cc5e8df3 fixes to role updating endpoint 2016-08-12 12:45:58 +05:30
ayyoob
3edc68d204 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com 2016-08-12 12:27:35 +05:30
ayyoob
217f541991 added certificate units 2016-08-12 12:27:14 +05:30
dilanua
b9efedfdbd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 11:27:01 +05:30
dilanua
632202899a Fixing issues in bulk user invitations 2016-08-12 11:25:43 +05:30
harshanl
c448d915d8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 11:09:10 +05:30
ayyoob
058f9e4cfa merged with origin 2016-08-12 10:52:56 +05:30
ayyoob
6f5d6abea3 updated device type label to defaul device type name 2016-08-11 23:41:52 +05:30
kamidu
9fde8c0442 Resolving conflicts 2016-08-11 19:08:12 +05:30
kamidu
120fe530ac Fix the device view related issues 2016-08-11 19:05:03 +05:30
dilanua
d7eed8bc1d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-11 18:43:16 +05:30
dilanua
0945c8f547 Adding user create UI 2016-08-11 18:42:53 +05:30
harshanl
e80c2f4050 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-11 17:27:10 +05:30
hasuniea
ed5e954194 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-11 16:06:43 +05:30
hasuniea
349c3bdb63 fixing App Version not updating in portal after being initially set 2016-08-11 15:56:03 +05:30
dilanua
390d929e70 Adding policy priority UI 2016-08-11 15:49:45 +05:30
dilanua
352643a421 Changing deactivate-policy api method to PUT 2016-08-11 15:31:28 +05:30
harshanl
34e97aeeae Removed device search using roleName parameter. 2016-08-11 14:03:09 +05:30
Ace
e1c4305e73 Adding fixes to Activities retrival query 2016-08-11 13:00:14 +05:30
Ace
71709a800f Adding group by function when retrieving operations 2016-08-11 11:13:04 +05:30
dilanua
4549452634 Updating getAllPolicies UI function with icon key 2016-08-11 11:04:34 +05:30
prabathabey
4c3211b079 Fixing issues in acitivity retrieval 2016-08-10 19:40:51 +05:30
dilanua
6e2249419d Updating policy edit base UI 2016-08-10 18:50:20 +05:30
dilanua
0521f1a9dd Updating policy view Base UI 2016-08-10 18:33:28 +05:30
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