Commit Graph

8315 Commits

Author SHA1 Message Date
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
Dharmakeerthi Lasantha
7bfbf5783a Fix UI issues in android enterprise 2019-10-16 12:06:19 +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
Dharmakeerthi Lasantha
8b52acf1f5 Merge branch 'AppManagerSQL' into 'application-mgt-new'
Fix sql query

See merge request entgra/carbon-device-mgt!319
2019-10-16 11:50:48 +00:00
Dharmakeerthi Lasantha
1ffdba1c08 Add entgra license header 2019-10-16 11:46: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
ausamriyaaz
c75291c8b4 Fix sql query 2019-10-16 16:20:02 +05:30
Dharmakeerthi Lasantha
6ee1fa6eb1 Merge branch 'application-mgt-new' into 'application-mgt-new'
Upgrade UI-request-interceptor version

See merge request entgra/carbon-device-mgt!317
2019-10-16 07:01:08 +00:00
lasanthaDLPDS
2392afed68 Upgrade ui-request-interceptor feature version 2019-10-16 12:28:03 +05:30
lasanthaDLPDS
e867c4a8aa Upgrade ui-request-interceptor version in APPM 2019-10-16 12:16:48 +05:30
Dharmakeerthi Lasantha
2cdb27767f Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master.

See merge request entgra/carbon-device-mgt!315
2019-10-16 06:20:22 +00:00
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
6abcb8f394 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-15 14:09:18 +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
Inosh Perara
8505d65b55 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add MsSQL and Oracle support for APPM

See merge request entgra/carbon-device-mgt!314
2019-10-15 03:48:00 +00:00
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
Dharmakeerthi Lasantha
ace268e12a Merge branch 'application-mgt-new' into 'application-mgt-new'
Improve the profile feature to Show the logged user name

See merge request entgra/carbon-device-mgt!312
2019-10-14 12:29:16 +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
Dharmakeerthi Lasantha
b209ac9aa6 Update the Analytics Artifacts Management API 2019-10-14 09:35:33 +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
Dharmakeerthi Lasantha
2856765ca3 Merge branch 'application-mgt-new' into 'application-mgt-new'
Modify the add release component of the APPM publisher

See merge request entgra/carbon-device-mgt!306
2019-10-14 06:49:26 +00:00
nipun
06dee0e6a5 Fix the app search bar icon issue of the APPM publisher 2019-10-14 10:58:50 +05:30
Dharmakeerthi Lasantha
032746c1aa Merge branch 'master' into 'master'
Minor fixes and improvement for permanent delete devices

See merge request entgra/carbon-device-mgt!309
2019-10-13 11:16:25 +00:00
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
Dharmakeerthi Lasantha
812c2999ba Merge branch 'application-mgt-new' into 'application-mgt-new'
Get logged in users details when loading APPM Publisher UI

See merge request entgra/carbon-device-mgt!307
2019-10-11 10:09:44 +00:00
Jayasanka
02cac02d45 Add javadoc comments to UserHandler class 2019-10-11 15:00:23 +05:30
Jayasanka
ce40ea57c7 Fix server error issue when calling get logged-in user in APPM
The following changes are with this commit,
- Check authData object is null in UserHandler class
- Add check logged-in user functionality to APPM UI
2019-10-11 14:52:00 +05:30