Commit Graph

6644 Commits

Author SHA1 Message Date
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
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
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
Jayasanka
112eb1f77f Call user API to get logged-in user's data when loading APPM publisher UI 2019-10-11 12:31:49 +05:30
Jayasanka
e3b07fb2f7 Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-11 09:32:46 +05:30
Jayasanka
9d161734f8 Add white background for page headers in APPM UI 2019-10-11 09:32:31 +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
Dharmakeerthi Lasantha
7f1f62bdc5 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add new servlet to get logged-in user's data

See merge request entgra/carbon-device-mgt!305
2019-10-10 20:56:14 +00:00
lasanthaDLPDS
fefdb7aba3 Add new servlet to get logged-in user's data 2019-10-10 22:40:41 +05:30
Dharmakeerthi Lasantha
c0a3408694 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add null and empty check for device location related values

See merge request entgra/carbon-device-mgt!304
2019-10-10 13:46:18 +00:00
shamalka
e068317a62 Add devices to groups 2019-10-10 18:05:08 +05:30
shamalka
c69f9c9f1d Fix spelling mistakes 2019-10-10 18:05:08 +05:30
shamalka
5ba56207c9 Improve delete device UI 2019-10-10 18:05:08 +05:30
shamalka
b92046fa3d Change UI structure 2019-10-10 18:05:08 +05:30
shamalka
c762c9d2a7 Change bulk action UI 2019-10-10 18:05:08 +05:30
Saad Sahibjan
354dcd3fd4 Add null and empty check for device location related values 2019-10-10 15:55:03 +05:30
Jayasanka
3c9d200770 Validate supported OS versions in 'Add new app' form in APPM Publisher UI 2019-10-10 14:55:17 +05:30
Jayasanka
5153feae40 Fix login redirection issue in APPM Store UI 2019-10-10 14:55:17 +05:30
Jayasanka
6d16259aaf Improve schedule install/ uninstall component's UI in APPM store 2019-10-10 14:55:17 +05:30
Jayasanka
b21de79151 Remove unnecessary console log lines in APPM UI 2019-10-10 14:55:17 +05:30
Jayasanka
533871d64a Fix null value issue in scheduled install/uninstall operation in APPM UI 2019-10-10 14:55:16 +05:30
Dharmakeerthi Lasantha
c859ff9611 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix app uninstall issue for Android

See merge request entgra/carbon-device-mgt!301
2019-10-10 03:15:52 +00:00
Dharmakeerthi Lasantha
2d98768188 Merge branch 'application-mgt-new' into 'application-mgt-new'
Improve the screenshots view of the APPM UI

See merge request entgra/carbon-device-mgt!297
2019-10-10 03:12:49 +00:00
lasanthaDLPDS
16ee8ec882 Fix app uninstall issue for Android 2019-10-10 08:40:04 +05:30
Amanda
7b7d47a2bf Fix delete
- Fix delete button in UI
- Close connection in DAO
2019-10-10 07:56:29 +05:30
lasanthaDLPDS
a2bcc1c03f Improve APPM app uninstall operation payload 2019-10-09 17:49:26 +05:30
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
nipun
74069d3415 Improve the screenshots view of the APPM UI 2019-10-09 15:53:50 +05:30
Amanda Randombage
e80589d3b1 Fix Permanent delete for multiple enrollments 2019-10-09 10:19:55 +00:00
Amanda Randombage
8a586eee2c Add UI feature to delete multiple devices permanently 2019-10-09 08:56:32 +00:00
Dharmakeerthi Lasantha
594ab3ed60 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix APPM login issue

See merge request entgra/carbon-device-mgt!293
2019-10-09 07:45:43 +00:00
Jayasanka Weerasinghe
f710c5489a Add UI improvements to edit release view in APPM UI
The following changes are with this commit.
- Add previews of selected images to upload
- Add supported OS versions field
2019-10-09 07:35:06 +00:00
Madawa Soysa
03c550d11b Fix issue with reconfiguring policy
The cause of the issue is not passing the newly introduced parameter 'policyType' in the policy edit payload. This parameter is marked @NotNull. Hence throwing an error. 

This fix sets the policyType parameter from the existing payload (Doesn't allow to edit as there is no UI interface to edit this parameter ATM

Fixes: entgra/product-iots#175
2019-10-09 16:50:12 +11:00
lasanthaDLPDS
4d3c7e1c79 Fix APPM login issue 2019-10-09 10:14:12 +05:30
Amanda Randombage
824403b97e Change permanent delete HTTP method 2019-10-09 01:54:08 +00:00
Dharmakeerthi Lasantha
51b001c236 Merge branch 'application-mgt-new' into 'application-mgt-new'
Improve APPM app saving functionality

See merge request entgra/carbon-device-mgt!288
2019-10-08 18:47:50 +00:00
Shamalka Navod
bc406b6c92 Add UI feature to delete set of devices 2019-10-08 18:47:08 +00:00
Amanda
0aee974b35 Fix issue in retrieving IoTS devices 2019-10-08 17:33:24 +05:30
lasanthaDLPDS
d9a04e099e Improve APPM app saving functionality 2019-10-08 17:11:08 +05:30
Dharmakeerthi Lasantha
8d8b041f2f Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix issue in retrieving IoTS devices

See merge request entgra/carbon-device-mgt!286
2019-10-08 08:34:57 +00:00
charitha
43ba5d7e84 Fix issue in retrieving IoTS devices 2019-10-08 13:26:56 +05:30
Nipun Nadeen De Silva
0757783b81 Fix the navigation bar issue in APPM UI 2019-10-08 07:56:13 +00:00
Jayasanka
8b4c2f0e79 Redirect logged-out user within the loading screen in APPM UI 2019-10-07 18:05:56 +05:30
Jayasanka
f1f7a3d9e3 Add supported OS versions to add new release form in APPM UI 2019-10-07 15:01:05 +05:30
Jayasanka
407cbc6ef4 Add supported OS versions to add new app form in APPM UI 2019-10-07 14:35:06 +05:30
Saad Sahibjan
128c226cd3 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix APPM API deploying issue on gateway

See merge request entgra/carbon-device-mgt!282
2019-10-07 04:46:08 +00:00
lasanthaDLPDS
0abe6f1678 Fix APPM API deploying issue on gateway 2019-10-07 10:08:03 +05:30
Jayasanka
e956b288cd Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-06 20:31:08 +05:30
Jayasanka
ff875c3330 Add scheduled install/uninstall feature to APPM store ui 2019-10-06 20:29:17 +05:30
Jayasanka
2e690892d5 Fix app name length issue in APPM Store 2019-10-06 17:06:26 +05:30
shamalka
d43971b1b8 Remove unnecessary comments 2019-10-05 23:26:19 +05:30
shamalka
795edd4c66 Improve device delete UI 2019-10-05 23:13:34 +05:30
Jayasanka
e9cb3eae91 Use common function to handle ajax call errors in APPM UI 2019-10-05 22:05:19 +05:30
Jayasanka
36f44d2999 Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-05 18:46:06 +05:30
Jayasanka
cd374ab350 Fix icon size & change paddings of the tile in APPM store 2019-10-05 18:42:15 +05:30
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
8c40a81c4a Sync with upstream master 2019-10-04 18:23:17 +05:30
lasanthaDLPDS
7a5a231974 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into conflicts-fix 2019-10-04 16:25:52 +05:30
achala piyarathna
33cac65dd0 Fix build failure 2019-10-04 10:51:21 +00:00
lasanthaDLPDS
baf382c706 Fix formatting issues 2019-10-04 15:44:19 +05:30
lasanthaDLPDS
f6098a75af Sync with upstream master 2019-10-04 15:39:02 +05:30
lasanthaDLPDS
298c58e8b8 Fix merge conflicts 2019-10-04 13:57:55 +05:30
nipun
4ac94746fa Merge branch 'application-mgt-new' of https://gitlab.com/nipunnadeen/carbon-device-mgt into appm-new 2019-10-04 12:06:13 +05:30
nipun
c095ca40ff Fix the uninstall operation of the uninstall API 2019-10-04 12:04:24 +05:30
nipunnadeen
58c866f33d Improve the subscribed devices and category details APIs 2019-10-04 12:04:24 +05:30
nipunnadeen
9d1171b620 Improve the subscribed category details API 2019-10-04 12:04:24 +05:30
nipunnadeen
29951a1560 Create an API to get subscribed Category details 2019-10-04 12:04:24 +05:30
nipunnadeen
cfdbb919b0 Create an API to get device details with given app installed 2019-10-04 12:04:24 +05:30
nipun
d363194356 Modify the uninstall UI of the APPM store 2019-10-04 12:04:24 +05:30
nipun
e4311d4e3a Modify the subscribed devices and category APIs 2019-10-04 12:04:24 +05:30
nipunnadeen
c08e631c93 Improve the subscribed devices and category details APIs 2019-10-04 12:04:24 +05:30
nipunnadeen
e3b29ee531 Improve the subscribed category details API 2019-10-04 12:04:24 +05:30
nipunnadeen
153b7f1385 Create the uninstall ui of the APPM store 2019-10-04 12:04:24 +05:30
nipunnadeen
5cbe25c0d7 Create an API to get subscribed Category details 2019-10-04 12:04:24 +05:30
nipunnadeen
4c51c0af45 Create an API to get device details with given app installed 2019-10-04 12:04:24 +05:30
lasanthaDLPDS
6b51d1fd06 Improve app subscribing functionality 2019-10-04 08:41:38 +05:30
Inosh Perara
5cb706f24b Add android enterprise support for IoTS. 2019-10-04 03:08:35 +00:00
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
Shamalka Navod
fdf660014f UI to generate reports
Get devices which are enrolled between two date according to device status and ownership
2019-10-03 13:30:13 +00:00
Jayasanka
6786ed0fab Add UI Improvements to APPM UI
The following changes are with this commit
- Add metadata to Add new app & edit app forms in Publisher
- Display metadata in both publisher and store views
- Fix typo in lifecycle component
- Update table when changing the name & categories in apps table in publisher
2019-10-03 17:28:25 +05:30
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
Madawa Soysa
c9f12d47cb Implement scheduled application install/uninstall task
Fixes entgra/product-iots#160
2019-10-03 09:50:39 +00:00
Dharmakeerthi Lasantha
03e28c3eb9 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add UI Improvements in APPM publisher

See merge request entgra/carbon-device-mgt!270
2019-10-01 09:34:42 +00:00
nipun
2103e0ea48 Modify the uninstall UI of the APPM store 2019-10-01 14:36:11 +05:30
nipun
7323ea0271 Modify the subscribed devices and category APIs 2019-10-01 14:36:11 +05:30
nipunnadeen
61bd91b21f Improve the subscribed devices and category details APIs 2019-10-01 14:36:11 +05:30
nipunnadeen
4cfa0789ac Improve the subscribed category details API 2019-10-01 14:36:11 +05:30
nipunnadeen
9886b9f2fe Create the uninstall ui of the APPM store 2019-10-01 14:36:11 +05:30
nipunnadeen
2732de2148 Create an API to get subscribed Category details 2019-10-01 14:33:22 +05:30
nipunnadeen
8a91702975 Create an API to get device details with given app installed 2019-10-01 14:33:22 +05:30
Shamalka Navod
8ff264a044 Fix error logs of DAO implementations 2019-10-01 13:46:53 +05:30
charitha
4e9628dff4 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-01 08:40:23 +05:30
charitha
2b902e878c Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-01 08:33:05 +05:30
milanperera
576ccd2363 Fix issues in fix-172 2019-09-30 15:54:12 +02:00
milanperera
a044bbd385 fix entgra/product-iots#172 2019-09-30 15:47:50 +02:00
Jayasanka
740ad2a6b7 Add image upload previews and validation in add new app form 2019-09-30 17:28:01 +05:30
Jayasanka
a2341e8afc Fix subscription method issue 2019-09-30 14:08:28 +05:30
Turcy
f28d42d7ce Fix device-type features edit issue 2019-09-30 12:14:35 +05:30
ausamriyaaz
2c27830ecc Fix Null pointer exception 2019-09-27 15:42:01 +05:30
Vinojini Paramasivam
3dcf19dffa Show the applied policies when click view button on policy compliance 2019-09-27 05:51:59 +00:00
Milan Perera
513b8efaee Merge branch 'fix-141' into 'master'
Fix build failure

See merge request entgra/carbon-device-mgt!263
2019-09-26 20:34:23 +00:00
milanperera
a716d28046 Fix build failure 2019-09-26 22:33:26 +02:00