Commit Graph

3856 Commits

Author SHA1 Message Date
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
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
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
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
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
Dileesha Rajapakse
2d050102af Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-18 14:29:43 +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
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
Dileesha Rajapakse
90099449d3 Fixing issue 1184 - Redirection not handled upon session expiration 2017-07-17 17:11:34 +05:30
Imesh Chandrasiri
4bfdec95f9 Temparory remove of device statistics 2017-07-17 15:12:29 +05:30
geethkokila
afe312152f Fixing https://github.com/wso2/product-iots/issues/1007 2017-07-17 14:43:06 +05:30
WSO2 Builder
94d270863e [WSO2 Release] [Jenkins #2466] [Release 3.0.38] prepare for next development iteration 2017-07-17 07:10:59 +00:00
WSO2 Builder
c29d83afeb [WSO2 Release] [Jenkins #2466] [Release 3.0.38] prepare release v3.0.38 2017-07-17 07:10:46 +00:00
Rasika Perera
c6cce05b11 Merge pull request #845 from rasika/cloud-fixes
Cloud fixes
2017-07-17 11:14:55 +05:30
WSO2 Builder
47ce6f4271 [WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare for next development iteration 2017-07-16 22:21:47 +05:30
WSO2 Builder
5dc7dc5442 [WSO2 Release] [Jenkins #2464] [Release 3.0.37] prepare release v3.0.37 2017-07-16 22:21:33 +05:30
WSO2 Builder
5acea60aef Merge commit '91456df809816dfecda50082aeafe1192ee09fc0' into 240ffbb1-c967-4109-b74d-1eb6335f277e 2017-07-16 22:02:13 +05:30
WSO2 Builder
91456df809 [WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare for next development iteration 2017-07-16 21:54:30 +05:30
WSO2 Builder
25598c12d4 [WSO2 Release] [Jenkins #2463] [Release 3.0.36] prepare release v3.0.36 2017-07-16 21:54:16 +05:30
Madhawa Perera
efde7df025 Merge pull request #851 from rasika/geo-fence-issues
Fixing geofence issues
2017-07-16 21:36:56 +05:30
Madhawa Perera
731d88d96e Merge pull request #850 from rasika/temp-fix-api-subscribe
Temporary fixing download issue with adding /admin/manage/api/subscribe permission
2017-07-16 21:36:30 +05:30