Commit Graph

6655 Commits

Author SHA1 Message Date
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
Dharmakeerthi Lasantha
84b54c1996 Merge branch 'application-mgt-new' into 'application-mgt-new'
Improve app manager source

See merge request entgra/carbon-device-mgt!344
2019-10-22 17:39:05 +00:00
Jayasanka Weerasinghe
08860acfba Add ui improvements to APPM Publisher UI
The following changes are with this commit
- View subscription status of devices in release view
- Display server error response in add new app form
2019-10-22 17:32:56 +00:00
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
Jayasanka
e762d35a74 Remove subscription type from APPM publisher filter UI 2019-10-22 22:28:44 +05:30
Jayasanka
d75724563a Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-22 22:18:52 +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
lasanthaDLPDS
2103306fa1 Improve APPM source
Fix formatting issues, add java doc comments, improve transaction handling
2019-10-22 19:45:25 +05:30
Jayasanka
951325ee75 Add ui improvements to APPM Publisher UI
The following changes are with this commit
- View subscription status of devices in release view
- Display server error response in add new app form
2019-10-22 16:08:09 +05:30
lasanthaDLPDS
c3349a89a4 Improve scope in device subscription view API 2019-10-22 00:10:25 +05:30
Jayasanka
6a5e21dd9b Create UI to display installed devices 2019-10-21 21:54:01 +05:30
Jayasanka
6c78491482 Add loading animation to filter & lifecycle components in APPM 2019-10-21 21:54:01 +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
Jayasanka Weerasinghe
78bd339cd4 Add loading animation when installing/uninstall app in APPM store 2019-10-21 09:59:56 +00:00
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
inoshperera
f3d34a0ad6 Add return generated keys flag 2019-10-20 07:24:08 +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
Inosh Perara
7477c4052b Merge branch 'application-mgt-new' into 'application-mgt-new'
Add UI improvements to APPM UI

See merge request entgra/carbon-device-mgt!331
2019-10-19 16:50:03 +00:00
Jayasanka
0a9d2e6426 Rename Any OS version's key to "All" in APPM publisher UI 2019-10-19 20:48:25 +05:30
Jayasanka
90570e1d3c Add "Any OS version" option to supported OS version in APPM publisher UI 2019-10-19 20:46:03 +05:30
Jayasanka
b4d76b893d Fix code issues in App Upload form in APPM UI 2019-10-19 17:39:04 +05:30
Jayasanka
13bdeee883 Set favicon when loading APPM UI 2019-10-19 16:00:48 +05:30
Jayasanka
22ef153d80 Update ratings & review when adding/editing or deleting a review in APPM 2019-10-19 15:52:37 +05:30
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
lasanthaDLPDS
60947eb1e8 Improve app subscribing flow 2019-10-19 11:24:22 +05:30
Jayasanka
dfc4ce98cb Add improvements to add & edit application forms in APPM UI
- Remove price field and tenancy sharing switch
- Make supported OS versions a required field
2019-10-19 04:57:16 +05:30
lasanthaDLPDS
d1e6aab5cd Improve APPM DAO layer to support MsSQL 2019-10-19 02:29:27 +05:30
Saad Sahibjan
0c06863559 Add missing policy type in policy update query 2019-10-19 00:35:35 +05:30
Ace
548ad336bf Adding status column to GROUP table and honuring same in API 2019-10-18 18:18:40 +05:30
lasanthaDLPDS
0dbd4bf2db fix compilation error 2019-10-18 17:41:00 +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
0359acf37d Add corrective action table to test scripts 2019-10-18 15:04:08 +05:30
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
1e0ca09f12 Handle policy transform exception 2019-10-18 15:04:08 +05:30
Saad Sahibjan
8bf8941103 Modify transform policy method to support retrieving corrective policy as a feature 2019-10-18 15:04:08 +05:30
Saad Sahibjan
1c36eec841 Add constants of corrective action policy 2019-10-18 15:04:08 +05:30
Saad Sahibjan
f82b54312c Add implementation of corrective actions in policy service 2019-10-18 15:04:08 +05:30
Saad Sahibjan
ff0de037b6 Add DAO methods and implementation of policy corrective actions 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
Dharmakeerthi Lasantha
af0024016d Merge branch 'application-mgt-new' into 'application-mgt-new'
Change Entgra IoT Server version to 4.0.0

See merge request entgra/carbon-device-mgt!325
2019-10-18 06:49:24 +00:00
lasanthaDLPDS
5dfc7b0430 Fix app installing issue in multiple times 2019-10-18 11:45:59 +05:30
lasanthaDLPDS
5e384c9403 Improve APPM subscription flow 2019-10-17 20:43: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
Dharmakeerthi Lasantha
f7596926dd Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix MsSQL and Oracle syntax issues

See merge request entgra/carbon-device-mgt!321
2019-10-16 12:19:12 +00:00
Jayasanka Weerasinghe
12d68579a6 Fix ui issues in android enterprise
- Hide managed configs when android enterprise is disabled
- Send current host and port to get android enterprise token
2019-10-16 12:06:19 +00:00
Nipun Nadeen De Silva
84bf912356 Add entgra license header 2019-10-16 11:46:19 +00:00
lasanthaDLPDS
00526352da Fix MsSQL and Oracle syntax issues 2019-10-16 17:01:32 +05:30
lasanthaDLPDS
e867c4a8aa Upgrade ui-request-interceptor version in APPM 2019-10-16 12:16:48 +05:30
lasanthaDLPDS
6b72f71101 Fic MsSQL and Oracle prepared statement building issue 2019-10-16 11:34:34 +05:30
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
nipun
820f94815f Fix the os version issue of the APPM publisher 2019-10-14 16:45:49 +05:30
nipun
d19d9f20c4 Improve the profile feature to Show the logged user name 2019-10-14 15:35:42 +05:30
Dharmakeerthi Lasantha
d28d3ef310 Collapse navigation drawer when clicking on a link. 2019-10-14 09:39:30 +00:00
Dharmakeerthi Lasantha
69fec58fb6 Merge branch 'application-mgt-new' into 'application-mgt-new'
Device disenrollment function

See merge request entgra/carbon-device-mgt!308
2019-10-14 09:35:50 +00:00
Yohan Avishke
4557c5fc5c Update the Analytics Artifacts Management API 2019-10-14 09:35:32 +00:00
nipun
cc0ba7444e Add the function call to mobile nav bar of the APPM ui 2019-10-14 13:08:26 +05:30
nipun
06dee0e6a5 Fix the app search bar icon issue of the APPM publisher 2019-10-14 10:58:50 +05:30
nipun
8e8411ab38 Add the row and col tags to add release feature 2019-10-13 13:55:22 +05:30
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
nipun
2978f6f032 Improve the form config object of the add release component 2019-10-13 04:02:52 +05:30
nipun
2961c1d21c Modify the app details drawer of the APPM publisher 2019-10-13 03:59:59 +05:30
nipun
88fed3e86e Modify the add release component of the APPM publisher 2019-10-13 03:59:59 +05:30