Commit Graph

4826 Commits

Author SHA1 Message Date
megala21
eda5b5909c Adding platform removal 2017-08-01 14:11:37 +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
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
megala21
b1fc0fcfdb Fixing minor issues related with platform 2017-07-30 15:06:31 +05:30
megala21
55484be24b Added the datasourceService 2017-07-28 14:30:24 +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
megala21
f3bca0f88c Merging with master 2017-07-25 11:19:46 +05:30
WSO2 Builder
b7d28754c6 [WSO2 Release] [Jenkins #2483] [Release 3.0.45] prepare for next development iteration 2017-07-21 07:38:40 +05:30
WSO2 Builder
7e0a2aceb9 [WSO2 Release] [Jenkins #2483] [Release 3.0.45] prepare release v3.0.45 2017-07-21 07:38:26 +05:30
Madhawa Perera
69eb68afec Merge pull request #859 from geethkokila/master
Fixing the activity issue with large data set
2017-07-21 01:57:09 +05:30
WSO2 Builder
d2900dd395 [WSO2 Release] [Jenkins #2481] [Release 3.0.44] prepare for next development iteration 2017-07-20 23:40:42 +05:30
WSO2 Builder
ef8f4acc8c [WSO2 Release] [Jenkins #2481] [Release 3.0.44] prepare release v3.0.44 2017-07-20 23:40:29 +05:30
Kamidu Sachith Punchihewa
d7487ea395 Merge pull request #860 from dilee/master
Fixing wso2/product-iots#1150
2017-07-20 23:20:30 +05:30
Dileesha Rajapakse
fc5e84796f Fixing Device Status search filter 2017-07-20 23:15:32 +05:30
Dileesha Rajapakse
d8ffa23a42 Fixing Device Type search filter 2017-07-20 22:11:15 +05:30
geethkokila
fe371ae693 Fixing the activity issue with large data set 2017-07-20 20:26:59 +05:30
WSO2 Builder
c7c9432768 [WSO2 Release] [Jenkins #2479] [Release 3.0.43] prepare for next development iteration 2017-07-20 19:36:16 +05:30
WSO2 Builder
75be6d2884 [WSO2 Release] [Jenkins #2479] [Release 3.0.43] prepare release v3.0.43 2017-07-20 19:36:00 +05:30
WSO2 Builder
993c1d7d2c [WSO2 Release] [Jenkins #2478] [Release 3.0.42] prepare for next development iteration 2017-07-20 18:55:48 +05:30
WSO2 Builder
e958d0b2a9 [WSO2 Release] [Jenkins #2478] [Release 3.0.42] prepare release v3.0.42 2017-07-20 18:55:30 +05:30
Madhawa Perera
8934dc2055 Merge pull request #857 from rasika/geo-fence-issues
Avoid calling geo service when geoFencing disabled
2017-07-20 18:28:08 +05:30
Madhawa Perera
0297025866 Merge pull request #858 from rasika/master
Geofencing refactoring
2017-07-20 18:27:38 +05:30
Rasika Perera
575d06f513 Geofencing refactoring 2017-07-20 17:26:44 +05:30
Chatura Dilan
5811eb6a9e removed externsions from api 2017-07-20 11:11:50 +05:30
Rasika Perera
ba0a869cdd Avoid calling geo service when geoFencing disabled 2017-07-19 20:46:47 +05:30
WSO2 Builder
09607fc4c2 [WSO2 Release] [Jenkins #2475] [Release 3.0.41] prepare for next development iteration 2017-07-19 19:11:43 +05:30
WSO2 Builder
791a85e79b [WSO2 Release] [Jenkins #2475] [Release 3.0.41] prepare release v3.0.41 2017-07-19 19:11:30 +05:30
sameeragunarathne
261c5dcae4 Merge pull request #856 from Kamidu/master
registry version bump
2017-07-19 18:49:36 +05:30
kamidu
999ca58f7e registry version bump 2017-07-19 18:37:48 +05:30
WSO2 Builder
5b968f4fe5 [WSO2 Release] [Jenkins #2473] [Release 3.0.40] prepare for next development iteration 2017-07-19 07:24:26 +00:00
WSO2 Builder
122678f3d4 [WSO2 Release] [Jenkins #2473] [Release 3.0.40] prepare release v3.0.40 2017-07-19 07:24:14 +00:00
Madhawa Perera
47a6491557 Merge pull request #854 from dilee/master
Fixing issue wso2/product-iot 1184 - Redirection not handled upon session expiration
2017-07-19 12:01:40 +05:30
Dileesha Rajapakse
2d050102af Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-18 14:29:43 +05:30
Kamidu Sachith Punchihewa
6bab255b88 Merge pull request #855 from hasuniea/master
fixing updateEnrollment status issue
2017-07-18 14:05:03 +05:30
Hasunie
ac3e110583 fixing updateEnrollment status issue 2017-07-18 13:45:03 +05:30
Dileesha Rajapakse
18ccb8ec03 Refactored device.js 2017-07-18 10:28:35 +05:30
WSO2 Builder
8fd9960913 [WSO2 Release] [Jenkins #2468] [Release 3.0.39] prepare for next development iteration 2017-07-18 04:19:56 +00:00
WSO2 Builder
92aa96ee18 [WSO2 Release] [Jenkins #2468] [Release 3.0.39] prepare release v3.0.39 2017-07-18 04:19:43 +00:00
Dileesha Rajapakse
6cff453b24 Fixing redirection upon user session expiration issues 2017-07-18 09:46:04 +05:30
Dileesha Rajapakse
eadb7ea02a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-18 09:42:12 +05:30
Geeth
cc3706fc4a Merge pull request #659 from sameeragunarathne/master
fixing wso2/product-iots#1136
2017-07-18 07:12:38 +05:30
sameera910409
9db742e95a fixing https://github.com/wso2/product-iots/issues/1136 : DeviceDetailsRetrieverTask attempts to add operations to a device that has been removed 2017-07-18 00:17:26 +05:30