Commit Graph

5797 Commits

Author SHA1 Message Date
Trisha Anand
3e016296e6 Merge branch 'master' into release
# Conflicts:
#	app/client/src/workers/DataTreeEvaluator.ts
2021-05-13 14:43:00 +05:30
Nidhi
aeda36f0e0
Disable cs url as an environment config (#4465) 2021-05-13 14:29:43 +05:30
Nidhi
ea451ef061
Add default configs for prod and tests (#4464)
* Added default cs config for prod and tests

* Env variable for new installations

* K8s defaults
2021-05-13 13:30:23 +05:30
Shrikant Sharat Kandula
27af947852
APIs for adding and removing reactions on comments (#4457)
* Add APIs for reacting and unreacting on comments

* Add tests for Reactions APIs

* Fix s/create/delete typo

Co-authored-by: Nidhi <nidhi@appsmith.com>

* Deletion is successful if more than one are deleted

Co-authored-by: Nidhi <nidhi@appsmith.com>
2021-05-13 12:52:43 +05:30
Sumit Kumar
e74d99b794
fix NPE (#4448)
fix NPE
2021-05-13 11:59:43 +05:30
Apeksha Bhosale
66c7a0b252
Revert "Separating js error and validation error for debugger (#4361)" (#4447)
This reverts commit c6a8f81d60.
2021-05-13 09:50:30 +05:30
Nidhi
39ca940dfc
Added space in if condition (#4459) 2021-05-12 19:06:39 +05:30
NandanAnantharamu
fb7db810da
Updated Cypress locator for product updates test (#4454) 2021-05-12 17:43:11 +05:30
Nidhi
53c2d815f6
Fixes refresh token flow (#4450)
* Fixes refresh token flow

* Review comments

* Reverting mistake with CI cs url
2021-05-12 17:07:59 +05:30
Shrikant Sharat Kandula
c2af4a97fd
Fix sporadic build errors (#4453)
Because of the Java version not being explicitly set
in this plugin, the build of the whole project fails
sporadically in IntelliJ since it's trying to compile the
code as Java 8, which will obviously fail.
2021-05-12 16:41:42 +05:30
Nidhi
b514759ad2
Added example value for cs domain on client (#4443) 2021-05-12 14:48:13 +05:30
Pawan Kumar
cc36bdc051
Fix: TypeError: t.match is not a function (#4445)
* add is number check before setting widget property

* use toString of lodash

Co-authored-by: root <root@DESKTOP-9GENCK0.localdomain>
2021-05-12 13:27:28 +05:30
Apeksha Bhosale
c6a8f81d60
Separating js error and validation error for debugger (#4361)
* separate js error and validation error

* PR comments fixed and added error for pageload action

* reverted to jsError message property

* small check for empty errors

* small changes for Test to pass

* space was missing for test case

* removed console statement
2021-05-12 12:10:32 +05:30
Nidhi
f4fd217102
Refer to previous job for result (#4434)
* Always run ui test result

* Refer to previous job for status

* Revert CI cloud url
2021-05-11 22:21:42 +05:30
Nidhi
1e57260471
Always run ui test result (#4432) 2021-05-11 21:25:00 +05:30
Ashok Kumar M
3eeaf86097
Fix: Resize doesn't react as intended for top/bottom handles. (#4321) 2021-05-11 20:09:33 +05:30
Apeksha Bhosale
640959788c match is not a function (#4409)
(cherry picked from commit 2138c9059b)
2021-05-11 16:23:22 +05:30
arunvjn
bb74ba876f Revert Gsheets warning modal (#4405)
(cherry picked from commit 1b98c2e520)
2021-05-11 16:22:58 +05:30
Pawan Kumar
4dff6e4b5c Fix: Cannot read property 'label' of undefined & Cannot read property 'length' of undefined (#4389)
* fix for label of undefined

* add check for data type

Co-authored-by: root <root@DESKTOP-9GENCK0.localdomain>
(cherry picked from commit fc10625d41)
2021-05-11 16:22:47 +05:30
arunvjn
38ece3fbb7 Added null check against datasource url (#4352)
(cherry picked from commit 45aa3c57f1)
2021-05-11 16:22:35 +05:30
akash-codemonk
d6de913949
Revert "Feature: Show widget error state (#4202)" (#4406)
This reverts commit bf7a8b91a4.
2021-05-11 09:40:43 +05:30
Snyk bot
5671494b9e
fix: upgrade com.github.cloudyrock.mongock:mongock-spring from 3.2.5 to 3.3.2 (#4355)
Snyk has created this PR to upgrade com.github.cloudyrock.mongock:mongock-spring from 3.2.5 to 3.3.2.

See this package in Maven Repository:
https://mvnrepository.com/artifact/com.github.cloudyrock.mongock/mongock-spring/

See this project in Snyk:
https://app.snyk.io/org/nikhil-nu4/project/b1eb6091-e23c-476f-bcc4-c4ae240497f8?utm_source=github&utm_medium=upgrade-pr
2021-05-10 19:53:59 +05:30
Apeksha Bhosale
2138c9059b
match is not a function (#4409) 2021-05-10 19:40:22 +05:30
arunvjn
1b98c2e520
Revert Gsheets warning modal (#4405) 2021-05-10 19:39:26 +05:30
arunvjn
3b61af395e
Fix/text overflow json viewer (#4367)
CSS fix to wrap long urls/text in json viewer. GSheets to occupy full width
2021-05-10 18:58:38 +05:30
Confidence Okoghenun
b65466b11e
docs: Adds updates for live demo #2 2021-05-10 13:49:18 +01:00
NandanAnantharamu
408517de39
Datasource test with basic profile added (#4374) 2021-05-10 17:27:54 +05:30
Pawan Kumar
fc10625d41
Fix: Cannot read property 'label' of undefined & Cannot read property 'length' of undefined (#4389)
* fix for label of undefined

* add check for data type

Co-authored-by: root <root@DESKTOP-9GENCK0.localdomain>
2021-05-10 15:22:17 +05:30
Shrikant Sharat Kandula
7b222b27fb
Don't create new org, if the new user has been invited to one (#4380) 2021-05-10 13:51:43 +05:30
akash-codemonk
359d104f5f
Show debug button in toast only for some particular errors (#4311) 2021-05-10 13:13:12 +05:30
akash-codemonk
78ccfadb61
Fix: Make contents of tab selectable (#4390) 2021-05-10 13:08:39 +05:30
Somangshu Goswami
d4e3de6330
Merge pull request #4359 from appsmithorg/fix/dropdown-rename-select
Refactor: Rename Dropdown to Select
2021-05-10 11:25:24 +05:30
Somangshu Goswami
1864166fdc
Merge pull request #4285 from appsmithorg/fix/date-time-picker-bug
change data-time format 'YYYY-MM-DD hh:mm:ss A' to 'YYYY-MM-DD hh:mm:ss'
2021-05-10 11:21:42 +05:30
Sumit Kumar
0ec3604eac
Feature: connect to mongo db via connection string URI (#4131)
allow user to connect using a mongo connection string URI directly.
2021-05-10 10:35:45 +05:30
dependabot[bot]
3573ea3913
Bump commons-io from 2.6 to 2.7 in /app/server/appsmith-interfaces (#4172)
Bumps commons-io from 2.6 to 2.7.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-09 09:49:43 +05:30
dependabot[bot]
5a289b51ed
Bump commons-io from 2.6 to 2.7 in /app/server/appsmith-server (#4171)
Bumps commons-io from 2.6 to 2.7.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-09 09:49:19 +05:30
Snyk bot
5b9b348035
fix: upgrade org.springframework.boot:spring-boot-starter-mail from 2.2.1.RELEASE to 2.4.4 (#4305)
Snyk has created this PR to upgrade org.springframework.boot:spring-boot-starter-mail from 2.2.1.RELEASE to 2.4.4.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-mail/

See this project in Snyk:
https://app.snyk.io/org/nikhil-nu4/project/b1eb6091-e23c-476f-bcc4-c4ae240497f8?utm_source=github&utm_medium=upgrade-pr
2021-05-09 09:47:45 +05:30
Snyk bot
11c1a01566
fix: upgrade org.springframework.boot:spring-boot-starter-actuator from 2.3.4.RELEASE to 2.4.4 (#4308)
Snyk has created this PR to upgrade org.springframework.boot:spring-boot-starter-actuator from 2.3.4.RELEASE to 2.4.4.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator/

See this project in Snyk:
https://app.snyk.io/org/nikhil-nu4/project/b1eb6091-e23c-476f-bcc4-c4ae240497f8?utm_source=github&utm_medium=upgrade-pr
2021-05-09 09:47:12 +05:30
Confidence Okoghenun
c31a288451
docs: Makes yarn install script more obvious (#4373) 2021-05-09 09:46:03 +05:30
Confidence Okoghenun
c7fa504d5c
docs: Updates server readme.md (#4375) 2021-05-09 09:44:20 +05:30
Nidhi
39bb0ac805
Removed prod url from default config (#4377) 2021-05-07 23:22:20 +05:30
akash-codemonk
bf7a8b91a4
Feature: Show widget error state (#4202) 2021-05-07 20:03:20 +05:30
Nidhi
4a288439f0
Added basic authentication type to REST APIs (#4040)
* Added basic authentication type to REST APIs

* Spacing for prefix

* Tests and json ignore for password

* Client side form changes

* Review comments
2021-05-07 17:24:05 +05:30
Nayan
212678a540
[Docs] Imrove readme file in server, improve client getting started g… (#4327)
* [Docs] Imrove readme file in server, improve client getting started guide

* -updated the ClientSetup readme as per PR comment
2021-05-07 16:55:48 +06:00
Shrikant Sharat Kandula
3b3e24f8cf
Add delete thread API (#4363) 2021-05-07 15:58:02 +05:30
Shrikant Sharat Kandula
8c7e844d80
Accept PUT requests for thread updates (#4357)
We were using PATCH, because that was semantically more
correct for what we are doing here. But since PUT is used
everywhere else in the project, changing this to PUT for
consistency.
2021-05-07 14:02:41 +05:30
arunvjn
45aa3c57f1
Added null check against datasource url (#4352) 2021-05-07 13:24:58 +05:30
Nidhi
1efd00da96
Merge pull request #4364 from appsmithorg/fix/default-prefix
Bearer prefix without space
2021-05-07 12:46:28 +05:30
Shrikant Sharat Kandula
1f2f5ec227
Fix ACL not applied on editing comments (#4351) 2021-05-07 12:35:53 +05:30
Nidhi
51aee58c54 Bearer prefix without space 2021-05-07 12:35:34 +05:30