Rasika Perera
|
1465c56822
|
Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
This reverts commit f9b6939cb7.
|
2016-12-19 12:39:56 +05:30 |
|
WSO2 Builder
|
f9b6939cb7
|
[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4
|
2016-12-19 09:06:04 +05:30 |
|
Rasika Perera
|
42930fe8c4
|
Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
This reverts commit 78b9052c37.
|
2016-12-19 08:45:19 +05:30 |
|
WSO2 Builder
|
78b9052c37
|
[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4
|
2016-12-16 17:03:06 +05:30 |
|
Vishanth
|
ebc896ccd4
|
removing the device type from constraint to support multi tenancy since it is not unique
|
2016-12-15 10:30:56 +05:30 |
|
WSO2 Builder
|
a59edee410
|
[maven-release-plugin] prepare for next development iteration
|
2016-12-08 14:39:00 +00:00 |
|
WSO2 Builder
|
8f9b21b41b
|
[maven-release-plugin] prepare release v2.0.3
|
2016-12-08 14:37:11 +00:00 |
|
charitha
|
78dfddbbed
|
Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x
|
2016-12-08 18:58:47 +05:30 |
|
madhawap
|
b889f6e384
|
adding separate tasks for each device type
|
2016-12-08 17:21:07 +05:30 |
|
geethkokila
|
d911281ad1
|
Merging master branch with release-2.0.x
|
2016-12-08 12:34:50 +05:30 |
|
WSO2 Builder
|
228b24ca79
|
[maven-release-plugin] prepare for next development iteration
|
2016-12-01 12:14:01 +00:00 |
|
WSO2 Builder
|
5dbb258f55
|
[maven-release-plugin] prepare release v2.0.2
|
2016-12-01 12:10:10 +00:00 |
|
Chatura Dilan
|
82d865b104
|
Merge pull request #453 from madhawap/release-2.0.x
Seperate out task operations
|
2016-12-01 16:39:29 +05:30 |
|
charitha
|
265b6248ef
|
Add email templates
|
2016-12-01 15:41:21 +05:30 |
|
madhawap
|
bec4ae681d
|
Seperate out task operations
|
2016-12-01 15:28:22 +05:30 |
|
WSO2 Builder
|
8431b30ddc
|
[maven-release-plugin] prepare for next development iteration
|
2016-11-25 08:06:30 +00:00 |
|
WSO2 Builder
|
ae2e283f14
|
[maven-release-plugin] prepare release v2.0.1
|
2016-11-25 07:43:34 +00:00 |
|
charitha
|
c07d77b85d
|
Updated group sharing model
|
2016-11-22 21:13:18 +05:30 |
|
WSO2 Builder
|
19c1b3566d
|
[maven-release-plugin] prepare for next development iteration
|
2016-11-16 12:18:48 +00:00 |
|
WSO2 Builder
|
cff6e242c8
|
[maven-release-plugin] prepare release v2.0.0
|
2016-11-16 12:16:25 +00:00 |
|
charitha
|
a6064d2561
|
Update component versions for IoTS-1.0.0 release
|
2016-11-16 13:32:13 +05:30 |
|
Ace
|
5eaca0b1b1
|
merging with upstream
|
2016-11-04 20:09:01 +05:30 |
|
Ace
|
2aa1c98d0b
|
bringing common features to cdmf
|
2016-11-04 19:12:06 +05:30 |
|
sinthuja
|
bc84ff85ea
|
Changing the default port of publishing to 7612.
|
2016-11-01 19:46:57 +05:30 |
|
sinthuja
|
8767dd9b44
|
Adding missing dependency jersey core with device mgt.
|
2016-11-01 18:32:27 +05:30 |
|
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
|
2016-11-01 14:47:21 +05:30 |
|
WSO2 Builder
|
9517a3d30f
|
[maven-release-plugin] prepare for next development iteration
|
2016-10-31 10:34:22 +00:00 |
|
WSO2 Builder
|
a8568299b9
|
[maven-release-plugin] prepare release v1.2.6
|
2016-10-31 10:32:11 +00:00 |
|
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 |
|
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 |
|
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 |
|
hasuniea
|
2128f08658
|
fixing EMM-1750
|
2016-10-13 10:00:08 +05:30 |
|
hasuniea
|
fa972fbf36
|
adding platform ios to cdm-config.xml
|
2016-10-11 16:55:40 +05:30 |
|
hasuniea
|
799beb3c59
|
removing ios platform entry from cdm-config.xml
|
2016-10-11 13:52:46 +05:30 |
|
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
|
2016-10-10 15:29:10 +05:30 |
|
harshanl
|
45e584a064
|
Fixed arithmetic overflow issue in MSSQL
|
2016-10-10 14:46:05 +05:30 |
|
hasuniea
|
05e95e2675
|
fix the EMM-1702
|
2016-10-07 15:48:43 +05:30 |
|
charitha
|
e89b4015b6
|
Introduced pagination
|
2016-10-06 11:51:54 +05:30 |
|
harshanl
|
ee97631eac
|
Updated MSSQL scripts to have IF-NOT-EXISTS statements
|
2016-10-03 12:16:01 +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 |
|
dilanua
|
fea2170f65
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-29 14:07:04 +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 |
|
dilanua
|
acae51d756
|
Fixing MSSQL dashboard create view script issues
|
2016-09-29 14:06:44 +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 |
|
Megala
|
82be4ef5a8
|
Fixing oracle script issues
|
2016-09-28 15:15:24 +05:30 |
|