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

3208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ayyoob
3140c36f7b added missing license headers 2016-10-25 13:57:16 +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
sinthuja
a6203845c9 Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service. 2016-10-24 16:37:00 +05:30
sinthuja
00e57bd800 Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service. 2016-10-24 16:31:41 +05:30
ayyoob
8293ed43ae added missing imports 2016-10-24 02:17:20 +05:30
ayyoob
16f6a62dca refactored DAO handler 2016-10-23 17:37:27 +05:30
ayyoob
fbfb86c53e refactored DAO handler 2016-10-23 15:45:29 +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
c48f879205 added XmlAccessorType to root pom 2016-10-23 01:24:33 +05:30
ayyoob
e3ef66aa1a added deployer feature 2016-10-22 22:36:38 +05:30
ayyoob
eeea1c372f updated configs and Dao 2016-10-22 22:22:34 +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
Harshan Liyanage
04396cd7b3 Merge pull request #398 from Megala21/master 
Fixing EMM-1763
 2016-10-19 11:58:28 +05:30
Megala
35d6d311a7 Fixing EMM-1763 2016-10-19 11:55:00 +05:30
Kamidu Sachith Punchihewa
1c92bee5a9 Merge pull request #397 from wso2/release-1.2.5 
Release 1.2.5
 2016-10-18 20:14:34 +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
harshanl
370f6de260 Removed applied policy upon removal of the last policy applicable for a device 2016-10-18 17:10:34 +05:30
Kamidu Sachith Punchihewa
6ba6c20803 Merge pull request #396 from hastef88/ISUpgrade 
Adopt common interceptor from identity server for appmgt authentication
 2016-10-18 16:59:08 +05:30
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
Hasitha Amal De Silva
011d29bd90 Adopt common interceptor from identity server for appmgt authentication 2016-10-18 14:49:53 +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
harshanl
036ed6fe41 Added POLICY_REVOKE operation upon deletion of the last policy 2016-10-14 19:20:11 +05:30
thusithakalugamage
521a30c260 Fixing modal dialog markup defects in unit 2016-10-14 17:57:11 +05:30
harshanl
73539362d4 Refactored PolicyAdministratorPointImpl 2016-10-14 17:33:41 +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