Commit Graph

8330 Commits

Author SHA1 Message Date
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
495534ce5f Merge branch 'master' into 'master'
Fix corrective policy UI loading intermittent issue

See merge request entgra/carbon-device-mgt!373
2019-11-01 14:20:21 +00:00
Saad Sahibjan
a8e0bbce7a Fix corrective policy UI loading intermittent issue 2019-11-01 19:41:29 +05:30
Dharmakeerthi Lasantha
f603ed0f97 Merge branch 'master' into 'master'
Fix app installing issue in kiosk

See merge request entgra/carbon-device-mgt!372
2019-11-01 13:11:12 +00:00
Dharmakeerthi Lasantha
3ca303cdb5 Fix app installing issue in kiosk 2019-11-01 13:11:11 +00:00
Dharmakeerthi Lasantha
1e7f075ec0 Merge branch 'application-mgt-new' into 'master'
Add minor UI fixes to APPM UI

See merge request entgra/carbon-device-mgt!371
2019-11-01 12:50:42 +00:00
Jayasanka Weerasinghe
70e56f02c2 Add minor UI fixes to APPM UI
The following changes are with this commit
- Display wrong credentials error in Login form
- Display tags and categories in APPM store release view
2019-11-01 12:50:42 +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
Inosh Perara
86da88e92c Merge branch 'jayasanka-appmgt' into 'master'
Jayasanka appmgt

See merge request entgra/carbon-device-mgt!370
2019-10-31 09:34:43 +00:00
Jayasanka
b391dd8cf9 Increase initial limit value of apps to 30 in APPM Store 2019-10-31 14:26:58 +05:30
Saad Sahibjan
0c9ab04bd9 Merge branch 'master' into 'master'
Add general policy filter to delegate only general policies

Closes product-iots#268

See merge request entgra/carbon-device-mgt!369
2019-10-31 08:44:13 +00:00
Jayasanka
5139415995 Fix wrong offset value in app view of APPM Store UI 2019-10-31 14:04:03 +05:30
Saad Sahibjan
5329508fb3 Add general policy filter to delegate only general policies 2019-10-31 13:56:06 +05:30
Jayasanka
6cb15c7e7f Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-31 13:40:43 +05:30
Jayasanka
8ed7c15bdd Fix app offset issue in APPM Store UI 2019-10-31 13:34:44 +05:30
Dharmakeerthi Lasantha
7f80ffdf5e Merge branch 'application-mgt-new' into 'master'
Remove managed configuration option from non android ent. apps in APPM UI

See merge request entgra/carbon-device-mgt!366
2019-10-31 06:46:58 +00:00
Jayasanka Weerasinghe
f4e3c75c0b Remove managed configuration option from non android ent. apps in APPM UI 2019-10-31 06:46:58 +00:00
Jayasanka
01de8aa665 Remove unwanted code linei 2019-10-31 11:39:37 +05:30
Jayasanka
5a32912a7b Get updated data from payload in Application update in APPM UI 2019-10-31 08:45:58 +05:30
Jayasanka
c54b29a182 Remove managed configuration option from non android ent. apps in APPM UI 2019-10-31 08:45:39 +05:30
lasanthaDLPDS
07d87ae4f2 Fix public app installing issue in APPM 2019-10-31 08:45:39 +05:30
Saad Sahibjan
e612334fd4 Merge branch 'master' into 'master'
Fix public app installing issue and improve tool-tip texts

## Purpose
> The purpose of this PR is to fix the public app installing issue and improving tool-tip texts.

## Security checks
 - Followed secure coding standards? (yes)
 - Ran FindSecurityBugs plugin and verified report? (yes)
 - Confirmed that this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets? (yes)

See merge request entgra/carbon-device-mgt!365
2019-10-30 17:17:22 +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
Dharmakeerthi Lasantha
62c900a6d9 Merge branch 'application-mgt-new' into 'master'
Add infinite scroll to apps view in APPM store UI

See merge request entgra/carbon-device-mgt!363
2019-10-28 12:25:42 +00:00
Jayasanka
bd318d9af8 Remove unwanted console logs 2019-10-28 17:18:41 +05:30
Jayasanka
2c6d8eb993 Add infinite scroll to apps view in APPM store UI
Additional changes,
- Remove padding from the footer in APPM UI
2019-10-28 17:02:57 +05:30
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
Dharmakeerthi Lasantha
5d08e98b8a Merge branch 'application-mgt-new' into 'master'
Add ent. app installation feature to APPM UI

See merge request entgra/carbon-device-mgt!362
2019-10-28 09:50:45 +00:00
Jayasanka
fc4d8e3a6b Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-28 14:40:48 +05:30
Jayasanka
84ee824716 Add ent. app installation feature to APPM UI 2019-10-28 14:38:46 +05:30
Jayasanka
9b98475ea1 Merge branch 'application-mgt-new' of https://gitlab.com/tcdlpds/carbon-device-mgt into application-mgt-new 2019-10-28 12:01:20 +05:30
Jayasanka
138ed15dff Modify search by app field in APPM Publisher UI 2019-10-28 11:59:12 +05:30
lasanthaDLPDS
15d0e86f92 maven checkstyle version 2019-10-28 01:39:10 +05:30
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
Milan Perera
2e0e8cc96d Merge branch 'application-mgt-new' into 'master'
Add new entgra app manager

Closes product-iots#104, product-iots#108, product-iots#110, product-iots#111, product-iots#113, product-iots#160, and product-iots#145

See merge request entgra/carbon-device-mgt!361
2019-10-27 19:58:50 +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
lasanthaDLPDS
db0b362244 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-27 21:01:50 +05:30
Inosh Perara
1a7806e02d Merge branch 'application-mgt-new' into 'application-mgt-new'
Add UI improvements to APPM

See merge request entgra/carbon-device-mgt!358
2019-10-27 01:57:31 +00:00
Jayasanka
c5bc96d8cc Fix invalid support OS version issue in APPM publisher UI 2019-10-26 19:40:20 +05:30
Jayasanka
9fa4047d07 Merge remote-tracking branch 'upstream/application-mgt-new' into application-mgt-new
# Conflicts:
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js
2019-10-26 17:19:59 +05:30