Commit Graph

8504 Commits

Author SHA1 Message Date
chathurace
1d74d8ad09 Merge pull request #876 from chathurace/application-mgt
improvements to database transaction handling and implementing application deletion.
2017-08-01 13:52:27 +05:30
Chathura Ekanayake
6605c1372b improvements to database transaction handling and implementing application delete. 2017-08-01 13:34:33 +05:30
Pasindu
0774917785 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-01 08:52:39 +05:30
megala21
f16b03ffee Fixing minor issues in closing the database statements and resultsets 2017-07-31 17:37:35 +05:30
megala21
149719d64c Merge remote-tracking branch 'upstream/application-mgt' into appm_new 2017-07-31 15:34:39 +05:30
megala21
e79c9b4919 Fixing minor issues with database queries 2017-07-31 15:34:02 +05:30
WSO2 Builder
21f53fc7fe [WSO2 Release] [Jenkins #2507] [Release 3.0.53] prepare for next development iteration 2017-07-31 08:21:19 +00:00
WSO2 Builder
28d9c15b82 [WSO2 Release] [Jenkins #2507] [Release 3.0.53] prepare release v3.0.53 2017-07-31 08:21:02 +00:00
Chathura Ekanayake
73a0a119b1 Merge remote-tracking branch 'upstream/application-mgt' into appm 2017-07-31 13:45:44 +05:30
chathurace
b872ea2cf4 Merge pull request #871 from Megala21/application-mgt
Merging with master and adding some java-doc comments
2017-07-31 13:38:44 +05:30
Geeth
ce8220364e Merge pull request #873 from rasika/master
Fixing [Oracle12C] Errors on startup when started with -Dsetup
2017-07-31 12:32:31 +05:30
Madhawa Perera
3693d84b4f Merge pull request #875 from hasuniea/master
fixing connection-type issue
2017-07-31 12:05:38 +05:30
Hasunie
eb35c8e6d0 fixing connection-type issue 2017-07-31 11:51:21 +05:30
Madhawa Perera
55770caab1 Merge pull request #869 from DimalChandrasiri/master
Fixing [Policies] Policy deactivate option is not available
2017-07-31 11:39:59 +05:30
Madhawa Perera
28060d011d Merge pull request #874 from rasika/geo-fence-issues
Geo Fencing improvements
2017-07-31 11:39:20 +05:30
megala21
b1fc0fcfdb Fixing minor issues related with platform 2017-07-30 15:06:31 +05:30
Rasika Perera
176738b14b Geo Fencing improvements 2017-07-29 16:46:00 +05:30
Rasika Perera
ea20c534f4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-28 17:59:05 +05:30
Rasika Perera
9ef40e2b8d Fixing https://github.com/wso2/product-iots/issues/1250 2017-07-28 17:55:15 +05:30
megala21
55484be24b Added the datasourceService 2017-07-28 14:30:24 +05:30
Chathura Ekanayake
9a54c13765 Merging pull request #871 from Megala 2017-07-28 11:31:48 +05:30
Imesh Chandrasiri
4427348f69 fixes wso2/product-iot#1243 2017-07-27 18:06:28 +05:30
megala21
64cfee3822 Reverting the change 2017-07-27 16:54:32 +05:30
megala21
7b5b504f5f Reverting the cahnges to API name 2017-07-27 16:41:43 +05:30
megala21
9845855099 Changing the check style plugin 2017-07-27 16:26:57 +05:30
megala21
8f42786749 Resolving merge conflicts 2017-07-27 16:21:39 +05:30
Megala Uthayakumar
64e5a15db2 Merge pull request #870 from chathurace/appm
Implementing application operations for app management
2017-07-27 16:11:21 +05:30
Chathura Ekanayake
28f1ecfb5b Implementing application operations for app management 2017-07-27 15:52:12 +05:30
megala21
4140e212d7 Adding Maven Code style check 2017-07-27 15:31:07 +05:30
Imesh Chandrasiri
aa6d0da3fd fixes wso2/product-iot#1243 2017-07-27 14:23:14 +05:30
WSO2 Builder
5d603d3bbe [WSO2 Release] [Jenkins #2500] [Release 3.0.52] prepare for next development iteration 2017-07-26 23:53:03 +05:30
WSO2 Builder
941c09fb2d [WSO2 Release] [Jenkins #2500] [Release 3.0.52] prepare release v3.0.52 2017-07-26 23:52:50 +05:30
Madhawa Perera
dce0a3e302 Merge pull request #868 from lasanthaDLPDS/master
Fixing permission issue of creating new device type
2017-07-26 23:29:56 +05:30
lasantha
e6a7d26ac3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-26 20:31:40 +05:30
WSO2 Builder
58880d57bc [WSO2 Release] [Jenkins #2498] [Release 3.0.51] prepare for next development iteration 2017-07-26 20:01:33 +05:30
WSO2 Builder
384debd845 [WSO2 Release] [Jenkins #2498] [Release 3.0.51] prepare release v3.0.51 2017-07-26 20:01:20 +05:30
WSO2 Builder
c3de199818 [WSO2 Release] [Jenkins #2497] [Release 3.0.50] prepare for next development iteration 2017-07-26 19:21:53 +05:30
WSO2 Builder
4d215fa3e9 [WSO2 Release] [Jenkins #2497] [Release 3.0.50] prepare release v3.0.50 2017-07-26 19:21:36 +05:30
lasantha
960b3ebc78 Fixing permission issue of creating new device type 2017-07-26 19:14:07 +05:30
Madhawa Perera
831e214f01 Merge pull request #866 from chathurace/rc3
backend fix for the issue with getting next pending operation of cust…
2017-07-26 18:53:41 +05:30
Madhawa Perera
a49acaac11 Merge pull request #867 from DimalChandrasiri/master
Fixing device type log not showing issue
2017-07-26 18:53:02 +05:30
Imesh Chandrasiri
9ce1baa920 change CONFIG keyword to PROFILE 2017-07-26 17:31:45 +05:30
Imesh Chandrasiri
4fe1cd8ccb Fixing device type log not showing issue 2017-07-26 15:06:13 +05:30
Chathura Ekanayake
4092254b19 backend fix for the issue with getting next pending operation of custom devices. 2017-07-26 12:39:25 +05:30
Pasindu
0474d61211 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-26 11:01:08 +05:30
WSO2 Builder
9e10af8abf [WSO2 Release] [Jenkins #2494] [Release 3.0.49] prepare for next development iteration 2017-07-25 21:27:53 +05:30
WSO2 Builder
9e19ca3202 [WSO2 Release] [Jenkins #2494] [Release 3.0.49] prepare release v3.0.49 2017-07-25 21:27:40 +05:30
WSO2 Builder
6969161053 Merge commit '1436561d5dfc66bcf0bac12ee1cc4b12e071816c' into 926f77e3-1750-45d1-a162-eae4b503cf49 2017-07-25 21:08:19 +05:30
WSO2 Builder
1436561d5d [WSO2 Release] [Jenkins #2493] [Release 3.0.48] prepare for next development iteration 2017-07-25 21:00:11 +05:30
WSO2 Builder
67ec2233f7 [WSO2 Release] [Jenkins #2493] [Release 3.0.48] prepare release v3.0.48 2017-07-25 20:59:57 +05:30