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 |
|
warunalakshitha
|
397c1daa2a
|
Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle
|
2016-09-29 00:40:58 +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 |
|
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 |
|
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 |
|
Ace
|
6aad76eff1
|
Synching with master and updating jscep and bcpkix dependencies
|
2016-09-23 11:24:49 +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 |
|
harshanl
|
1b6c7ea502
|
Refactored PolcyMgt component
|
2016-09-22 20:30:18 +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 |
|