Milan Perera
|
a5f41ef734
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
|
8 years ago |
ayyoob
|
38f61adf94
|
few changes after testing multi tenancy
|
8 years ago |
WSO2 Builder
|
5dc55bb5b5
|
[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
c7fe9c3a20
|
[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13
|
8 years ago |
WSO2 Builder
|
c17bead1fc
|
[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
14100d3cc8
|
[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12
|
8 years ago |
Milan Perera
|
2b4a3cde61
|
Fixed conflicts and merged
|
8 years ago |
Milan Perera
|
21d8d14b7e
|
Fixed multy tenancy issues related to android device type
|
8 years ago |
ayyoob
|
159e067fed
|
changed integration client version
|
8 years ago |
ayyoob
|
b42505c1fe
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
|
8 years ago |
WSO2 Builder
|
cd7e0feaa6
|
[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
abb150d9bd
|
[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11
|
8 years ago |
ayyoob
|
7348ae2f2a
|
resolved merge issues
|
8 years ago |
ayyoob
|
3423ef025d
|
merged with upstream
|
8 years ago |
ayyoob
|
e74b4e23c4
|
removed apim dependency from cdmf
|
8 years ago |
WSO2 Builder
|
002fb8719b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
04f32902fd
|
[maven-release-plugin] prepare release v2.0.10
|
8 years ago |
WSO2 Builder
|
5c207897ad
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
233d14edbd
|
[maven-release-plugin] prepare release v2.0.9
|
8 years ago |
Rasika Perera
|
04ffa1eb8a
|
Merge pull request #565 from Vishanth/release-2.0.x
fixing dm_profile constraint issue
|
8 years ago |
Vishanth
|
e98af24f29
|
fixing dm_profile constraint issue
|
8 years ago |
WSO2 Builder
|
eedecf00ed
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ef57fc463b
|
[maven-release-plugin] prepare release v2.0.8
|
8 years ago |
ayyoob
|
5927064435
|
apim seperation
|
8 years ago |
Vishanth
|
f45528147c
|
fixing sql scripts to support multi tenancy
|
8 years ago |
WSO2 Builder
|
585b9bde4d
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
d206148841
|
[maven-release-plugin] prepare release v2.0.7
|
8 years ago |
ayyoob
|
2fbaf31b93
|
fixed permission and assigned environment variables for url context
|
8 years ago |
ayyoob
|
de957bec29
|
few changes after testing the cluster
|
8 years ago |
ayyoob
|
b35e0dd2fa
|
added missing components
|
8 years ago |
WSO2 Builder
|
5411d93103
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3ea83b925a
|
[maven-release-plugin] prepare release v2.0.6
|
8 years ago |
geethkokila
|
44c7383b15
|
Adding support to send ios request the synapse gateway
|
8 years ago |
geethkokila
|
65cb12b5ac
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
8 years ago |
WSO2 Builder
|
6aea6195e9
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3db5b289ac
|
[maven-release-plugin] prepare release v2.0.5
|
8 years ago |
WSO2 Builder
|
ed47094964
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
8d409a7248
|
[maven-release-plugin] prepare release v2.0.4
|
8 years ago |
Ace
|
674048ab27
|
Coorecting version import ranges
|
8 years ago |
Ruwan
|
46c3b015fa
|
Merge pull request #498 from charithag/release-2.0.x-email-invites
Release 2.0.x email invites
|
8 years ago |
charitha
|
2b1d46f45f
|
Finalized enrollment invitations
|
8 years ago |
Ace
|
64da9479a1
|
Bumping identity dependencies
|
8 years ago |
charitha
|
795ccb740c
|
Add backend support for enrollment invitations
|
8 years ago |
Supun94
|
a831dc6a9a
|
Changing cdm-config file
|
8 years ago |
Supun94
|
2751d4b856
|
Code refactoring
|
8 years ago |
Supun94
|
eb1575126f
|
Minor refactoring on policy merging
|
8 years ago |
Supun94
|
02fb952cc0
|
Minor refactoring on policy decision point
|
8 years ago |
Supun94
|
35f3fcc8f9
|
Changed policy evaluation point
|
8 years ago |
Supun94
|
936e71a743
|
Adding configurations for different policy evaluation service components
|
8 years ago |
Supun94
|
367fa927b0
|
Changed policy decision point package structure
|
8 years ago |
geethkokila
|
8ca28fa1fd
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
|
8 years ago |
geethkokila
|
23dc0e62ab
|
Partial commit
|
8 years ago |
Rasika Perera
|
1465c56822
|
Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
This reverts commit f9b6939cb7 .
|
8 years ago |
Ace
|
47d8baccf7
|
upgrading to latest version of identity
|
8 years ago |
WSO2 Builder
|
f9b6939cb7
|
[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4
|
8 years ago |
Rasika Perera
|
42930fe8c4
|
Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
This reverts commit 78b9052c37 .
|
8 years ago |
WSO2 Builder
|
78b9052c37
|
[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4
|
8 years ago |
Vishanth
|
ebc896ccd4
|
removing the device type from constraint to support multi tenancy since it is not unique
|
8 years ago |
WSO2 Builder
|
a59edee410
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
8f9b21b41b
|
[maven-release-plugin] prepare release v2.0.3
|
8 years ago |
charitha
|
78dfddbbed
|
Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x
|
8 years ago |
madhawap
|
b889f6e384
|
adding separate tasks for each device type
|
8 years ago |
geethkokila
|
d911281ad1
|
Merging master branch with release-2.0.x
|
8 years ago |
WSO2 Builder
|
228b24ca79
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
5dbb258f55
|
[maven-release-plugin] prepare release v2.0.2
|
8 years ago |
Chatura Dilan
|
82d865b104
|
Merge pull request #453 from madhawap/release-2.0.x
Seperate out task operations
|
8 years ago |
charitha
|
265b6248ef
|
Add email templates
|
8 years ago |
madhawap
|
bec4ae681d
|
Seperate out task operations
|
8 years ago |
charitha
|
431ce58c65
|
Merge with release-2.0.x branch
|
8 years ago |
charitha
|
1bcea7cc1b
|
Move components with org.wso2.mdm group id to org.wso2.carbon.devicemgt group
|
8 years ago |
WSO2 Builder
|
8431b30ddc
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ae2e283f14
|
[maven-release-plugin] prepare release v2.0.1
|
8 years ago |
charitha
|
726bbcd35d
|
Merged with upstream
|
8 years ago |
charitha
|
c07d77b85d
|
Updated group sharing model
|
8 years ago |
ayyoob
|
fede8ec409
|
few changes after testing with authoriser
|
8 years ago |
ayyoob
|
fe263efe60
|
changed device access verification approach
|
8 years ago |
WSO2 Builder
|
19c1b3566d
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
cff6e242c8
|
[maven-release-plugin] prepare release v2.0.0
|
8 years ago |
sinthuja
|
a8b5c92698
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
|
8 years ago |
sinthuja
|
bb5ebd7b4d
|
changing the expected kernel version to be 4.4.9 or higher as it's needed to be installed in DAS.
|
8 years ago |
charitha
|
a6064d2561
|
Update component versions for IoTS-1.0.0 release
|
8 years ago |
Ace
|
5eaca0b1b1
|
merging with upstream
|
8 years ago |
Ace
|
2aa1c98d0b
|
bringing common features to cdmf
|
8 years ago |
ayyoob
|
202e0d5619
|
merged with origin
|
8 years ago |
ayyoob
|
33bb9b5a14
|
merged with IoTS-1.0.0 branch
|
8 years ago |
sinthuja
|
bc84ff85ea
|
Changing the default port of publishing to 7612.
|
8 years ago |
sinthuja
|
8767dd9b44
|
Adding missing dependency jersey core with device mgt.
|
8 years ago |
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
|
8 years ago |
WSO2 Builder
|
9517a3d30f
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
a8568299b9
|
[maven-release-plugin] prepare release v1.2.6
|
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
|
e3ef66aa1a
|
added deployer feature
|
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 |
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 |
hasuniea
|
2128f08658
|
fixing EMM-1750
|
8 years ago |
hasuniea
|
fa972fbf36
|
adding platform ios to cdm-config.xml
|
8 years ago |
hasuniea
|
799beb3c59
|
removing ios platform entry from cdm-config.xml
|
8 years ago |
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
|
8 years ago |