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

2395 Commits

Author SHA1 Message Date
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
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
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
Shavindri
3d383b0414 test push reverse 2016-10-04 13:39:08 +05:30
Shavindri
b77aefa02c test push 2016-10-04 13:34:44 +05:30
kamidu
f32caf1833 UI fixes in 2.2.0-beta 2016-10-04 13:20:09 +05:30
kamidu
7898a7475c UI fixes in 2.2.0-beta 2016-10-04 12:24:41 +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
harshanl
b1e140b58e Removed unnecessary imports 2016-09-30 10:58:00 +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
86a45fec2e Fixes to mqtt notification strategy when message body is null 2016-09-26 14:57:10 +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