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 |
|
amalhub
|
428ce25b6f
|
Fixing issue: https://wso2.org/jira/browse/EMM-1646
|
2016-09-27 20:46:00 +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 |
|
harshanl
|
9b6973226c
|
EMM-1609 : Changed postgres and oracle db scripts to support boolean data
|
2016-09-23 11:29:58 +05:30 |
|
harshanl
|
5a6120d6fa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-22 20:31:14 +05:30 |
|
harshanl
|
a6ee98cb7f
|
Increased notification description column size
|
2016-09-22 20:31:09 +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 |
|
dilanua
|
87f4939ba5
|
Updating MSSQL script with dasboard analytics views
|
2016-09-21 15:05:45 +05:30 |
|
Chatura Dilan Perera
|
50d8885f8b
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-19 18:54:48 +05:30 |
|
Chatura Dilan Perera
|
a00d6aafd4
|
[maven-release-plugin] prepare release v1.2.1
|
2016-09-19 18:54:38 +05:30 |
|
Ace
|
6a8a5cbd5a
|
Merging with master
|
2016-09-19 12:21:41 +05:30 |
|
Ace
|
1dfb8e22e1
|
Updating to latest appm/apim/identity dependencies
|
2016-09-14 17:23:09 +05:30 |
|
Chatura Dilan Perera
|
de23a8cf27
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-09 20:18:25 +05:30 |
|
Chatura Dilan Perera
|
8905fae0d9
|
[maven-release-plugin] prepare release v1.2.0
|
2016-09-09 20:18:12 +05:30 |
|
Chatura Dilan Perera
|
2d5262e21e
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-09 17:10:19 +05:30 |
|
Chatura Dilan Perera
|
5ccd752404
|
[maven-release-plugin] prepare release v1.2.0
|
2016-09-09 17:10:04 +05:30 |
|
harshanl
|
7dc93ff010
|
MSSQL script fixes and added the /users/count REST API
|
2016-09-09 15:06:30 +05:30 |
|
harshanl
|
d60daae97f
|
MSSQL fixes to dbscrpits and DAO layer
|
2016-09-09 12:15:51 +05:30 |
|
harshanl
|
2e17dce0ae
|
Fixed DM_DEVICE column issue in MSSQL scrpt
|
2016-09-07 16:19:50 +05:30 |
|
harshanl
|
b7ffaf0b0f
|
Fixed issues in DAO implementations and MSSQL db script
|
2016-09-07 15:01:09 +05:30 |
|
harshanl
|
60a7796efb
|
Fixed issues in DB scripts
|
2016-09-06 18:53:04 +05:30 |
|
prabathabey
|
99ff4cbc10
|
Improving MSSQL SQL scripts of CDM-F and removing a redundant table declaration found in H2 SQL Script
|
2016-09-05 23:43:24 +05:30 |
|
mharindu
|
24930b3042
|
Partial commit of migration
|
2016-09-05 16:37:09 +05:30 |
|
Rasika Perera
|
8148b5b06c
|
Separating CDMF base app and uuf-template app
|
2016-09-01 16:28:05 +05:30 |
|
hasuniea
|
d1e058ce8e
|
fixing api-mgt upgrading issues
|
2016-08-26 17:40:30 +05:30 |
|
mharindu
|
d7e8cc30dd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7
|
2016-08-24 14:56:06 +05:30 |
|
harshanl
|
556c82b2e8
|
Fixed ORACLE DB script issue
|
2016-08-23 17:59:52 +05:30 |
|
Chatura Dilan Perera
|
8b17cbb339
|
Fix conflicts
|
2016-08-19 15:00:57 +05:30 |
|
Chatura Dilan Perera
|
654e1d9938
|
[maven-release-plugin] prepare for next development iteration
|
2016-08-18 22:09:42 +05:30 |
|
Chatura Dilan Perera
|
aa24821667
|
[maven-release-plugin] prepare release v1.1.2
|
2016-08-18 22:09:33 +05:30 |
|
charitha
|
d0cb80273b
|
Add indexing to mysql
|
2016-08-18 11:41:15 +05:30 |
|
harshanl
|
6bb924fa7b
|
Removed unnecessary mysql query from the mysl script
|
2016-08-12 13:53:32 +05:30 |
|
mharindu
|
f5609cc8ff
|
Adding carbon 4.4.7 migration changes
|
2016-08-11 12:19:05 +05:30 |
|
prabathabey
|
c161d7b659
|
Adding indexes to improve performance of entity retrieval and fixing a sytax error in the SQL query used to retrieve activities
|
2016-08-10 15:01:11 +05:30 |
|
harshanl
|
ffc9628ae1
|
Fixed merge issue
|
2016-08-10 13:14:13 +05:30 |
|
harshanl
|
e25aa26e1b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-08-10 12:07:49 +05:30 |
|
prabathabey
|
b28ed6803e
|
Adding Indexes upon tables that involve in expensive SQL operations
|
2016-08-10 11:26:07 +05:30 |
|
prabathabey
|
b4479e92ba
|
Adding Indexes upon tables that involve in expensive SQL operations
|
2016-08-10 11:25:08 +05:30 |
|
harshanl
|
08ff70bb3c
|
Refactored CertMgt component
|
2016-08-10 11:14:46 +05:30 |
|
madhawap
|
d2ad852db1
|
changes to certificate-mgt mysql dbscript, fix for the jira EMM-1487
|
2016-08-05 12:16:59 +05:30 |
|
harshanl
|
35ea88b9de
|
Fixed EMM-1476.
|
2016-08-04 20:39:31 +05:30 |
|
madhawap
|
32fb410da4
|
mysql db script related changes
|
2016-08-04 18:15:45 +05:30 |
|
harshanl
|
03835bdeb7
|
Fixed EMM-1449 issue
|
2016-08-02 17:40:20 +05:30 |
|
harshanl
|
6cc1bb088c
|
Fixed EMM-1447, EMM-1424
|
2016-08-01 20:29:21 +05:30 |
|
prabathabey
|
5adfab9f8a
|
Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API
|
2016-07-26 23:37:42 +05:30 |
|
prabathabey
|
ea032337d3
|
Changing Kernel version that carbon-device-mgt repository depends on and fixing the axiom version range
|
2016-07-26 11:30:28 +05:30 |
|
hasuniea
|
74658d1e85
|
adding certificate scripts
|
2016-07-22 11:42:55 +05:30 |
|
Chatura Dilan
|
4ec11e8c08
|
[maven-release-plugin] prepare for next development iteration
|
2016-07-08 19:11:40 +05:30 |
|
Chatura Dilan
|
ffedcac543
|
[maven-release-plugin] prepare release v1.1.1
|
2016-07-08 19:09:55 +05:30 |
|
prabathabey
|
9aa54f2ead
|
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
|
2016-07-07 13:10:19 +05:30 |
|
Chatura Dilan
|
2befefc967
|
Added OS build date
|
2016-07-01 15:45:59 +05:30 |
|
Chatura Dilan
|
24b462f4f4
|
Added is-active field to the Application
|
2016-06-29 17:41:45 +05:30 |
|
prabathabey
|
aeb4ad3295
|
Merging rest-api-improvements branch to master
|
2016-06-21 15:52:35 +05:30 |
|
ayyoob
|
ebebca8573
|
Added support for push notification for xmpp, mqtt and few changes to the after testing
|
2016-06-20 02:33:59 +05:30 |
|
ayyoob
|
52e84273d1
|
added profile check before publishing apis
|
2016-06-08 22:38:49 +05:30 |
|
prabathabey
|
8819c6e36b
|
Adding support for 'If-Modified-Since' header and 'since' query filter
|
2016-06-03 04:35:22 +05:30 |
|
hasuniea
|
57d445237a
|
add certificateMgtService
|
2016-05-31 12:48:26 +05:30 |
|
prabathabey
|
13db7c906f
|
changing the webapp name of cdmf admin APIs
|
2016-05-30 12:08:22 +05:30 |
|
prabathabey
|
6e5148a374
|
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
|
2016-05-30 08:21:59 +05:30 |
|
dilanua
|
f4f47cbfdd
|
Changing view names to fix oracle naming issues in dashboard analytics feature
|
2016-05-28 00:41:21 +05:30 |
|
Madhawa Perera
|
4b128a6ebd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-27 22:15:53 +05:30 |
|
Madhawa Perera
|
d805245ffc
|
added username field to the device certificate db and related changes
|
2016-05-27 22:15:21 +05:30 |
|
prabathabey
|
32cb32b706
|
modifying the name of the device management admin api war
|
2016-05-27 12:28:48 +05:30 |
|
prabathabey
|
30f6fc53b5
|
Merging the latest changes introduced in master
|
2016-05-27 11:44:58 +05:30 |
|
prabathabey
|
7e3865a233
|
Fixing admin webapp path in p2.inf
|
2016-05-27 10:55:47 +05:30 |
|
geethkokila
|
f29cacffff
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-26 18:23:40 +05:30 |
|
geethkokila
|
6365e5a8a9
|
Fixing activity the activity id
|
2016-05-26 18:23:29 +05:30 |
|
Dileesha Rajapakse
|
8821227de2
|
Fixed Oracle driver related syntax issues and table names
|
2016-05-26 17:15:35 +05:30 |
|
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
2016-05-20 16:43:16 +05:30 |
|
mharindu
|
9549ac446b
|
[maven-release-plugin] prepare release v1.1.0
|
2016-05-20 16:43:02 +05:30 |
|
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
2016-05-19 00:42:14 +05:30 |
|