Commit Graph

1617 Commits

Author SHA1 Message Date
Entgra Builder
5347dd9211 [maven-release-plugin] prepare release v4.1.7 2020-05-22 13:35:39 +00:00
Charitha Goonetilleke
c4f4961a70 Merge branch 'policy-bean' into 'master'
Add Upload bean

See merge request entgra/carbon-device-mgt!548
2020-05-22 12:51:35 +00:00
Yohan Avishke
602bcbb2cf Add new variable to store an apllication's events 2020-05-22 08:01:39 +05:30
shamalka
31d9969e3f Add Upload bean 2020-05-21 13:28:36 +05:30
charitha
573a9e598c Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-05-18 09:23:03 +05:30
Inosh Perara
df0c26f2f7 Bluetooth beacon 2020-05-17 08:39:17 +00:00
tcdlpds@gmail.com
660935e0d6 Improve bean structure in policy UI config 2020-05-14 23:39:21 +05:30
charitha
311ddc307e Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-05-14 14:44:00 +05:30
charitha
a1a313608f Remove attempt count incrementing logic to optimize performance 2020-05-13 23:39:40 +05:30
shamalka
240f157565 Improve comments 2020-05-11 13:48:13 +05:30
shamalka
756d73d2cf Add optional platform configs 2020-05-11 13:35:53 +05:30
shamalka
dcb1602752 Add license 2020-05-11 13:35:53 +05:30
shamalka
539e814e2d Change getEnrollmentQRCode method return type 2020-05-11 13:35:53 +05:30
Charitha Goonetilleke
be705ce81b Performance improvements 2020-05-06 06:19:45 +00:00
Saad Sahibjan
33c495ad35 Add license header to DeviceFilter bean 2020-05-05 11:10:55 +05:30
Saad Sahibjan
a356ec797c Add API to retrieve device filters 2020-05-04 17:54:23 +05:30
Shamalka Navod
92ad59a119 Update operation status API 2020-05-03 17:38:26 +00:00
Charitha Goonetilleke
a3a434055b Fix tenant details retrieving and permission assigning for reporting 2020-05-03 14:28:15 +00:00
tcdlpds@gmail.com
d2a4fe70b8 Remove policy-ui config retrieving API from android.xml 2020-05-01 22:40:12 +05:30
Kaveesha Mihirangi
c836083bf6 Update policy UI bean classes to get table element in policy-UI 2020-04-29 04:20:30 +00:00
Saad Sahibjan
20221ba2b7 Add serialVersionUID enrollment configuration bean 2020-04-28 13:57:25 +05:30
Saad Sahibjan
226347a1bd Add enrollment configuration bean 2020-04-28 12:20:34 +05:30
Kaveesha
a6c1a86f97 Add New Classes to get RadioGroup and NotificationList 2020-04-20 14:46:42 +05:30
Vinojini Paramasivam
c0839d978f Add device ungrouped report generating feature 2020-04-14 16:54:53 +00:00
tcdlpds@gmail.com
6e0f386664 Improve policy ui config structure 2020-04-10 00:51:51 +05:30
tcdlpds@gmail.com
caacb1c900 Improve policy UI config bean structure 2020-04-07 23:34:17 +05:30
tcdlpds@gmail.com
dc4bebde4e Add policy ui config beans 2020-04-06 11:14:02 +05:30
tcdlpds@gmail.com
3d0bbf0b1c Add an open endpoint to get UI config
This API endpoint will be used to get app tags, scopes etc. These data will be used in proxy level when it creates access token.
2020-03-31 21:02:29 +05:30
Charitha Goonetilleke
5dc235d8d6 Performance improvements 2020-03-30 09:56:10 +00:00
inoshperera
199b61ab94 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into reporting2 2020-03-29 12:24:51 +05:30
Inosh Perara
453b6b8596 Merge branch 'reporting' into 'reporting'
Reporting

See merge request entgra/carbon-device-mgt!470
2020-03-18 09:17:26 +00:00
Jayasanka Weerasinghe
aa6bb02127 Move device location history algorithm to the backend 2020-03-18 14:10:09 +05:30
inoshperera
3c81f35838 Add get tenant API 2020-03-10 22:06:08 +05:30
inoshperera
5c7a17c3f5 fix merge conflicts 2020-03-10 14:53:49 +05:30
Yohan Avishke
2fab3029ff Add equation explaining text to the comments and fix fomratting issues
Text will explain equation step by step by using.
Added missing comments, formatted code lines, formatted license
and added more comments.
2020-03-04 14:35:34 +05:30
Saad Sahibjan
a2fad630c7 Add hourly and daily usage to application bean 2020-03-04 13:31:39 +05:30
Yohan Avishke
e8a260dbc4 Change API to filter devices using a given OS version
When syncing devices a value will be generated for each device version.
At the API call same method is used to generate a value for the passed
OS version then thedevices are filtered using those 2 values.

This will still create a similar value but now will use
mathematical operations(pow operations) to generate
2020-03-04 07:00:23 +05:30
inoshperera
83bc51b9df resolve conflics 2020-03-03 21:42:19 +05:30
inoshperera
cecdda4dbf Add group and roles 2020-03-03 21:18:09 +05:30
Dharmakeerthi Lasantha
c06c64e290 Merge branch 'feature/dmgt-react/report/encryption' into 'master'
Create API and a report to filter devices by encryption status

Closes product-iots#321

See merge request entgra/carbon-device-mgt!437
2020-03-03 02:57:42 +00:00
charitha
82370f0570 Performance improvements 2020-02-28 14:15:29 +05:30
Jayasanka Weerasinghe
694109b50f Create API and the report to filter devices by encryption status 2020-02-20 14:13:36 +05:30
Dharmakeerthi Lasantha
38c0e0b544 Merge branch 'reporting' into 'master'
Reporting

See merge request entgra/carbon-device-mgt!445
2020-02-18 04:42:15 +00:00
Inosh Perara
f5aeaf3c3e Update EventPublishingException.java 2020-02-18 04:21:59 +00:00
Shamalka Navod
e4105783a6 Create a report to get application not installed devices 2020-02-14 15:42:54 +00:00
inoshperera
cf6714c7cf reporting related device info 2020-02-11 15:35:15 +05:30
Saad Sahibjan
49d26706b0 Merge branch 'application-mgt-new' into 'master'
Improve DeviceTypeCommonService Interface

See merge request entgra/carbon-device-mgt!434
2020-02-03 15:43:08 +00:00
Yohan Avishke
cd26ba22b4 Create api to generate report to filter devices with outdated OS versions 2020-02-03 12:40:12 +00:00
tcdlpds@gmail.com
f3a6d19649 Improve DeviceTypeCommonService Interface 2020-02-03 12:33:24 +05:30
Kaveesha Mihirangi
ad8eb23aff Generate Policy configuration UI from JSON 2020-01-31 11:36:00 +00:00
Pahansith Gunathilake
7381ece847 Introduce device type filtering and limit results in device types retrieve endpoint 2020-01-29 20:46:44 +00:00
Yohan Avishke
16681acf55 Change status query param to a array to accept multiple values
Status param was changed from string to an array. excludeStatus param was removed from api and api calls. New methods were added to the DAO to query data filtered from list of status
2020-01-29 12:22:35 +00:00
Shamalka Navod
39e3e7fa1d Implement reports for device enrollment and policy compliance 2020-01-27 16:56:47 +00:00
Yohan Avishke
af47d5f73a Change device type create api, to enable device type sharing with all tenants
To make use of this change pass isSharedWithAllTenants as true to the api by attaching to device type meta data by admin user
2020-01-22 05:16:42 +00:00
Shamalka Navod
40bf2ca1e9 UI for device enrollment reports 2020-01-08 10:30:53 +00:00
Entgra Builder
0e96e3fafd [maven-release-plugin] prepare for next development iteration 2019-12-16 09:57:26 +00:00
Entgra Builder
80f9d3546b [maven-release-plugin] prepare release v4.1.6 2019-12-16 09:57:19 +00:00
Entgra Builder
cd94992d6f [maven-release-plugin] prepare for next development iteration 2019-12-10 13:48:39 +00:00
Entgra Builder
cd7ca88a1e [maven-release-plugin] prepare release v4.1.6 2019-12-10 13:48:32 +00:00
lasanthaDLPDS
1c24707b9f Add PostgreSQL support for the App Manager 2019-12-10 09:35:59 +05:30
lasanthaDLPDS
0a8f6cd311 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-12-09 23:19:03 +05:30
Entgra Builder
270e16fc3a [maven-release-plugin] prepare for next development iteration 2019-12-04 07:51:03 +00:00
Entgra Builder
f0384d9775 [maven-release-plugin] prepare release v4.1.5 2019-12-04 07:50:55 +00:00
lasanthaDLPDS
152a97c820 Add Device type common service interface 2019-11-27 20:06:30 +05:30
Saad Sahibjan
7437545b0d Fix web clip uninstallation issues in ios 2019-11-06 19:31:48 +05:30
Entgra Builder
bea11b7d81 [maven-release-plugin]prepare for next development iteration 2019-11-06 11:02:35 +00:00
Entgra Builder
2aa50223e0 [maven-release-plugin]prepare release v4.1.4 2019-11-06 11:02:28 +00:00
Entgra Builder
252a3f2edc [maven-release-plugin]prepare for next development iteration 2019-11-06 07:20:39 +00:00
Entgra Builder
74c6eb6be7 [maven-release-plugin]prepare release v4.1.4 2019-11-06 07:20:32 +00:00
Entgra Builder
555ea6a808 [maven-release-plugin]prepare for next development iteration 2019-11-05 14:15:27 +00:00
Entgra Builder
347180a321 [maven-release-plugin]prepare release v4.1.3 2019-11-05 14:15:20 +00:00
Saad Sahibjan
d2f8b6e160 Fix web clips installation not working for iOS 2019-11-05 11:12:35 +05:30
Entgra Builder
8d8c3cce16 [maven-release-plugin]prepare for next development iteration 2019-11-02 07:16:43 +00:00
Entgra Builder
f596f3ef81 [maven-release-plugin]prepare release v4.1.2 2019-11-02 07:16:36 +00:00
Entgra Builder
244a60fe3e [maven-release-plugin] prepare for next development iteration 2019-10-31 09:45:11 +00:00
Entgra Builder
6f06f9f318 [maven-release-plugin] prepare release v4.1.1 2019-10-31 09:45:02 +00:00
Entgra Builder
42a6d298aa [maven-release-plugin]prepare for next development iteration 2019-10-28 16:10:32 +00:00
Entgra Builder
a5bdedcfa2 [maven-release-plugin]prepare release v4.1.0 2019-10-28 16:10:22 +00:00
Entgra Builder
bb7a2656cb [maven-release-plugin]prepare for next development iteration 2019-10-28 14:44:30 +00:00
Entgra Builder
c85e2b64a8 [maven-release-plugin]prepare release v4.0.9 2019-10-28 14:44:23 +00:00
Entgra Builder
05babca6ba [maven-release-plugin]prepare for next development iteration 2019-10-28 10:19:49 +00:00
Entgra Builder
9f2f4a44d7 [maven-release-plugin]prepare release v4.0.1 2019-10-28 10:19:42 +00:00
Entgra Builder
674c61a1fb [maven-release-plugin]prepare for next development iteration 2019-10-27 20:07:56 +00:00
Entgra Builder
c3b3f2e9d1 [maven-release-plugin]prepare release v4.0.0 2019-10-27 20:07:49 +00:00
shamalka
7dc9fbb04b Fix error on retrieving location 2019-10-23 15:02:32 +05:30
Charitha Goonetilleke
e58ca40323 Merge branch 'application-mgt-new' into 'application-mgt-new'
Adding status column to GROUP table and honuring same in API

See merge request entgra/carbon-device-mgt!341
2019-10-22 14:39:55 +00:00
Inosh Perara
0539971f40 Merge branch 'corrective-policy' into 'application-mgt-new'
Corrective Policy

See merge request entgra/carbon-device-mgt!328
2019-10-19 17:12:29 +00:00
Ace
548ad336bf Adding status column to GROUP table and honuring same in API 2019-10-18 18:18:40 +05:30
lasanthaDLPDS
b5a1433709 Improve SQL queries in APPM 2019-10-18 17:17:38 +05:30
Saad Sahibjan
4e06e95039 Add correctiveAction to policy bean class 2019-10-18 15:04:08 +05:30
Saad Sahibjan
4e61f771e7 Add corrective action bean class 2019-10-18 15:04:08 +05:30
lasanthaDLPDS
afb487dedc Improve APPM subscribing functionality 2019-10-17 11:24:58 +05:30
lasanthaDLPDS
0b238b9c45 Merge with upstream master 2019-10-15 12:51:54 +05:30
Entgra Builder
9502ff52e6 [maven-release-plugin]prepare for next development iteration 2019-10-14 15:53:20 +00:00
Entgra Builder
35b76c1c1b [maven-release-plugin]prepare release v3.2.14 2019-10-14 15:53:13 +00:00
Entgra Builder
2fa223410c [maven-release-plugin]prepare for next development iteration 2019-10-14 12:36:11 +00:00
Entgra Builder
d8248301de [maven-release-plugin]prepare release v3.2.13 2019-10-14 12:36:01 +00:00
Entgra Builder
277b114f9c [maven-release-plugin] prepare for next development iteration 2019-10-09 10:41:21 +00:00
Entgra Builder
cd6ff02aff [maven-release-plugin] prepare release v3.2.12 2019-10-09 10:41:15 +00:00
Entgra Builder
c1612446e4 [maven-release-plugin] prepare for next development iteration 2019-10-05 12:04:29 +00:00
Entgra Builder
3cecc16145 [maven-release-plugin] prepare release v3.2.11 2019-10-05 12:04:23 +00:00
Entgra Builder
36a91e0e62 [maven-release-plugin]prepare for next development iteration 2019-10-05 06:47:25 +00:00
Entgra Builder
d1cfd12185 [maven-release-plugin]prepare release v3.2.10 2019-10-05 06:47:19 +00:00
Entgra Builder
15b4b6ff37 [maven-release-plugin]prepare for next development iteration 2019-10-04 17:41:23 +00:00
Entgra Builder
bd6ca17381 [maven-release-plugin]prepare release v3.2.9 2019-10-04 17:41:17 +00:00
lasanthaDLPDS
f6098a75af Sync with upstream master 2019-10-04 15:39:02 +05:30
Pahansith Gunathilake
db8645e6c5 Add policy type 2019-10-03 17:26:31 +00:00
achala piyarathna
5b50cddea6 Device Location history view feature 2019-10-03 15:51:41 +00:00
Saad Sahibjan
d683d0c93f Merge branch 'master' into 'master'
Fix incorrect device view issue for different ownerships.

Closes product-iots#135

See merge request entgra/carbon-device-mgt!273
2019-10-03 10:09:06 +00:00
lasanthaDLPDS
2d58d69d2f Fix incorrect device view issue for different ownerships. 2019-10-03 15:38:07 +05:30
Shamalka Navod
c5793bcf67 API endpoint to get all devices which are enrolled between two dates 2019-09-26 06:23:56 +00:00
charitha
738c4991b9 Merge with upstream/master 2019-09-20 13:55:26 +05:30
Amanda Randombage
ff2c038688 Modify permanent delete API to support list of devices 2019-09-19 18:08:56 +00:00
charitha
2c7463a072 Add device transferring across tenants 2019-09-17 20:03:23 +05:30
lasanthaDLPDS
cfd0f709ef Add new application type
Add new application type for IoT use cases. Further, it is named as CUSTOM
2019-09-15 18:48:09 +05:30
lasanthaDLPDS
a41b5313a0 Fix merge conflicts 2019-09-10 19:11:37 +05:30
Ace
91746c4d04 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-08-30 12:44:42 +05:30
Ace
5f3c069694 introducing a group properties table & ability to add/remove group properties 2019-08-30 12:42:09 +05:30
Pahansith
3ae5339eff Add device identifier for configuration retrieval endpoint 2019-08-29 10:51:49 +05:30
Pahansith
a3f44b43b4 Add configuration retrieve endpoint 2019-08-27 12:44:40 +05:30
lasanthaDLPDS
f24cc4342f Merge with master branch 2019-07-17 17:46:33 +05:30
Entgra Builder
3c4ef275f1 [maven-release-plugin] prepare for next development iteration 2019-07-05 09:25:27 +00:00
Entgra Builder
03703b83eb [maven-release-plugin] prepare release v3.2.8 2019-07-05 09:25:15 +00:00
Entgra Builder
fc7cf05e90 [maven-release-plugin] prepare for next development iteration 2019-07-04 07:27:48 +00:00
Entgra Builder
93c53c8748 [maven-release-plugin] prepare release v3.2.7 2019-07-04 07:27:42 +00:00
Ruwan Yatawara
cd4373b352 Merge branch 'master' into 'master'
Adding new API to search devices based on device properties

See merge request entgra/carbon-device-mgt!162
2019-07-04 04:06:52 +00:00
Ace
192984e3c0 Adding new API to search devices based on device properties 2019-06-27 17:03:00 +05:30
Saad Sahibjan
58a31d0031 Plugin level support for deleting device permanently 2019-06-25 19:15:24 +00:00
lasanthaDLPDS
7f0be5f28b Merge with upstream master 2019-06-17 20:13:12 +05:30
Inosh Perara
13960f77c9 add device type versioning APIs 2019-06-17 08:09:00 +00:00
Saad Sahibjan
29b2c41c73 Add iOS enterprise app install 2019-06-12 16:28:04 +05:30
Saad Sahibjan
76b34b3229 Add gson dependency to commons 2019-06-06 22:12:21 +05:30
Entgra Builder
5a6789e336 [maven-release-plugin] prepare for next development iteration 2019-06-03 15:43:13 +00:00
Entgra Builder
c71b1f9314 [maven-release-plugin] prepare release v3.2.6 2019-06-03 15:43:05 +00:00
Saad Sahibjan
b68cc62bc7 Handle StartupOperationConfig which runs only once after the server is started 2019-06-03 12:13:21 +05:30
Entgra Builder
2d05e04a16 [maven-release-plugin] prepare for next development iteration 2019-05-31 14:13:46 +00:00
Entgra Builder
84df5dd4bf [maven-release-plugin] prepare release v3.2.5 2019-05-31 14:13:39 +00:00
Dharmakeerthi Lasantha
52c7a7ecdd Improve app subscription functionality
Further integrate app management component with device mgt
2019-05-31 07:42:25 +00:00
Madawa Soysa
a285898782 Modify the Feature Specification Structure and Modify {deviceType}/features API
Related to entgra/product-iots#37
2019-05-30 06:31:11 +00:00
lasanthaDLPDS
06e9591e36 Fix device-mgt operation log displaying issue 2019-05-24 06:06:36 +05:30
lasanthaDLPDS
efa17d2e51 Merge with upstream master 2019-05-23 14:06:29 +05:30
Charitha Goonetilleke
0c471fbb0b Add capability to store device type specific platform configurations for any device type 2019-04-25 08:47:20 +00:00
lasanthaDLPDS
84e3beb6f6 Fix merge conflicts 2019-04-24 23:09:16 +05:30
Entgra Builder
54b0a0afd0 [maven-release-plugin] prepare for next development iteration 2019-04-23 10:42:17 +00:00
Entgra Builder
6dd8ca9484 [maven-release-plugin] prepare release v3.2.4 2019-04-23 10:42:10 +00:00
Entgra Builder
14337bb884 [maven-release-plugin] prepare for next development iteration 2019-04-18 13:58:18 +00:00
Entgra Builder
736ce76df6 [maven-release-plugin] prepare release v3.2.3 2019-04-18 13:58:11 +00:00
lasanthaDLPDS
12d46550e6 Fix requested changes in the review 2019-04-17 15:40:22 +05:30
lasanthaDLPDS
cc989148d6 Add an API to update the device owner for given device identifiers.
Further, add an API to get device activities without passing the username. Username is retrieved from the carbon context.
2019-04-16 20:11:02 +05:30
Entgra Builder
65eb70139b [maven-release-plugin] prepare for next development iteration 2019-04-10 19:04:25 +00:00
Entgra Builder
6bbbbdc18b [maven-release-plugin] prepare release v3.2.2 2019-04-10 19:04:19 +00:00
lasanthaDLPDS
98d14b0815 Fix merge conflicts 2019-03-13 12:09:29 +05:30
lasanthaDLPDS
7975563530 Improve the payload of enrollment notification 2019-01-24 17:41:53 +05:30
lasanthaDLPDS
b90766b5a4 Add enrollment notification sending feature 2019-01-18 08:04:40 +05:30
lasanthaDLPDS
8841741567 Fiz merge conflicts 2018-11-18 08:05:35 +05:30
Entgra Builder
cbe85378d8 [maven-release-plugin] prepare for next development iteration 2018-11-11 13:25:02 +00:00
Entgra Builder
4b1f83b168 [maven-release-plugin] prepare release v3.2.1 2018-11-11 13:24:57 +00:00
Milan Perera
a01886cb37 Handle NotNow response from device 2018-10-16 21:12:05 +05:30
lasanthaDLPDS
7388bcadce Merge master branch 2018-10-01 01:27:45 +05:30
Ubuntu
e5cc5284e3 [maven-release-plugin] prepare for next development iteration 2018-09-28 17:13:33 +00:00
Ubuntu
ae078fe390 [maven-release-plugin] prepare release v3.2.0 2018-09-28 17:12:41 +00:00
WSO2 Builder
353d6936db [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare for next development iteration 2018-09-19 15:36:32 +00:00
WSO2 Builder
8e2541b9ac [WSO2 Release] [Jenkins #3032] [Release 3.1.40] prepare release v3.1.40 2018-09-19 15:36:20 +00:00
lasanthaDLPDS
f9ec82e4dc Merge with upstream 2018-09-15 12:50:18 +05:30
charitha
b46e45dae4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-09-13 15:29:30 +05:30
charitha
7ea609612c Revert "This is the fix for the intermittent issues when applying policies on devices"
This reverts commit ba8537e
2018-09-12 13:29:23 +05:30
WSO2 Builder
01991dcc4d [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare for next development iteration 2018-09-12 07:55:38 +00:00
WSO2 Builder
18b81223df [WSO2 Release] [Jenkins #3030] [Release 3.1.39] prepare release v3.1.39 2018-09-12 07:55:26 +00:00
WSO2 Builder
cbbd327a02 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare for next development iteration 2018-09-11 06:43:08 +00:00
WSO2 Builder
de07597d53 [WSO2 Release] [Jenkins #3028] [Release 3.1.38] prepare release v3.1.38 2018-09-11 06:42:55 +00:00
aselarbd
ba8537e198 This is the fix for the intermittent issues when applying policies on devices
Please find the GitHub issue from [1]

[1]: https://github.com/wso2/product-iots/issues/1833
2018-09-10 11:56:59 +05:30
WSO2 Builder
3401a8c845 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare for next development iteration 2018-08-30 14:38:47 +00:00
WSO2 Builder
ecadadef94 [WSO2 Release] [Jenkins #3026] [Release 3.1.37] prepare release v3.1.37 2018-08-30 14:38:36 +00:00
geethkokila
2f428c8a58 Fix https://github.com/wso2/product-iots/issues/1857
Filtering the activities based on the user who added the operation
2018-08-30 18:01:12 +05:30
WSO2 Builder
2b6de6834b [maven-release-plugin] prepare for next development iteration 2018-08-30 09:30:45 +00:00
WSO2 Builder
16c6a27f81 [maven-release-plugin] prepare release v3.1.36 2018-08-30 09:30:34 +00:00
WSO2 Builder
252b260237 [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare for next development iteration 2018-08-22 10:22:19 +00:00
WSO2 Builder
a2422cb02a [WSO2 Release] [Jenkins #3021] [Release 3.1.35] prepare release v3.1.35 2018-08-22 10:22:09 +00:00
WSO2 Builder
af7aa73886 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare for next development iteration 2018-08-20 15:59:37 +00:00
WSO2 Builder
47ed74c156 [WSO2 Release] [Jenkins #3019] [Release 3.1.34] prepare release v3.1.34 2018-08-20 15:59:26 +00:00
lasanthaDLPDS
d293b5b1b8 Fix merge conflixts 2018-08-19 15:06:25 +05:30
WSO2 Builder
4848e271af [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare for next development iteration 2018-08-13 10:09:29 +00:00
WSO2 Builder
c79baf3392 [WSO2 Release] [Jenkins #3017] [Release 3.1.33] prepare release v3.1.33 2018-08-13 10:09:18 +00:00
geethkokila
7d34928ac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-08-13 14:56:13 +05:30
geethkokila
1d427aef73 Fix https://github.com/wso2/product-iots/issues/1852 2018-08-13 14:55:00 +05:30
WSO2 Builder
02282967ab [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare for next development iteration 2018-08-13 04:48:34 +00:00
WSO2 Builder
7daeb6efb9 [WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare release v3.1.32 2018-08-13 04:48:24 +00:00
charitha
47f619a136 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1 2018-08-11 08:29:45 +05:30
charitha
2a995deeb4 Prevent duplicate alerts & added owner field 2018-08-03 22:31:24 +05:30
charitha
ead01f837d Fixed issue in Geo fencing 2018-07-26 12:23:47 +05:30
WSO2 Builder
8da1bcb741 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare for next development iteration 2018-07-26 06:48:42 +00:00
WSO2 Builder
9c0cbdc983 [WSO2 Release] [Jenkins #3011] [Release 3.1.31] prepare release v3.1.31 2018-07-26 06:48:31 +00:00
WSO2 Builder
0aec365dce [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare for next development iteration 2018-05-15 08:24:46 +00:00
WSO2 Builder
ca890ac346 [WSO2 Release] [Jenkins #3009] [Release 3.1.30] prepare release v3.1.30 2018-05-15 08:24:36 +00:00
WSO2 Builder
2e5db59398 [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare for next development iteration 2018-04-18 10:06:19 +00:00
WSO2 Builder
964d92eb7f [WSO2 Release] [Jenkins #3007] [Release 3.1.29] prepare release v3.1.29 2018-04-18 10:06:04 +00:00
WSO2 Builder
79d48bb1a8 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare for next development iteration 2018-03-28 08:36:21 +00:00
WSO2 Builder
f05750b794 [WSO2 Release] [Jenkins #3005] [Release 3.1.28] prepare release v3.1.28 2018-03-28 08:36:10 +00:00
WSO2 Builder
2fcb647957 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare for next development iteration 2018-03-28 05:13:35 +00:00
WSO2 Builder
2f519baf67 [WSO2 Release] [Jenkins #3003] [Release 3.1.27] prepare release v3.1.27 2018-03-28 05:13:25 +00:00
WSO2 Builder
7431cde12a [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare for next development iteration 2018-03-23 05:51:48 +00:00
WSO2 Builder
aa429e230c [WSO2 Release] [Jenkins #3001] [Release 3.1.26] prepare release v3.1.26 2018-03-23 05:51:38 +00:00
WSO2 Builder
7620d7ea5d [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare for next development iteration 2018-03-20 06:51:22 +00:00
WSO2 Builder
5fd8aeef89 [WSO2 Release] [Jenkins #2999] [Release 3.1.25] prepare release v3.1.25 2018-03-20 06:51:13 +00:00
WSO2 Builder
3201dfcfa9 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare for next development iteration 2018-03-20 02:16:46 +00:00
WSO2 Builder
86000e93b2 [WSO2 Release] [Jenkins #2996] [Release 3.1.24] prepare release v3.1.24 2018-03-20 02:16:36 +00:00
Rasika Perera
272d64b0b2 Fix PaginationRequest.getProperty() method doesn't return anything 2018-03-20 07:31:11 +05:30
WSO2 Builder
ac7e71282e [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare for next development iteration 2018-03-16 12:27:13 +00:00
WSO2 Builder
1c135b9e18 [WSO2 Release] [Jenkins #2994] [Release 3.1.23] prepare release v3.1.23 2018-03-16 12:26:59 +00:00
WSO2 Builder
7dd3f29ff7 [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare for next development iteration 2018-03-16 11:15:13 +00:00
WSO2 Builder
03dd153f6f [WSO2 Release] [Jenkins #2992] [Release 3.1.22] prepare release v3.1.22 2018-03-16 11:14:57 +00:00
WSO2 Builder
db8a5afdf8 [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare for next development iteration 2018-03-16 10:36:01 +00:00
WSO2 Builder
bb0c498b3a [WSO2 Release] [Jenkins #2990] [Release 3.1.21] prepare release v3.1.21 2018-03-16 10:35:50 +00:00
WSO2 Builder
10cf201da7 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare for next development iteration 2018-03-16 08:50:22 +00:00
WSO2 Builder
2c73d73860 [WSO2 Release] [Jenkins #2988] [Release 3.1.20] prepare release v3.1.20 2018-03-16 08:50:11 +00:00
WSO2 Builder
790641a2aa [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare for next development iteration 2018-03-16 08:23:46 +00:00
WSO2 Builder
efb54864c6 [WSO2 Release] [Jenkins #2987] [Release 3.1.19] prepare release v3.1.19 2018-03-16 08:23:35 +00:00
WSO2 Builder
7fe945f1bf [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare for next development iteration 2018-03-15 22:28:55 +00:00
WSO2 Builder
555a349fd6 [WSO2 Release] [Jenkins #2985] [Release 3.1.18] prepare release v3.1.18 2018-03-15 22:28:45 +00:00
WSO2 Builder
f7f13f2052 [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare for next development iteration 2018-03-15 17:52:55 +00:00
WSO2 Builder
d44ac973cb [WSO2 Release] [Jenkins #2983] [Release 3.1.17] prepare release v3.1.17 2018-03-15 17:52:45 +00:00
WSO2 Builder
a51a3cd6a4 [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare for next development iteration 2018-03-15 16:58:58 +00:00
WSO2 Builder
f416cecb9e [WSO2 Release] [Jenkins #2981] [Release 3.1.16] prepare release v3.1.16 2018-03-15 16:58:48 +00:00
WSO2 Builder
41358a41a5 [WSO2 Release] [Jenkins #2979] [Release 3.1.15] prepare for next development iteration 2018-03-15 11:37:04 +00:00
WSO2 Builder
d679faecca [WSO2 Release] [Jenkins #2979] [Release 3.1.15] prepare release v3.1.15 2018-03-15 11:36:53 +00:00
WSO2 Builder
5a1b4b154e [WSO2 Release] [Jenkins #2977] [Release 3.1.14] prepare for next development iteration 2018-03-15 09:37:25 +00:00
WSO2 Builder
50232e10a5 [WSO2 Release] [Jenkins #2977] [Release 3.1.14] prepare release v3.1.14 2018-03-15 09:37:14 +00:00
WSO2 Builder
f265ddc736 [WSO2 Release] [Jenkins #2975] [Release 3.1.13] prepare for next development iteration 2018-03-14 20:15:12 +00:00
WSO2 Builder
221fb27c6c [WSO2 Release] [Jenkins #2975] [Release 3.1.13] prepare release v3.1.13 2018-03-14 20:14:58 +00:00
WSO2 Builder
7d1183274d [WSO2 Release] [Jenkins #2973] [Release 3.1.12] prepare for next development iteration 2018-03-14 17:51:27 +00:00
WSO2 Builder
1e875dc00b [WSO2 Release] [Jenkins #2973] [Release 3.1.12] prepare release v3.1.12 2018-03-14 17:51:16 +00:00
WSO2 Builder
1c3bca244a [WSO2 Release] [Jenkins #2971] [Release 3.1.11] prepare for next development iteration 2018-03-14 17:01:33 +00:00
WSO2 Builder
4140ba7e76 [WSO2 Release] [Jenkins #2971] [Release 3.1.11] prepare release v3.1.11 2018-03-14 17:01:23 +00:00
WSO2 Builder
d2163025f2 [WSO2 Release] [Jenkins #2969] [Release 3.1.10] prepare for next development iteration 2018-03-14 15:15:04 +00:00
WSO2 Builder
494b4db66b [WSO2 Release] [Jenkins #2969] [Release 3.1.10] prepare release v3.1.10 2018-03-14 15:14:53 +00:00
WSO2 Builder
31f11433bb [WSO2 Release] [Jenkins #2967] [Release 3.1.9] prepare for next development iteration 2018-03-14 11:23:00 +00:00
WSO2 Builder
a3773032ce [WSO2 Release] [Jenkins #2967] [Release 3.1.9] prepare release v3.1.9 2018-03-14 11:22:50 +00:00
WSO2 Builder
fa014fb838 [WSO2 Release] [Jenkins #2965] [Release 3.1.8] prepare for next development iteration 2018-03-14 10:29:02 +00:00
WSO2 Builder
e2218ed497 [WSO2 Release] [Jenkins #2965] [Release 3.1.8] prepare release v3.1.8 2018-03-14 10:28:52 +00:00
WSO2 Builder
a73300b693 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare for next development iteration 2018-03-14 09:53:11 +00:00
WSO2 Builder
fa5300cec1 [WSO2 Release] [Jenkins #2964] [Release 3.1.7] prepare release v3.1.7 2018-03-14 09:52:58 +00:00
WSO2 Builder
8282e69e12 Merge commit '46c4111b1dbaf85b9c413254f376c651488a5f57' into e61b2ead-a0d6-41af-8fb3-d2c404e569e2 2018-03-14 09:33:55 +00:00
WSO2 Builder
46c4111b1d [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare for next development iteration 2018-03-14 09:08:39 +00:00
WSO2 Builder
28ec21a4f3 [WSO2 Release] [Jenkins #2963] [Release 3.1.6] prepare release v3.1.6 2018-03-14 09:08:27 +00:00
Rasika Perera
815cea8ab1
Merge pull request #1215 from Arcane94/geoFencing
Adding geofencing feature to geo devices dashboard
2018-03-14 14:20:39 +05:30
Ruwan
af4f3302ad
Merge pull request #1222 from rasika/master
Adding an extension point into the PaginationRequest class
2018-03-14 13:59:10 +05:30
Rasika Perera
e996f1f9f0 Adding an extension point into the PaginationRequest class
This allows other APIs which has additional parameters to be passed into
the backend DAOs
2018-03-14 13:20:11 +05:30
Arcane94
8c303911b0 Final frontend and backend changes 2018-03-14 12:05:21 +05:30
Arcane94
27ae7cfed8 Fix for adding alerts twice with same name bug 2018-03-14 11:57:01 +05:30
Arcane94
7c88dfa0b3 Minor changes in backend APIs 2018-03-14 11:46:38 +05:30