Commit Graph

4705 Commits

Author SHA1 Message Date
Milan Perera
d4c996cce1 Merge branch 'master' into 'master'
Fix MS sql Blob storing and sql error

See merge request entgra/carbon-device-mgt!384
2019-11-06 09:59:56 +00:00
inoshperera
b0f7cfdf61 Refactoring and formatting 2019-11-06 14:51:37 +05:30
inoshperera
e3aca342ad Google enterprise unenrollment fix 2019-11-06 14:40:03 +05:30
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
lasanthaDLPDS
f330bdd3d1 Fix SQL syntax issue in getSubscribedDevices method 2019-11-06 00:22:04 +05:30
inoshperera
2e84e4d01f Fix MS sql Blob storing and sql error 2019-11-05 22:48:57 +05:30
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
66db919702 Merge branch 'master' into 'master'
Fix uninstall device list retrieving issue

See merge request entgra/carbon-device-mgt!382
2019-11-05 13:52:58 +00:00
Saad Sahibjan
15abfa218d Fix uninstall device list retrieving issue 2019-11-05 19:17:37 +05:30
Kaveesha Mihirangi
5c06b1b0ab Add new user function for device-mgt react app 2019-11-05 10:42:11 +00:00
Saad Sahibjan
d2f8b6e160 Fix web clips installation not working for iOS 2019-11-05 11:12:35 +05:30
charitha
e6ea2175cd Add review suggestions 2019-11-04 12:39:15 +05:30
charitha
efff1e2cfd Fix device group related issues
- Create group - Not working when group properties are not available
- Delete group - SQL error
- Get devices of group - Database connection management issue
2019-11-03 23:51:54 +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
Saad Sahibjan
a8e0bbce7a Fix corrective policy UI loading intermittent issue 2019-11-01 19:41:29 +05:30
Dharmakeerthi Lasantha
3ca303cdb5 Fix app installing issue in kiosk 2019-11-01 13:11:11 +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
Dharmakeerthi Lasantha
635416f766 Fix public app installing issue and improve tool-tip texts 2019-10-30 17:17:22 +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
Inosh Perara
e7ccff1f69 Merge branch 'application-mgt-new' into 'master'
Uninstall related fixes for Google EMM APIs

See merge request entgra/carbon-device-mgt!364
2019-10-28 15:31:19 +00:00
inoshperera
5a3d9c455a improve uninstall API for Google EMM APIs 2019-10-28 20:43:01 +05:30
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
lasanthaDLPDS
dbd21719f1 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-27 23:15:51 +05:30
charitha
253afa517a Fix transaction handling 2019-10-26 01:42:37 +05:30
charitha
d6845cd40a Add new API endpoints
- Change device status as bulk
- Get total device count
- Add group with different owner
2019-10-26 01:03:44 +05:30
Shamalka Navod
2c2584bcae Add devicemgt React app UI improvements 2019-10-25 10:13:17 +00:00
Shamalka Navod
a78d3e17d4 Group create/edit/delete/share functions 2019-10-25 05:53:07 +00:00
shamalka
3cb822efd7 Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-23 17:18:38 +05:30
shamalka
22cd3a09f1 Add tabs on user info modal 2019-10-23 17:18:33 +05:30
shamalka
7dc9fbb04b Fix error on retrieving location 2019-10-23 15:02:32 +05:30
Yohan Avishke
4a3a9b587e Change invalid payload exception responses to bad requests 2019-10-23 11:51:34 +05:30
achala007
e57dd65dd8 Update geo featur UI and date time picker 2019-10-23 09:54:00 +05:30
Yohan Avishke
8bebf2c126 Wrap service level error messages from api level error messages 2019-10-23 06:50:59 +05:30
Dharmakeerthi Lasantha
0f8d4a02d4 Merge branch 'master' into 'application-mgt-new'
Fix apple logo not displaying in UI DEP config

See merge request entgra/carbon-device-mgt!345
2019-10-22 18:37:37 +00:00
Dharmakeerthi Lasantha
6717723d69 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add roles and enrolled devices of users

See merge request entgra/carbon-device-mgt!343
2019-10-22 18:13:54 +00:00
Saad Sahibjan
48ffb02cb4 Fix apple logo not displaying in UI DEP config 2019-10-22 23:40:49 +05:30
shamalka
5436d9dd37 Add roles and enrolled devices of users 2019-10-22 22:56:20 +05:30
lasanthaDLPDS
67f442f1c4 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-22 22:35:59 +05:30
Dharmakeerthi Lasantha
edf9486a6d Merge branch 'application-mgt-new' into 'application-mgt-new'
Add main devicemgt features to dashboard

See merge request entgra/carbon-device-mgt!333
2019-10-22 17:02:24 +00:00
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
lasanthaDLPDS
2103306fa1 Improve APPM source
Fix formatting issues, add java doc comments, improve transaction handling
2019-10-22 19:45:25 +05:30
lasanthaDLPDS
b5a86d8e79 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-21 20:00:29 +05:30
lasanthaDLPDS
d4f3754ebc Add new admin API to get app subscription data 2019-10-21 19:59:19 +05:30
Dharmakeerthi Lasantha
41f53d06c6 Merge branch 'application-mgt-new' into 'application-mgt-new'
MS SQL based syntax fixes

See merge request entgra/carbon-device-mgt!339
2019-10-21 09:53:59 +00:00
Dharmakeerthi Lasantha
3c11838c14 Merge branch 'corrective-policy' into 'application-mgt-new'
Message to display in view when a selected corrective policy is changed to general or deleted

See merge request entgra/carbon-device-mgt!338
2019-10-21 09:52:14 +00:00
inoshperera
0db399814b MS SQL based syntax fixes 2019-10-21 14:04:38 +05:30
Saad Sahibjan
bb681c43d0 Message to display in view when a selected corrective policy is changed to general or deleted 2019-10-21 13:50:21 +05:30
inoshperera
422e106c36 MS sql related bug fixes 2019-10-20 09:41:07 +05:30
shamalka
318736bcbf Add feature descriptions 2019-10-20 00:17:02 +05:30
shamalka
02a8fd35dc Add main devicemgt features to dashboard 2019-10-19 23:59:40 +05:30
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
Saad Sahibjan
8178a3cd8f Message to display when a selected corrective policy is changed to general or deleted 2019-10-19 12:18:53 +05:30
Saad Sahibjan
ec3f5afcb7 Prevent same policy ID bieng avaialble in selecting a corrective policy 2019-10-19 12:18:02 +05:30
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
ausam riyaaz
2e8a706724 Fix MsSQL syntax issues. 2019-10-18 11:40:49 +00:00
Saad Sahibjan
e3905e793d Add policy type and corrective action UI for view policy 2019-10-18 15:04:08 +05:30
Saad Sahibjan
fc916d4e4c Add policy type and corrective action UI for edit policy 2019-10-18 15:04:08 +05:30
Saad Sahibjan
1d2444f16f Add policy type and corrective action UI for create policy 2019-10-18 15:04:08 +05:30
Saad Sahibjan
62c01aa508 Add a new unit for corrective action 2019-10-18 15:04:08 +05:30
Saad Sahibjan
ca2a1b85c3 Add UI controller method to retrieve all policies by policy type 2019-10-18 15:04:08 +05:30
Saad Sahibjan
622e1842de Add corrective actions in policy wrapper to policy object 2019-10-18 15:04:08 +05:30
Saad Sahibjan
bb1a3f6230 Add correctiveAction to policy wrapper bean class 2019-10-18 15:04:08 +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
sandarudr
3039e30578 Change Entgra IoT Server version to 4.0.0 2019-10-17 18:23:10 +05:30
lasanthaDLPDS
afb487dedc Improve APPM subscribing functionality 2019-10-17 11:24:58 +05:30
Shamalka Navod
b291c814c4 Fix Device dis-enrollment issue in APPM 2019-10-16 13:27:20 +00:00
Yohan Avishke
8489dec2b1 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/EventStream.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
2019-10-16 07:24:03 +05:30
Yohan Avishke
51b7f8b206 Modify code to limit garbage collectible objects and create method to deploy adapters without custom mapping
Removed creation of ArrayLists when a service is been called and added null validation to those lists in service layer. Developed code to deploy adapters when custom mapping is false and updated exception handling.
2019-10-16 07:12:31 +05:30
lasanthaDLPDS
2efbad9e6c Upgrade APPM version 2019-10-15 14:05:38 +05:30
lasanthaDLPDS
0b238b9c45 Merge with upstream master 2019-10-15 12:51:54 +05:30
lasanthaDLPDS
46d28cca8d Add MsSQL and Oracle support for APPM 2019-10-15 09:15:44 +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
vinojiniparamasivam
c6d23b5e7a Change button name in add policy page 2019-10-14 17:24:22 +02: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
Yohan Avishke
4557c5fc5c Update the Analytics Artifacts Management API 2019-10-14 09:35:32 +00:00
Yohan Avishke
d885707046 Refactor code in a reusable way and change response messages
Removed repeated classes and implemented code to already existing classes and divided code into sub methods to limit repetitive code and increase readability. And the response messages were change in order to give users a better understating of the responses they get when calling the api endpoints.
2019-10-13 12:37:55 +05:30
Yohan Avishke
fe4e857639 Change exception codes of device stream events 2019-10-13 12:37:55 +05:30
Yohan Avishke
e643db08d1 Change event attribute mapping logic and error handling
Event attribute mapping logic was moved to service layer from the api layer and a created a meaningful error message.
2019-10-13 12:37:55 +05:30
Yohan Avishke
da2d95e7ac Change event attribute mapping logic and error handling
Event attribute mapping logic was moved to service layer from the api layer and a created a meaningful error message.
2019-10-13 12:37:55 +05:30
Yohan Avishke
f660bf9edd Add ApiParams to all the parameters 2019-10-13 12:37:55 +05:30
Yohan Avishke
e5963c79fd Override toString 2019-10-13 12:37:55 +05:30
Saad Sahibjan
f9660de334 Minor fixes and improvement for permanent delete devices 2019-10-13 11:58:58 +05:30
Amanda Randombage
becaf35546 Permanent delete DAO fix 2019-10-11 08:59:31 +00:00
shamalka
7a9fddf6da Disenroll device 2019-10-11 13:37:04 +05:30
Dharmakeerthi Lasantha
f0d8f4d023 Merge branch 'application-mgt-new' into 'application-mgt-new'
Bulk actions UI

See merge request entgra/carbon-device-mgt!299
2019-10-10 20:59:17 +00:00
shamalka
e068317a62 Add devices to groups 2019-10-10 18:05:08 +05:30