Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

This commit is contained in:
Automated Github Action 2020-09-07 06:07:01 +00:00
commit 00ce029158
3 changed files with 8 additions and 13 deletions

View File

@ -12,24 +12,13 @@ assignees: Nikhil-Nandagopal
[What happened] [What happened]
### Steps to reproduce the behaviour: ### Steps to reproduce the behaviour:
Add steps to reproduce this behaviour, include console / network logs & screenshots
1. Go to '...' 1. Go to '...'
2. Click on '....' 2. Click on '....'
3. Scroll down to '....' 3. Scroll down to '....'
4. See error 4. See error
Good items to include here include:
- Console / network logs from your browser
- Screenshots
### Important Details ### Important Details
- Version: [Cloud / Self-Hosted vx.x]
How are you running appsmith?
<!-- Please pick one of the following -->
On-Premise w/ Docker, version x.y.z
<!-- --------------- -->
SaaS (appsmith.com)
<!-- --------------- -->
Which browser / OS are you using?
- OS: [e.g.MacOSX] - OS: [e.g.MacOSX]
- Browser [e.g. chrome, safari] - Browser [e.g. chrome, safari]

View File

@ -71,6 +71,8 @@ public class Action extends BaseDomain {
@JsonIgnore @JsonIgnore
Boolean userSetOnLoad = false; Boolean userSetOnLoad = false;
Boolean confirmBeforeExecute = false;
Documentation documentation; Documentation documentation;
/** /**

View File

@ -38,4 +38,8 @@ public class Application extends BaseDomain {
@JsonIgnore @JsonIgnore
String clonedFromApplicationId; String clonedFromApplicationId;
String colour;
String icon;
} }