community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,080 Commits 31 Branches 461 Tags 183 MiB
1ba2e2f768
Commit Graph

1881 Commits

Author SHA1 Message Date
kamidu
e2d0f7d040 Fix for EMM-1559 2016-09-14 16:23:21 +05:30
Imesh Chandrasiri
3e5064feed Fix for datatable icon size change on pagination 2016-09-14 15:13:54 +05:30
Imesh Chandrasiri
9573bce48f Fix for datatable icon size change on pagination 2016-09-14 14:35:56 +05:30
Imesh Chandrasiri
317252ebb0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-14 10:22:00 +05:30
Rasika Perera
1d7546916c Changes to the policiesCount, rolesCount, usersCount methods 2016-09-14 07:09:05 +05:30
Rasika Perera
0fab418187 Fixing invalid device count and group count 2016-09-13 19:43:43 +05:30
Imesh Chandrasiri
b56fb667b7 Modal fixes 2016-09-13 15:16:50 +05:30
kamidu
d7c7315f16 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-13 12:15:03 +05:30
kamidu
70dd5ded77 Fix for the policy edit internal server issue 2016-09-13 12:14:55 +05:30
Dilan U. Ariyaratne
3cbaecfbbf Merge pull request #355 from DimalChandrasiri/theme-migration 
Data Table CSS Removed from custom.desktop file
 2016-09-13 11:19:30 +05:30
thusithakalugamage
144dd92c47 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-12 18:09:57 +05:30
thusithakalugamage
d2a44647dd [EMM-1549] - Heading defect fix 2016-09-12 18:09:33 +05:30
dilanua
00d79c9ece Changing certificates breadcrumb name from certificate to certificates - UI 2016-09-12 17:09:40 +05:30
Imesh Chandrasiri
7a452d09ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-12 15:18:37 +05:30
Imesh Chandrasiri
e3b230937e Remove data table styles 2016-09-12 15:18:21 +05:30
thusithakalugamage
4cb5238112 [EMM-1543] styling defect fix 2016-09-12 14:37:52 +05:30
thusithakalugamage
3b3962b772 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-12 14:36:25 +05:30
thusithakalugamage
0273a6e369 responsive tab panel component - markup rewrite for uuf 2016-09-12 14:35:58 +05:30
dilanua
6aa01d2e7a Fixing NPE issue in token-protected-service-invokers - UI 2016-09-12 14:17:44 +05:30
Chatura Dilan Perera
de23a8cf27 [maven-release-plugin] prepare for next development iteration 2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9 [maven-release-plugin] prepare release v1.2.0 2016-09-09 20:18:12 +05:30
Rasika Perera
ae7f4b8373 Adding permission update error message box 2016-09-09 19:27:09 +05:30
Rasika Perera
7edc7f29db Fixing role add permission update issue 2016-09-09 19:27:09 +05:30
harshanl
0eaf33aa5c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 19:16:27 +05:30
harshanl
87a5b09266 Added users/count API 2016-09-09 19:16:00 +05:30
thusithakalugamage
6825a87bb9 button component - active and focus style defect fix 2016-09-09 19:11:02 +05:30
thusithakalugamage
c871fbcdad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 18:53:17 +05:30
thusithakalugamage
b2cde2228f wizard component - layout defect fixes 2016-09-09 18:44:20 +05:30
thusithakalugamage
0d02e88955 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 18:42:46 +05:30
Imesh Chandrasiri
b08aeefbbc Modal Changes 2016-09-09 18:42:31 +05:30
kamidu
2ec2600471 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 18:40:12 +05:30
Imesh Chandrasiri
8f68a3658e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 18:23:53 +05:30
Imesh Chandrasiri
f908738659 Modal Changes 2016-09-09 18:23:44 +05:30
Rasika Perera
8e247bda62 Fixing font warning on page load 2016-09-09 17:58:33 +05:30
Rasika Perera
4d0fd67539 Adding missing woff2 fonts 2016-09-09 17:50:30 +05:30
kamidu
0fdcbae817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 17:47:49 +05:30
kamidu
878daae5c5 Permission modifications 2016-09-09 17:47:42 +05:30
Imesh Chandrasiri
47b46c50b0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 17:19:18 +05:30
thusithakalugamage
42c6500a31 adding responsive, date addition and version number update 2016-09-09 17:16:08 +05:30
Chatura Dilan Perera
2d5262e21e [maven-release-plugin] prepare for next development iteration 2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404 [maven-release-plugin] prepare release v1.2.0 2016-09-09 17:10:04 +05:30
thusithakalugamage
ef646800fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 16:05:42 +05:30
thusithakalugamage
dc23e55444 responsive tab panel component - style changes 2016-09-09 16:02:09 +05:30
Imesh Chandrasiri
d182c194ed removing data table css from custom.desktop.css 2016-09-09 15:47:55 +05:30
harshanl
2f1c03ae1f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 15:36:17 +05:30
dilanua
7a0e52e8f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 15:30:54 +05:30
dilanua
6a9225d249 Updating device module for permissions - Ui 2016-09-09 15:30:23 +05:30
harshanl
97cb3cc015 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 15:10:21 +05:30
harshanl
7dc93ff010 MSSQL script fixes and added the /users/count REST API 2016-09-09 15:06:30 +05:30
Imesh Chandrasiri
690bd7de5c modal popup changes 2016-09-09 14:58:31 +05:30
Rasika Perera
940f2aaede Merge pull request #348 from DimalChandrasiri/theme-migration 
Theme migration
 2016-09-09 12:29:41 +05:30
harshanl
d60daae97f MSSQL fixes to dbscrpits and DAO layer 2016-09-09 12:15:51 +05:30
Imesh Chandrasiri
613d0ff7be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 11:39:29 +05:30
Imesh Chandrasiri
f42215a926 Adding modal code changes 2016-09-09 11:37:41 +05:30
kamidu
c2471fc2bb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 11:17:50 +05:30
kamidu
2cd5a0e659 Enable permission check according to the new permissions 2016-09-09 11:13:37 +05:30
Rasika Perera
432c46601b Fixing breadcrumb height issue 2016-09-09 11:12:08 +05:30
Rasika Perera
cfa32cf75c Fixing icons background color issue 2016-09-09 11:10:01 +05:30
dilanua
2d864bf02e Removing unnecessary spacing provided for operation-bar - UI 2016-09-09 10:23:11 +05:30
harshanl
1e00a012a8 Removed unnecessary import statements 2016-09-09 10:07:16 +05:30
harshanl
0ee6110b3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 09:57:48 +05:30
mharindu
ce1f5c5701 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 02:56:41 +05:30
mharindu
115099c8fe Implemented permission based authorization 2016-09-09 02:56:21 +05:30
dilanua
4fe79be5f8 Updating datatables server-side-paging module 2016-09-08 22:44:18 +05:30
dilanua
9e9f3e859a Updating custom-desktop.css to remove unnecessary bottom border of operation-bar 2016-09-08 22:41:11 +05:30
kamidu
f5e1fee561 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-08 18:42:18 +05:30
kamidu
411641bc57 Enable permission check according to the new permissions 2016-09-08 18:41:51 +05:30
charitha
de6f2558c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-08 14:48:38 +05:30
charitha
2fde165b7c Fix SQL error when could happen due to duplicate enrollments. 
(cherry picked from commit c75307f)
 2016-09-08 14:47:21 +05:30
Rasika Perera
5157cb81f8 Merge pull request #345 from thusithak/theme-migration 
Theme migration - responsive small device view defect fixes
 2016-09-08 12:34:07 +05:30
thusithakalugamage
e80daf7709 responsive small device view defect fixes 2016-09-08 12:29:49 +05:30
harshanl
e72d3147f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-08 11:53:08 +05:30
dilanua
d24ba98643 Updating activate and deactivate policy endpoints from PUT to POST 2016-09-07 16:15:26 +05:30
harshanl
b7ffaf0b0f Fixed issues in DAO implementations and MSSQL db script 2016-09-07 15:01:09 +05:30
dilanua
a74862d73b Updating policy module - UI 2016-09-07 14:56:27 +05:30
Rasika Perera
f37c2c6de8 Fixing requesting invalid url for Roboto-Regular web font 2016-09-07 01:39:22 +05:30
Rasika Perera
887322b716 Merge pull request #344 from DimalChandrasiri/theme-migration 
Theme migration
 2016-09-06 19:05:00 +05:30
dilanua
795fbcb366 Updating ios operation endpoints - UI 2016-09-06 12:52:52 +05:30
Imesh Chandrasiri
2786c576ea Merge Conflicts Fixed 2016-09-06 11:42:54 +05:30
mharindu
24930b3042 Partial commit of migration 2016-09-05 16:37:09 +05:30
Imesh Chandrasiri
fe0bdb9ba6 Merge Conflicts Fixed 2016-09-05 14:45:41 +05:30
Imesh Chandrasiri
d1acfe1503 Modal Changes added 2016-09-05 14:44:21 +05:30
harshanl
bdb5b970fd Removed access modifiers from Interface APIs 2016-09-05 11:51:51 +05:30
harshanl
8e6c15acf2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-05 09:49:16 +05:30
dilanua
e881aa6da4 Fixing Role Editing UI 2016-09-02 18:55:00 +05:30
dilanua
c57e9eba3a Updating Roles listing UI to dynamically fetch app-context 2016-09-02 18:08:27 +05:30
dilanua
0427a6dd4b Refactoring Role Create UI - moving units to page 2016-09-02 18:00:40 +05:30
dilanua
934c45cd95 Adding role creation UI 2016-09-02 17:43:43 +05:30
dilanua
746a4d4372 Refactoring roles listing UI - merging srcs in units to page 2016-09-02 10:27:52 +05:30
dilanua
fd6ddf7a52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-01 22:31:21 +05:30
dilanua
677385920e Updating User Listing UI 2016-09-01 22:30:49 +05:30
Rasika Perera
ad5c97e354 Temporary resolving WARN logs for css fonts on the theme. 2016-09-01 22:12:51 +05:30
dilanua
687efa97b1 Updating Role Listing UI 2016-09-01 20:12:47 +05:30
dilanua
eedb66ec45 Updating User Listing UI 2016-09-01 19:08:20 +05:30
dilanua
6f28bf1d94 Updating User Listing UI 2016-09-01 18:51:26 +05:30
dilanua
32fc58c917 Updating User Listing UI 2016-09-01 17:49:16 +05:30
dilanua
54807b99ee Updating role listing UI 2016-09-01 17:00:43 +05:30
Rasika Perera
8148b5b06c Separating CDMF base app and uuf-template app 2016-09-01 16:28:05 +05:30
Imesh Chandrasiri
4a69e162b3 Modal Changes added 2016-09-01 12:09:24 +05:30
Imesh Chandrasiri
1ed6213916 Modal Changes added 2016-09-01 10:51:38 +05:30
harshanl
54112a3f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-01 10:25:37 +05:30
charitha
3575c9a33d Fix issue in get devices with since parameter. 2016-08-31 17:43:13 +05:30
Chatura Dilan Perera
f29b9e84f2 Fixed 200 returns when activities are empty and since is a future date 2016-08-31 13:56:59 +05:30
harshanl
6554368bfa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-31 11:04:44 +05:30
harshanl
551d77bd62 Refactored OperationMgr code 2016-08-30 16:58:25 +05:30
kamidu
cd77ce692e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-30 16:37:34 +05:30
kamidu
abb3aea9a9 fixes for notification isses 2016-08-30 16:36:26 +05:30
harshanl
675843d7f7 Added Valid device list to Activity response 2016-08-30 15:53:07 +05:30
harshanl
a77564ac2d Added status for each device in Activity response 2016-08-30 14:53:56 +05:30
Chatura Dilan Perera
9aa5f2793f return date format as UTC in APIs 2016-08-30 14:17:06 +05:30
Chatura Dilan Perera
475b832c59 Changed return date format to UTC date 2016-08-29 18:50:23 +05:30
Chatura Dilan Perera
83442b0bca Fixed issue in activity retrival 2016-08-29 15:52:54 +05:30
Chatura Dilan Perera
29d6b38d15 Fixed issue in activity getting with response 2016-08-29 15:52:36 +05:30
Chatura Dilan Perera
40cabd0064 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-08-27 01:53:20 +05:30
Chatura Dilan Perera
549a2773f2 Fixed issue releated to activity api since 2016-08-27 01:52:48 +05:30
harshanl
624bf7c7b4 Fixed EMM-1518 2016-08-26 23:07:07 +05:30
harshanl
56f23a83fc changed comments 2016-08-26 20:52:14 +05:30
Imesh Chandrasiri
e02264099b Adding user menu update 2016-08-26 16:05:29 +05:30
thusithakalugamage
00bf595cb2 moving wso2 theme to emm - removing duplicated styles for buttons and links, navbar style update 2016-08-26 15:56:25 +05:30
thusithakalugamage
42a3d5f7e5 moving wso2 theme to emm - modal window content positioning and background fixes 2016-08-26 14:19:24 +05:30
thusithakalugamage
b5fda80377 emm login page layouts updated to wso2 theme markup 2016-08-26 13:39:10 +05:30
thusithakalugamage
b67b34e831 cdmf navbar hamburger menu and menu open state icons correction 2016-08-26 11:52:18 +05:30
thusithakalugamage
6b5d884fd5 vertical tab component bottom margin defect fix 2016-08-26 11:50:29 +05:30
thusithakalugamage
333e05dcc5 Merge branch 'theme-migration' of https://github.com/DimalChandrasiri/carbon-device-mgt into theme-migration 2016-08-26 10:25:14 +05:30
thusithakalugamage
ee856d6b8b moving wso2 theme to emm - link hover defect fix 2016-08-26 07:43:06 +05:30
thusithakalugamage
cd6cf9f6b3 moving wso2 theme to emm - navbar cllapse color fixes 2016-08-26 06:03:22 +05:30
thusithakalugamage
849c2a4f55 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-08-25 14:44:51 +05:30
Imesh Chandrasiri
5cdafa04a6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-08-25 14:44:31 +05:30
Imesh Chandrasiri
802d5e5fe9 Markup change to suite the padding 2016-08-25 14:42:26 +05:30
thusithakalugamage
aa23239f40 moving wso2 theme to emm - layout color update 2016-08-25 14:30:09 +05:30
Charitha Goonetilleke
9e0edf84ab Merge pull request #337 from charithag/master 
Fix issue in get devices with since parameter
 2016-08-25 14:12:59 +05:30
harshanl
811d225bc3 Fixed adding operations to invalid devices 2016-08-25 13:58:38 +05:30
charitha
0fe827ca9f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-25 13:10:48 +05:30
charitha
579d91bd79 Fix issue in get devices with since parameter. 2016-08-25 13:10:23 +05:30
Imesh Chandrasiri
4bebb77d5f Merge branch 'theme-migration' of https://github.com/thusithak/carbon-device-mgt into theme-migration 2016-08-25 12:34:12 +05:30
thusithakalugamage
1a2c6ec8eb moving wso2 theme to emm - layout 2016-08-25 12:33:48 +05:30
Imesh Chandrasiri
8a17ec9e48 Changing the login button to new theme 2016-08-25 12:30:56 +05:30
charitha
9246cdcf30 Return empty array when results not found with since parameter 2016-08-25 12:28:55 +05:30
Chatura Dilan Perera
763993263c Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-08-25 11:53:57 +05:30
Chatura Dilan Perera
16e6e12436 Fixed issue in Activity API returning one activity 2016-08-25 11:53:29 +05:30
thusithakalugamage
1f7b618d5a moving wso2 theme to emm - layout 2016-08-25 11:48:53 +05:30
Saad Sahibjan
a72b47f6f7 Fixing incorrect response for remove policy 2016-08-24 19:18:35 +05:30
harshanl
f3aefcca77 Fixed EMM-1450 2016-08-23 17:57:08 +05:30
hasuniea
e723761344 fixing code conflicts 2016-08-19 16:21:20 +05:30
Chatura Dilan Perera
8b17cbb339 Fix conflicts 2016-08-19 15:00:57 +05:30
hasuniea
b3582f9d47 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-19 13:40:21 +05:30
dilanua
7bc927fbd0 Removing obsolete constants from constants.js - UI 2016-08-19 11:52:24 +05:30
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
442c2b86da fixed formatting issues 2016-08-15 15:19:18 +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
bd41e4f4fb Implemented scope based authorization in device-mgt UI module 2016-08-09 19:08:07 +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
a4c5aa5951 Refactoring OAuth utilities at UI Layer 2016-07-29 15:15:02 +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
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
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