kamidu
|
1c2d339fed
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
kamidu
|
7212e969d8
|
Fix for SQL query issue in mysql
|
8 years ago |
Ruwan
|
072119d7df
|
Merge pull request #403 from ayyoob/commit-fixes
Commit fixes
|
8 years ago |
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
|
8 years ago |
ayyoob
|
3140c36f7b
|
added missing license headers
|
8 years ago |
Harshan Liyanage
|
1ba2e2f768
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
|
Harshan Liyanage
|
f961b57f9f
|
EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
|
8 years ago |
Madawa Soysa
|
774eaadb71
|
EMM-1298: Extracting serial number from the certificate itself when adding a certificate
|
8 years ago |
|
kamidu
|
65ed6c2f6e
|
include owner for the operations api
|
8 years ago |
sinthuja
|
a6203845c9
|
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
|
8 years ago |
|
sinthuja
|
00e57bd800
|
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
|
8 years ago |
|
ayyoob
|
8293ed43ae
|
added missing imports
|
8 years ago |
|
ayyoob
|
16f6a62dca
|
refactored DAO handler
|
8 years ago |
|
ayyoob
|
fbfb86c53e
|
refactored DAO handler
|
8 years ago |
|
ayyoob
|
d17241e51e
|
added comments and license
|
8 years ago |
|
ayyoob
|
45c0d2d2f5
|
added logs if device type registration failed
|
8 years ago |
|
ayyoob
|
c48f879205
|
added XmlAccessorType to root pom
|
8 years ago |
|
ayyoob
|
e3ef66aa1a
|
added deployer feature
|
8 years ago |
|
ayyoob
|
eeea1c372f
|
updated configs and Dao
|
8 years ago |
|
ayyoob
|
d6090dd812
|
added device type deployer initial commit
|
8 years ago |
|
Madawa Soysa
|
f6ee6aeb8d
|
Refactoring pages to use new modal unit
|
8 years ago |
Saad Sahibjan
|
1cb969eb6d
|
Fix incorrect spacing
|
8 years ago |
Harshan Liyanage
|
04396cd7b3
|
Merge pull request #398 from Megala21/master
Fixing EMM-1763
|
8 years ago |
Megala
|
35d6d311a7
|
Fixing EMM-1763
|
8 years ago |
Kamidu Sachith Punchihewa
|
1c92bee5a9
|
Merge pull request #397 from wso2/release-1.2.5
Release 1.2.5
|
8 years ago |
WSO2 Builder
|
27a2c9b979
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
eae935f91c
|
[maven-release-plugin] prepare release v1.2.5
|
8 years ago |
|
harshanl
|
370f6de260
|
Removed applied policy upon removal of the last policy applicable for a device
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
6ba6c20803
|
Merge pull request #396 from hastef88/ISUpgrade
Adopt common interceptor from identity server for appmgt authentication
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
fa7c8e85ce
|
Merge pull request #393 from thusithak/master
Fixing modal dialog markup defects in unit
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
7666bbfd05
|
Merge pull request #395 from Megala21/master
Fixing EMM-1752 and EMM-1755
|
8 years ago |
Hasitha Amal De Silva
|
011d29bd90
|
Adopt common interceptor from identity server for appmgt authentication
|
8 years ago |
|
WSO2 Builder
|
6a55e1be83
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
|
WSO2 Builder
|
11c2e59f61
|
[maven-release-plugin] prepare release v1.2.4
|
8 years ago |
|
Megala
|
3416ae78c4
|
Fixing the problems in displaying user list when the user names has special chracters
|
8 years ago |
|
Megala
|
1ff86289fd
|
Fixing the problems that happend when we have special chracters in roles
|
8 years ago |
|
Megala
|
4ec6883ec8
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
|
Kamidu Sachith Punchihewa
|
0d6364d77a
|
Merge pull request #394 from shavidissa/master
Continued adding swagger annotations and created the swagger extensions file
|
8 years ago |
|
Megala
|
4a71be850c
|
Refactoring code
|
8 years ago |
Shavindri
|
28cb653b06
|
Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
|
8 years ago |
Rasika Perera
|
b8f623e04a
|
Supporting custom contentTypes for service invoker
|
8 years ago |
|
Megala
|
d9ec203727
|
Fixing EMM-1755
|
8 years ago |
|
Megala
|
d5c62f74dc
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
|
harshanl
|
036ed6fe41
|
Added POLICY_REVOKE operation upon deletion of the last policy
|
8 years ago |
thusithakalugamage
|
521a30c260
|
Fixing modal dialog markup defects in unit
|
8 years ago |
|
harshanl
|
73539362d4
|
Refactored PolicyAdministratorPointImpl
|
8 years ago |
|
harshanl
|
6e1fdabaad
|
EMM-1342:Added policy revoke operation
|
8 years ago |
|
Megala
|
d90d51d412
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
|
Megala
|
e55b3a6d5f
|
Fixes related to having special characters in role name
|
8 years ago |
|
kamidu
|
39bc2e6747
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
