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,698 Commits 31 Branches 461 Tags 183 MiB
e7e8cb62b6
Commit Graph

2283 Commits

Author SHA1 Message Date
Ace
5eaca0b1b1 merging with upstream 2016-11-04 20:09:01 +05:30
Ace
2aa1c98d0b bringing common features to cdmf 2016-11-04 19:12:06 +05:30
charitha
bb60acd105 Fix device listing issue 2016-11-02 12:59:43 +05:30
ayyoob
33bb9b5a14 merged with IoTS-1.0.0 branch 2016-11-02 06:51:28 +05:30
sinthuja
a5212213cf Changing the default wbsocket URL to DAS endpoint. 2016-11-01 19:55:22 +05:30
charitha
d1a6353195 Synced with changes in master 2016-11-01 15:41:51 +05:30
charitha
4a115e5d3f Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-01 15:01:53 +05:30
Charitha Goonetilleke
e1a1f710a0 Merge pull request #406 from sameeragunarathne/IoTS-1.0.0 
fixed share groups and group analytics in device grouping
 2016-11-01 15:01:38 +05:30
charitha
ac30e7eb3e Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
 2016-11-01 14:47:21 +05:30
WSO2 Builder
9517a3d30f [maven-release-plugin] prepare for next development iteration 2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9 [maven-release-plugin] prepare release v1.2.6 2016-10-31 10:32:11 +00:00
kamidu
0867b3d075 updating the footer 2016-10-31 15:39:10 +05:30
Rasika Perera
fbe423b824 Using permissionsUtil.hasPermission for clientside permission check 2016-10-29 23:46:49 +05:30
Rasika Perera
b1b6b94570 Adding permissionsUtil 2016-10-29 23:13:52 +05:30
sameera910409
f8f7dd08cd fixed share groups and group analytics in device grouping 2016-10-28 14:07:50 +05:30
Harshan Liyanage
261e8c510c Fixed syntax issue in device.js file 2016-10-27 15:32:38 +05:30
Charitha Goonetilleke
353707c9c7 Merge pull request #404 from sameeragunarathne/IoTS-1.0.0 
add group listing  and group device listing fixes
 2016-10-26 17:55:03 +05:30
charitha
1bfba25c5e Remove user list and role list attributes from group object 
Move group components to same devicemgt package levels
 2016-10-26 17:51:38 +05:30
kamidu
12e609c737 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-26 17:40:05 +05:30
kamidu
0c70c87406 fix for EMM-1673 2016-10-26 17:39:47 +05:30
Kamidu Sachith Punchihewa
02d3adf51e Merge pull request #401 from madawas/modal-refactor 
Refactoring pages to use new modal unit
 2016-10-26 17:29:50 +05:30
Kamidu Sachith Punchihewa
33874f95b6 Merge pull request #399 from saadsahibjan/master 
Fix incorrect spacing
 2016-10-26 17:28:59 +05:30
Kamidu Sachith Punchihewa
9d90411189 Merge pull request #402 from madawas/EMM-1298 
Fix for EMM-1298
 2016-10-26 17:27:33 +05:30
Kamidu Sachith Punchihewa
a295c88dc0 Merge pull request #405 from Megala21/master 
Refactoring code
 2016-10-26 17:27:04 +05:30
sameera910409
204a0ed943 fixes for the comments of the PR#404 2016-10-26 15:14:53 +05:30
Megala
a088392b2f Adding css for required fields 2016-10-26 11:58:23 +05:30
sameera910409
fef7c07cb2 add device group deleting and updating fixes 2016-10-26 10:08:48 +05:30
Harshan Liyanage
72522ad759 Fixed SQL syntax issue 2016-10-26 09:49:59 +05:30
Harshan Liyanage
9bf5ca94fb Fixed SQL syntax issue 2016-10-25 18:50:38 +05:30
sameera910409
41f367abfa add group listing and group device listing fixes 2016-10-25 17:48:16 +05:30
kamidu
1c2d339fed Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-25 17:22:26 +05:30
kamidu
7212e969d8 Fix for SQL query issue in mysql 2016-10-25 17:22:18 +05:30
Ruwan
072119d7df Merge pull request #403 from ayyoob/commit-fixes 
Commit fixes
 2016-10-25 15:29:04 +05:30
charitha
5f68953b11 Merge branch 'master' into IoTS-1.0.0 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
 2016-10-25 14:22:44 +05:30
Harshan Liyanage
1ba2e2f768 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-25 11:51:16 +05:30
Harshan Liyanage
f961b57f9f EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device. 2016-10-25 11:50:38 +05:30
Madawa Soysa
774eaadb71 EMM-1298: Extracting serial number from the certificate itself when adding a certificate 2016-10-25 11:43:58 +05:30
kamidu
65ed6c2f6e include owner for the operations api 2016-10-25 11:31:00 +05:30
ayyoob
8293ed43ae added missing imports 2016-10-24 02:17:20 +05:30
ayyoob
d17241e51e added comments and license 2016-10-23 14:18:15 +05:30
ayyoob
45c0d2d2f5 added logs if device type registration failed 2016-10-23 10:51:14 +05:30
ayyoob
d6090dd812 added device type deployer initial commit 2016-10-22 01:37:01 +05:30
Madawa Soysa
f6ee6aeb8d Refactoring pages to use new modal unit 2016-10-21 17:19:36 +05:30
Saad Sahibjan
1cb969eb6d Fix incorrect spacing 2016-10-21 13:52:33 +05:30
Megala
35d6d311a7 Fixing EMM-1763 2016-10-19 11:55:00 +05:30
WSO2 Builder
27a2c9b979 [maven-release-plugin] prepare for next development iteration 2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c [maven-release-plugin] prepare release v1.2.5 2016-10-18 12:09:16 +00:00
Kamidu Sachith Punchihewa
fa7c8e85ce Merge pull request #393 from thusithak/master 
Fixing modal dialog markup defects in unit
 2016-10-18 16:58:48 +05:30
Kamidu Sachith Punchihewa
7666bbfd05 Merge pull request #395 from Megala21/master 
Fixing EMM-1752 and EMM-1755
 2016-10-18 16:58:24 +05:30
WSO2 Builder
6a55e1be83 [maven-release-plugin] prepare for next development iteration 2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61 [maven-release-plugin] prepare release v1.2.4 2016-10-17 14:13:25 +00:00
Megala
3416ae78c4 Fixing the problems in displaying user list when the user names has special chracters 2016-10-17 16:35:58 +05:30
Megala
1ff86289fd Fixing the problems that happend when we have special chracters in roles 2016-10-17 15:47:32 +05:30
Megala
4ec6883ec8 Merge remote-tracking branch 'upstream/master' 2016-10-17 14:51:20 +05:30
Kamidu Sachith Punchihewa
0d6364d77a Merge pull request #394 from shavidissa/master 
Continued adding swagger annotations and created the swagger extensions file
 2016-10-17 14:28:07 +05:30
Megala
4a71be850c Refactoring code 2016-10-17 14:23:55 +05:30
Shavindri
28cb653b06 Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file. 2016-10-17 14:21:30 +05:30
Rasika Perera
b8f623e04a Supporting custom contentTypes for service invoker 2016-10-17 10:51:39 +05:30
Megala
d9ec203727 Fixing EMM-1755 2016-10-16 13:24:32 +05:30
Megala
d5c62f74dc Merge remote-tracking branch 'upstream/master' 2016-10-15 21:49:37 +05:30
thusithakalugamage
521a30c260 Fixing modal dialog markup defects in unit 2016-10-14 17:57:11 +05:30
harshanl
6e1fdabaad EMM-1342:Added policy revoke operation 2016-10-14 17:13:43 +05:30
Megala
d90d51d412 Merge remote-tracking branch 'upstream/master' 2016-10-14 16:04:01 +05:30
Megala
e55b3a6d5f Fixes related to having special characters in role name 2016-10-14 16:03:14 +05:30
kamidu
39bc2e6747 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-14 15:20:14 +05:30
kamidu
1af8184889 positioning modal content 2016-10-14 15:20:05 +05:30
thusithakalugamage
3aae81d9e4 resolving conflicts - removing deprecated modal related methods 2016-10-14 14:16:53 +05:30
thusithakalugamage
47ca8942b6 resolving conflicts - removing deprecated modal related methods 2016-10-14 14:11:49 +05:30
thusithakalugamage
308eeb6cf8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-14 13:52:42 +05:30
harshanl
a89b50197f EMM-1757:Fixed admin device-detail view issue 2016-10-14 13:21:51 +05:30
Megala
a04f91cddb Fixing issues related to mapping users and roles from different user stores 2016-10-14 10:59:56 +05:30
harshanl
954a2eb870 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-14 10:14:12 +05:30
Megala
87150f5074 Fixing secondary role deletion 2016-10-14 00:01:15 +05:30
Megala
2195a164e5 Merge remote-tracking branch 'upstream/master' 2016-10-13 21:28:51 +05:30
kamidu
6886233bb9 removing unnecessary   and improving styling in modal unit 2016-10-13 19:53:54 +05:30
thusithakalugamage
6667a41378 resolving conflicts 2016-10-13 19:03:44 +05:30
harshanl
24c38602b8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-13 17:11:42 +05:30
harshanl
51910ee67a EMM-1675:Added policy revoke operation 2016-10-13 17:11:36 +05:30
Megala
0756294724 Merge remote-tracking branch 'upstream/master' 2016-10-13 17:01:32 +05:30
Megala
d8555c34ab Fixing issues related with roles of secondary user store 2016-10-13 16:58:22 +05:30
kamidu
bbfa1c334d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-13 15:16:31 +05:30
kamidu
ed70cb02b6 Sample implimentation using the new cdmf.ui.modal unit 2016-10-13 15:16:09 +05:30
Kamidu Sachith Punchihewa
cce4428a9d Merge pull request #390 from shavidissa/master 
Removed the GroupManagementService and GroupManagementAdminService references from the APIs and continued adding swagger annotations
 2016-10-13 14:01:49 +05:30
Shavindri
c64581dc59 Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex 2016-10-13 13:45:02 +05:30
Kamidu Sachith Punchihewa
cb825a7f26 Merge pull request #389 from susinda/master 
Device delete implemented (only in api level) for iot and the fix for the EMM-1715
 2016-10-13 12:25:56 +05:30
kamidu
2ea21a6fdc renaming public js to match the unit structure 2016-10-13 12:22:07 +05:30
susinda
eb20d1fc1c Device delete implemented (only in api level) for iot 2016-10-13 12:02:00 +05:30
kamidu
959e3a63af Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-13 11:17:32 +05:30
kamidu
bfc04a7f16 Fixing EMM-EMM-1753 2016-10-13 11:17:15 +05:30
hasuniea
2128f08658 fixing EMM-1750 2016-10-13 10:00:08 +05:30
Rasika Perera
790ca36443 Removed unnecessary debug log 2016-10-13 08:22:37 +05:30
Rasika Perera
135b6e8881 Fixing device view page 2016-10-13 08:16:51 +05:30
kamidu
c4a0ac4bf3 Enable centralized modal handling unit for cdmf 2016-10-12 17:39:31 +05:30
kamidu
6605a86bf7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-12 16:11:00 +05:30
kamidu
43b1a9f278 Fix for EMM-1651 2016-10-12 16:09:28 +05:30
charitha
528687bde3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-12 12:59:41 +05:30
charitha
0498c68ca5 Add validation to maximum limit value 
(cherry picked from commit 4ed757f)
 2016-10-12 12:57:57 +05:30
Megala
4999b84169 Reformatting code 2016-10-12 09:41:43 +05:30
Megala
5b96e1b849 Fixing EMM-1333 2016-10-12 09:38:11 +05:30
thusithakalugamage
fa3db47400 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-11 18:36:56 +05:30
thusithakalugamage
48337ee16c [EMM-1618] - related improvements on remaining occurences 2016-10-11 18:35:47 +05:30
Rasika Perera
2340611a9b Removing mdm specific dependencies from CDMF 2016-10-11 15:41:25 +05:30
Milan Perera
da4a558d87 Merge pull request #387 from ayyoob/st2 
added gateway mode to decide to which oauth app to use.
 2016-10-11 15:35:26 +05:30
ayyoob
2f58e0ba15 added gateway mode to decide to which oauth app to use. 2016-10-11 15:15:50 +05:30
Kamidu Sachith Punchihewa
ecc70ead08 Merge pull request #385 from hastef88/emm1726 
EMM-1726
 2016-10-11 11:12:57 +05:30
Kamidu Sachith Punchihewa
af4989e56d Merge pull request #384 from shavidissa/master 
swagger annotations and definition update continued for device type, …
 2016-10-11 11:12:16 +05:30
Hasitha Amal De Silva
4555819211 EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button. 2016-10-11 11:01:30 +05:30
Shavindri
0842dcb2bb swagger annotations and definition update continued for device type, device, policy, role, user, group and user management. 2016-10-11 10:33:05 +05:30
Milan Perera
bb60caa171 Merge pull request #383 from ayyoob/st2 
fixed api name for device type
 2016-10-10 20:51:40 +05:30
ayyoob
93c1725e32 fixed api name for device type 2016-10-10 20:47:31 +05:30
charitha
e53b0c3860 Fix group count listing in dashboard 2016-10-10 20:00:39 +05:30
kamidu
8c94e83431 Fix for Jira : EMM-1682 and EMM-1653 2016-10-10 18:27:53 +05:30
charitha
a2c0526b40 Fix typo 2016-10-10 15:34:18 +05:30
charitha
670ca7c228 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
 2016-10-10 15:29:10 +05:30
kamidu
836ed2bc1c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-10 14:16:00 +05:30
kamidu
3223e29df9 Fix for EMM-1185 , EMM- 1619 2016-10-10 14:15:52 +05:30
Megala
235e9797d4 Fixing EMM-1717 2016-10-10 11:36:25 +05:30
ayyoob
5727886ea1 few changes after apimgt integration 2016-10-09 03:16:02 +05:30
hasuniea
05e95e2675 fix the EMM-1702 2016-10-07 15:48:43 +05:30
Imesh Chandrasiri
125b827f4f Fix for modal popup overlay bug 2016-10-07 14:27:00 +05:30
Kamidu Sachith Punchihewa
a8e7396589 Merge pull request #377 from DimalChandrasiri/master 
Parameterized datatable sorting function
 2016-10-07 13:10:35 +05:30
Kamidu Sachith Punchihewa
6dafd11ca9 Merge pull request #379 from thusithak/master 
EMM 2.2.0-Alpha2 theme migration and issue fixes
 2016-10-07 13:10:20 +05:30
harshanl
4ce9c95044 Changed getOperations API to return operation list of removed devices 2016-10-07 12:34:42 +05:30
thusithakalugamage
84a7d5517f EMM-1685] - fix and few other related improvements 2016-10-07 12:31:46 +05:30
Imesh Chandrasiri
bce1d9e060 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-07 10:11:35 +05:30
Imesh Chandrasiri
3e4c1f9121 Parametarized datatable sorting function 2016-10-07 10:11:21 +05:30
Kamidu Sachith Punchihewa
5e6d8e667d Merge pull request #376 from thusithak/master 
EMM 2.2.0-Alpha2 theme migration and issue fixes
 2016-10-06 22:46:51 +05:30
kamidu
131bcd48f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 22:33:15 +05:30
kamidu
cc6922bfad Fix for EMM-1680 2016-10-06 22:33:08 +05:30
charitha
664b3d4d43 Fix issue in duplicate mapping 2016-10-06 20:32:09 +05:30
harshanl
4bcf350236 EMM-1678:Updated the oauth component versions 2016-10-06 19:43:23 +05:30
thusithakalugamage
1a1f79b1b4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 17:46:59 +05:30
thusithakalugamage
ac27349dae Header nav menu responsiveness improvements 2016-10-06 17:45:55 +05:30
kamidu
fc902ba602 fix database extended issue 2016-10-06 17:25:47 +05:30
thusithakalugamage
909e7836ca Header nav menu responsiveness improvements 2016-10-06 16:41:31 +05:30
kamidu
fc50b851bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 16:26:55 +05:30
kamidu
4bbb378d26 conicting solving 2016-10-06 16:26:50 +05:30
charitha
94a50584f4 Improve group listing with pagination 2016-10-06 16:01:41 +05:30
kamidu
e2ee797462 Fix for EMM-1700 2016-10-06 12:20:07 +05:30
madhawap
16b334b0b3 changes to swagger SecurityDefinitionConfigurator and annotations 2016-10-06 12:13:27 +05:30
madhawap
7b8518a9db changes to swagger SecurityDefinitionConfigurator and annotations 2016-10-06 11:59:20 +05:30
charitha
ce5d63925a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-06 11:58:12 +05:30
charitha
e89b4015b6 Introduced pagination 2016-10-06 11:51:54 +05:30
Kamidu Sachith Punchihewa
06e70c8326 Merge pull request #373 from shavidissa/master 
swagger annotations and definitions changes for role management, configuration management and application management(admin)
 2016-10-06 11:33:31 +05:30
Shavindri
f0164b5a01 swagger annotations and definitions changes for role management, configuration management and application management(admin) 2016-10-06 10:12:25 +05:30
thusithakalugamage
2ae60cc415 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-05 19:18:22 +05:30
thusithakalugamage
88ec5246ec [EMM-1694] - Header responsive issues fix 2016-10-05 19:17:51 +05:30
kamidu
1fe74905f2 Fix for the redirection and ui related issues 2016-10-05 18:11:46 +05:30
Imesh Chandrasiri
ebad678bab Datatables serverside paging redirection bug fix 2016-10-05 15:08:34 +05:30
kamidu
8c98accd18 Fixing conflitcs 2016-10-05 12:24:23 +05:30
kamidu
c6fffb0b3a Fixies for the ui issues in EMM -beta 2016-10-05 12:22:32 +05:30
charitha
06176898d0 Exposed group id to API level 2016-10-05 12:20:35 +05:30
Megala
e77d8b8b29 Adding isEmpty check 2016-10-05 11:34:05 +05:30
Megala
0642cc10d7 Reformatting code 2016-10-05 10:52:40 +05:30
Megala
f9204add08 Merge remote-tracking branch 'upstream/master' 2016-10-05 10:10:12 +05:30
Megala
42a9ba92a6 Fixing EMM-1683 2016-10-05 10:09:35 +05:30
charitha
f22d392978 Upgrade to comply with latest CDMF changes 2016-10-04 19:03:07 +05:30
Megala
b7990b9146 Fixing problems in retriveing data from secondary user store 2016-10-04 17:22:45 +05:30
Kamidu Sachith Punchihewa
c7bd0de033 Merge pull request #369 from thusithak/master 
Platform configuration style defect fixes
 2016-10-04 17:09:53 +05:30
Dilan U. Ariyaratne
2d7506d9b8 Merge pull request #368 from amalhub/master 
Fixing issue: EMM-1537
 2016-10-04 17:04:55 +05:30
dilanua
dff32af832 Adding initial swagger annotations and permissions to Dashboard APIs 2016-10-04 16:25:17 +05:30
dilanua
1ca5762c44 Uncommenting Dashboard APIs 2016-10-04 15:49:29 +05:30
thusithakalugamage
f664749c1f platform configuration style defect fixes 2016-10-04 15:22:41 +05:30
kamidu
f32caf1833 UI fixes in 2.2.0-beta 2016-10-04 13:20:09 +05:30
charitha
a0050d8f4d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-04 12:26:29 +05:30
kamidu
7898a7475c UI fixes in 2.2.0-beta 2016-10-04 12:24:41 +05:30
charitha
d1d6eefd17 Upgrading grouping backend 2016-10-04 12:24:40 +05:30
amalhub
c87c5a8322 Fixing issue: EMM-1537 2016-10-04 11:14:39 +05:30
harshanl
f0f0182d20 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-03 18:28:43 +05:30
harshanl
a4538a6d6c Removed unnecessary params from paginated queries 2016-10-03 18:27:20 +05:30
Rasika Perera
35c23174be Fixing android sense download issue 2016-10-03 16:05:49 +05:30
Rasika Perera
0290c710e1 Fixing enrollment url for device types 2016-10-03 16:05:49 +05:30
Harshan Liyanage
13d9bdfb53 Merge pull request #367 from Megala21/master 
[EMM-1129]Fixing SSO problem
 2016-10-03 15:42:13 +05:30
Megala
359bd8f317 Fixing tenant loading problem 2016-10-03 15:15:27 +05:30
harshanl
672de3a09e Device status change fix for iOS 2016-10-03 14:57:46 +05:30
Megala
e8eb0123c7 Fixing the tenant loading problem when sso is enabled 2016-10-03 14:18:43 +05:30
harshanl
befb5b0ad8 EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password. 2016-10-03 14:13:06 +05:30
amalhub
8b4649b4e5 Fixing issue: EMM-1537 2016-10-03 11:39:03 +05:30
Megala
a0586ca977 Adding comment 2016-10-03 11:34:00 +05:30
Megala
e5870e1306 Fixing the problem of common log out 2016-10-02 23:15:25 +05:30
Megala
b10c323582 Fixing the problem in login 2016-10-02 21:26:13 +05:30
Megala
bacd7ccfd2 Merge remote-tracking branch 'upstream/master' 2016-10-01 22:02:35 +05:30
Megala
4af2a37d9d Fixing SSO problem 2016-10-01 22:00:59 +05:30
harshanl
406d49ad61 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-30 18:43:38 +05:30
harshanl
399ef2fc06 Windows getOpending operations fix 2016-09-30 15:33:59 +05:30
kamidu
5595100cc2 UI fixes in role and policy management 2016-09-30 15:10:34 +05:30
harshanl
9d31590e83 Windows getPending operations fix 2016-09-30 14:27:11 +05:30
harshanl
10f8b12b88 OperationManagerImpl Code refactored 2016-09-30 11:39:15 +05:30
harshanl
f9ba45f439 Fixed the device status changing issue when there are multiple enrollments for the same device 2016-09-30 11:04:28 +05:30
Chatura Dilan Perera
c16cc4cae1 [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032 [maven-release-plugin] prepare release v1.2.2 2016-09-29 20:32:59 +05:30
warunalakshitha
25ed0cf370 Fix build issue with swagger version 2016-09-29 18:28:09 +05:30
Rasika Perera
3b68ccb4ba Merge pull request #365 from rasika/iots-ga 
Merge iot-ga branch
 2016-09-29 15:21:17 +05:30
Megala
400199e965 Merge remote-tracking branch 'upstream/master' 2016-09-29 14:18:24 +05:30
Megala
38677f84e8 Fixing SQL syntax problem 2016-09-29 14:09:44 +05:30
Harshan Liyanage
cd06637546 Merge pull request #364 from Megala21/master 
Correcting the problem related with oracle syntax
 2016-09-29 14:06:49 +05:30
Megala
12aed521e5 Refactoring code 2016-09-29 13:57:06 +05:30
Megala
2cdaf5aa21 Reverting changes made to generic implementations and moving them to oracle specific ones 2016-09-29 13:44:33 +05:30
Megala
ecc87f370c Fixing oracle error 2016-09-29 13:19:33 +05:30
Rasika Perera
b2eb715fb7 REsolving conflicts 2016-09-29 13:01:01 +05:30
Rasika Perera
5c8c28d28c Merge pull request #1 from warunalakshitha/master 
upgrade product iot to carbon 4.4.9
 2016-09-29 11:24:05 +05:30
charitha
e6c4053135 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-29 11:12:52 +05:30
charitha
da0977bd85 Fix SQL error when could happen due to large response payloads 2016-09-29 11:12:28 +05:30
Megala
47d6268c9e Correcting the problem related with oracle syntax 2016-09-29 01:43:33 +05:30
warunalakshitha
397c1daa2a Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle 2016-09-29 00:40:58 +05:30
Rasika Perera
237b9a7078 Creating api endpoint to retrieve features of a device-type 2016-09-28 23:42:44 +05:30
Rasika Perera
b2f31be1d6 Fixing iot operation bar not listing operations 2016-09-28 23:42:15 +05:30
Megala
cd50fe88bc Reformatting the code 2016-09-28 16:22:59 +05:30
Megala
45cda92082 Merge remote-tracking branch 'upstream/master' 2016-09-28 15:33:42 +05:30
Megala
82be4ef5a8 Fixing oracle script issues 2016-09-28 15:15:24 +05:30
dilanua
7596f7876d Improving device view info.retrieval - UI 2016-09-28 14:11:00 +05:30
Rasika Perera
6d4ddf7b54 Removed info log on view device 2016-09-27 23:19:14 +05:30
Rasika Perera
1bae3d2213 Fixing policy retrieve api 2016-09-27 22:06:48 +05:30
Rasika Perera
99fee36f2c Fixing error when properties is null 2016-09-27 21:13:00 +05:30
amalhub
428ce25b6f Fixing issue: https://wso2.org/jira/browse/EMM-1646 2016-09-27 20:46:00 +05:30
harshanl
9467efe0f6 Fixed notification issue 2016-09-27 17:54:31 +05:30
kamidu
1a9ca2d59e Fix for Jira issue: EMM-1635 2016-09-27 15:41:47 +05:30
Rasika Perera
12c8483b4b Changes to devices policy 2016-09-27 15:28:06 +05:30
kamidu
174555b387 Fix for EMM-1627 2016-09-27 11:29:34 +05:30
Rasika Perera
056f6d2f4e Adding proper error message when no device type is avaialble 2016-09-27 04:49:07 +05:30
Imesh Chandrasiri
de63beaaa6 Roles listing icon resize fix 2016-09-26 20:04:14 +05:30
Imesh Chandrasiri
5e7d3a00ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-26 20:02:44 +05:30
dilanua
8232bf7484 FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633 2016-09-26 19:52:18 +05:30
Imesh Chandrasiri
5954fd9070 EMM-1595 : Fixing Icon of Users get enlarged when sorting by user name in List Mode 2016-09-26 19:41:20 +05:30
Imesh Chandrasiri
2c0df21491 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-26 19:37:43 +05:30
Rasika Perera
56a81e431c Removed extra license headers 2016-09-26 19:21:46 +05:30
Rasika Perera
6bfe166b5d Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username 2016-09-26 19:17:05 +05:30
Rasika Perera
54c518a4fd Making datatables-extended to get context path from global js variable 2016-09-26 19:13:12 +05:30
Rasika Perera
77720dd61a Fixing devices listing page styling issue. 2016-09-26 18:25:11 +05:30
Rasika Perera
1bef7a38ef Minor style fix for wr-hidden-operations 2016-09-26 18:08:06 +05:30
kamidu
225268bd78 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-26 18:05:36 +05:30
kamidu
0ab9db2afd Fix for EMM-1575 2016-09-26 18:05:29 +05:30
dilanua
378dd4084c FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585 2016-09-26 17:27:57 +05:30
harshanl
1a12838b7c Fixed issue in NotificationDAO due to invalid column name 2016-09-26 17:16:27 +05:30
Rasika Perera
4c4eba93d8 Returning correct representation of the device to template. 2016-09-26 17:15:12 +05:30
Rasika Perera
cef865f53a Parsing deviceType configs with %https.ip% and %http.ip% 2016-09-26 17:13:43 +05:30
Rasika Perera
a61be7a7ec Enable group management api 2016-09-26 14:56:34 +05:30
Rasika Perera
b5b4f508b0 Fixing NPE when fetching opeartion 2016-09-26 14:53:04 +05:30
Rasika Perera
f2af4bd078 Fixing undefined exception when device properties not available 2016-09-24 01:35:59 +05:30
harshanl
27a9eeb692 Removed unnecessary DM service 2016-09-23 23:22:58 +05:30
harshanl
f24242fb8a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-23 21:17:50 +05:30
harshanl
dd03d0b740 Added device status change upon inactivity mechanism 2016-09-23 21:17:37 +05:30
Ruwan
0c92f80e68 Merge pull request #361 from ruwany/carbon-kernel-4.4.7 
Migrating kernel/apim/appm/identity to latest versions
 2016-09-23 17:04:18 +05:30
Rasika Perera
ccf4b6492c Fixing devices listing issue 2016-09-23 12:45:45 +05:30
Rasika Perera
3e2731a772 Fixing invoker service return nothing on httpClient requests. 2016-09-23 12:45:15 +05:30
dilanua
ebead1249c Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:38:40 +05:30
dilanua
87a03e8312 Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:15:12 +05:30
dilanua
71424c4bb7 Fix for JIRA: https://wso2.org/jira/browse/EMM-1613 2016-09-22 22:47:18 +05:30
dilanua
e3256417a3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 22:16:24 +05:30
dilanua
a4b39f92e5 Fix for JIRA: https://wso2.org/jira/browse/EMM-1593 2016-09-22 22:15:55 +05:30
harshanl
5a6120d6fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 20:31:14 +05:30
dilanua
92aa413773 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 19:53:36 +05:30
dilanua
f7a38b2313 Fix for JIRA: https://wso2.org/jira/browse/EMM-1612 2016-09-22 19:53:18 +05:30
Ace
154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 
# Conflicts:
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
 2016-09-22 19:08:21 +05:30
harshanl
17127c3846 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 16:54:56 +05:30
Rasika Perera
98ab29fe94 Fixing virtual firealarm device agent download 2016-09-22 15:53:16 +05:30
Rasika Perera
eb5a36ef42 Supporting stream download on service invoker 2016-09-22 15:52:52 +05:30
Rasika Perera
4691bedbc5 Fixes to devices listing 2016-09-22 14:35:17 +05:30
Rasika Perera
1d3f5f39a7 Adding custom headers support to invoker util 2016-09-22 14:33:53 +05:30
Imesh Chandrasiri
f8b08849cd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-22 14:14:20 +05:30
Imesh Chandrasiri
3d5b6cd89f Removing unwanted url params from datatable serverside search 2016-09-22 14:14:07 +05:30
harshanl
12713f3301 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 10:45:47 +05:30
Rasika Perera
e71d3947cb Adding intuitive error when specified notification provider is not found 2016-09-22 08:57:34 +05:30
Rasika Perera
513015c1b5 Changing context path /emm into /devicemgt on cdmf base app 2016-09-22 08:56:41 +05:30
Rasika Perera
0fb87f3aa2 Fixing device types not shown issue 2016-09-22 08:56:12 +05:30
Rasika Perera
9148c3baea Fixing dashboard styling issues 2016-09-22 08:55:29 +05:30
harshanl
108ea98677 Refactor policy mgt components and fixed add operations for invalid devices from task service 2016-09-21 19:44:46 +05:30
harshanl
c967fc34d0 Fixed EMM-1513 2016-09-20 18:43:50 +05:30
Ace
5f90587564 Synching with master 2016-09-20 18:13:53 +05:30
Chatura Dilan Perera
7395c76408 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-09-20 17:45:24 +05:30
Ace
33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
 2016-09-20 17:02:28 +05:30
dilanua
81c684be50 Refactoring user-menu - UI 2016-09-20 16:27:07 +05:30
dilanua
d8e057abdd Fix for JIRA: https://wso2.org/jira/browse/EMM-1582 2016-09-20 15:28:45 +05:30
dilanua
6fea974c90 Refactoring notifications side-pane - UI 2016-09-20 14:21:17 +05:30
dilanua
ce1a063688 Refactoring notifications side-pane - UI 2016-09-20 12:49:41 +05:30
dilanua
9a095fa670 Refactoring change password modal - UI 2016-09-20 12:14:45 +05:30
Ace
87ad1e0e71 Fixing intermittent jackson bind issue 2016-09-20 12:07:14 +05:30
dilanua
b16f0fd592 Refactoring change password modal - UI 2016-09-20 11:27:04 +05:30
Ace
099ffd6a74 Updating velocity dependencies to OSGI enabled bundle version 2016-09-20 10:38:39 +05:30
Chatura Dilan Perera
50d8885f8b [maven-release-plugin] prepare for next development iteration 2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4 [maven-release-plugin] prepare release v1.2.1 2016-09-19 18:54:38 +05:30
harshanl
75df243a33 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-19 12:22:08 +05:30
Ace
6a8a5cbd5a Merging with master 2016-09-19 12:21:41 +05:30
harshanl
4169d3b2bd Fixed EMM-1554 2016-09-19 12:08:06 +05:30
dilanua
b4e4b114a5 Updating dashboard title 2016-09-18 17:01:36 +05:30
dilanua
e8571b7b65 Updating operation-mod with windows operation apis 2016-09-18 16:06:32 +05:30
dilanua
408e10a890 Changing admin dashboard name to 'Navigating Dashboard' - UI 2016-09-18 08:39:41 +05:30
dilanua
713c8ac4d8 Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:14 +05:30
dilanua
cd66f64945 Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI 2016-09-17 20:05:34 +05:30
dilanua
37131afb4a Adding radio:checked and input[type=hidden] support to operation mod - UI 2016-09-17 19:57:02 +05:30
dilanua
e4dae67fea Changing permissions - /devices/any to /devices/any-device 2016-09-17 17:36:06 +05:30
dilanua
58f8656e94 Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:22:47 +05:30
Rasika Perera
d9b25eda08 Adding deviceName into notifications 2016-09-16 09:39:21 +05:30
Dilan U. Ariyaratne
1651ade4a7 Merge pull request #357 from thusithak/master 
Theme migration - 2.2.0 alpha defect fixes
 2016-09-15 16:49:41 +05:30
Dilan U. Ariyaratne
df7c54b1af Merge pull request #356 from DimalChandrasiri/theme-migration 
Model Fixes
 2016-09-15 16:49:14 +05:30
thusithakalugamage
2f5d90cb6c [EMM-1571] Add policies page wizard styling and layout defects 2016-09-15 13:46:48 +05:30
harshanl
5b0e99aeff Fixed EMM-1562 2016-09-15 12:37:35 +05:30
harshanl
78cab76101 Fixed EMM-1531 2016-09-15 12:36:55 +05:30
Imesh Chandrasiri
1599b84e54 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-15 10:19:42 +05:30
Imesh Chandrasiri
e2576b21a8 Adding default button class to modal popups 2016-09-15 10:19:22 +05:30
kamidu
a448959fe0 Fix for EMM-1548 2016-09-15 06:40:05 +05:30
Ace
1dfb8e22e1 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:09 +05:30
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