Commit Graph

5314 Commits

Author SHA1 Message Date
Lois Harris
2e6ba8d8fd
[#1136] Fix the Appsmith logo click href (#1255)
Fixes: #1136
2020-10-19 19:04:55 +05:30
Automated Github Action
6cbd4117b8 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-19 13:07:40 +00:00
Sufiyan Gani
f52a2500c1
Added sending email when the role of the member is (#1253)
Added sending email when the role of a member is changed
2020-10-19 17:53:12 +05:30
Akshay Avinash
d90d420035
Added no search result image and text on applicaitons (#1240) 2020-10-19 17:41:14 +05:30
Automated Github Action
48026a3e95 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-19 12:10:30 +00:00
Abhinav Jha
4d9a360f45
Fix keyboard shortcuts on windows and linux machines (#1274)
* Fix keyboard shortcuts on windows and linux machines

* Update tests for keyboard shortcuts
2020-10-19 16:56:39 +05:30
Arpit Mohan
8e58822e9a Fixing merge conflicts 2020-10-19 16:43:09 +05:30
Trisha Anand
37aedcba24
User emails should be changed to lower case before creating/inviting user. (#1281) 2020-10-19 16:39:04 +05:30
Shrikant Sharat Kandula
920b38da90
Resolve conflict with master (#1246)
* added code to not identify anonymous users

* minor fix

* added alias for users so that segment works with mixpanel

* removed alias since we enabled identity merge for mixpanel

* added fix to not send anonymous user

* Add first_login event for analytics (#1184)

* Don't send full object to analytics (#1186)

* added binary raw data to be set for files picked (#1211)

* added binary raw data to be set for files picked

* spread options before modifying to maintain immutability

* Add isFromInvite field to create_USER event (#1223)

* Adding dummy commit to trigger build

* added extra information to execute action call (#1244)

Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2020-10-19 16:36:44 +05:30
Nikhil Nandagopal
77e1998e74
updated query template to have an explanatory comment (#1260) 2020-10-19 15:10:21 +05:30
Shrikant Sharat Kandula
a8d5138541
MS SQL Plugin implementation (#1272)
* Working version of MsSQL plugin

* Add tests for mssql-plugin
2020-10-19 15:06:08 +05:30
Arpit Mohan
dc698e7d59
Fixing warning message in Github Actions (#1261) 2020-10-19 14:42:25 +05:30
Automated Github Action
db0a23c540 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-19 09:07:55 +00:00
Abhinav Jha
5c43f5d18d
Update widgetId references to a copied tabs widget's tabs (#1273) 2020-10-19 14:26:04 +05:30
Automated Github Action
b920c159e6 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-19 07:07:55 +00:00
João Rafael
85d5477039
BugFix (#944): Add HTTP prefix to URLs in RestApiPlugin and RapidApiPlugin (#1266)
Also, add null check before adding HTTP prefix. This avoids null pointer exceptions and lets the UriBuilder deal with it
2020-10-19 12:19:04 +05:30
Yash Joshi
c085fc778d
Fix evaluated pane scrollbar style (#1251)
fixes: #1182
2020-10-19 12:02:07 +05:30
Automated Github Action
9ad9a5d45b Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-19 06:08:56 +00:00
Nikhil Nandagopal
66d15d05c6 Merge branch 'master' of github.com:appsmithorg/appsmith 2020-10-19 11:12:14 +05:30
Nuwan Sameera Alawatta
f5adc5732b
Fix page name special character bug (#1035)
* Fix page name special character bug

* update fix page name special character bug

* fix page name ending space
2020-10-19 10:48:27 +05:30
Automated Github Action
0069e50ad7 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-16 15:07:58 +00:00
Akshay Avinash
4e99ab7ace
Fix 781 invalid message on password reset failure (#1234)
* Updated to add button to redirect to forgot password page
2020-10-16 19:48:03 +05:30
Nikhil Nandagopal
ec83d0c3fa
added extra information to execute action call (#1244) 2020-10-16 18:09:57 +05:30
Arpit Mohan
2c21246a13 Fixing merge conflicts 2020-10-16 15:02:38 +05:30
NandanAnantharamu
10fe3ba171
Feature/navigate totests (#1187)
* Adding tests for Navigateto function

* Updated locators and renamed tests
2020-10-16 14:17:54 +05:30
Arpit Mohan
3db43a531b Adding comments for server workflow for docker push command
Ensures that there are no errors in the future
2020-10-16 14:01:56 +05:30
Arpit Mohan
277b97cf3f Adding dummy commit to trigger build 2020-10-16 13:58:42 +05:30
Arpit Mohan
337db97a18 Adding dummy commit to trigger build 2020-10-16 13:57:18 +05:30
Arpit Mohan
b52d4c3377 Adding dummy commit to trigger build 2020-10-16 13:55:49 +05:30
Arpit Mohan
f8c2fd312e Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-16 13:28:46 +05:30
akash-codemonk
0772bffe23
Create a new input field which outputs a key value pair (#1226) 2020-10-16 13:04:32 +05:30
Automated Github Action
7844e2ae05 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-16 07:07:46 +00:00
Shrikant Sharat Kandula
0055f01f2f
Remove extraneous scrollbars in API action pane (#1222) 2020-10-16 12:28:34 +05:30
Shrikant Sharat Kandula
273a120f1b Add isFromInvite field to create_USER event (#1223) 2020-10-16 12:02:25 +05:30
Shrikant Sharat Kandula
9c04f65901 Add isFromInvite field to create_USER event (#1223) 2020-10-16 12:01:23 +05:30
Pushkar Khedekar
2ac8ec589f
minor fix for column resizing onevent (#1235) 2020-10-16 11:59:50 +05:30
Thakur Karthik
fd9fa46bdd
Fix/fix input size (#1207)
* fix(codemirror-autocomplete): show selection background on hover for options

This fix if merged shows the selection background by hovering on autocomplete
options.

Ref: #946

* added code to not identify anonymous users

* minor fix

* added alias for users so that segment works with mixpanel

* removed alias since we enabled identity merge for mixpanel

* added fix to not send anonymous user

* Add first_login event for analytics (#1184)

* Don't send full object to analytics (#1186)

* fix for removing the extra padding in input field

* Revert "Merge branch 'master' of https://github.com/appsmithorg/appsmith into fix/fix-input-size"

This reverts commit 05a97588f8187c5a9f3146214ef523c30d1370d9, reversing
changes made to 4f70eb61e43c1a9270cb6bd05689820351a5b6e0.

* set scrollbarstyle to null in compact mode

Co-authored-by: Nikhil Nandagopal <nikhil@appsmith.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2020-10-16 11:56:03 +05:30
Automated Github Action
fe0ac5f985 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-16 06:08:29 +00:00
Arpit Mohan
1b451daed5
Adding Debian to the list of supported OS (#700)
The paths to some of the software packages are different in Debian as compared to Ubuntu. Hence, we now take the OS into consideration before executing the `apt-get` command.

Also removing some of the extraneous outputs generated by Integromat.
2020-10-16 10:57:16 +05:30
Automated Github Action
e19cbb6737 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-16 05:07:32 +00:00
Arpit Mohan
9d2b017bf3
Making the nginx root configuration also configurable. (#694)
This is required for enabling custom logging. In future, we can leverage this for proxy caching as well.

Not adding this nginx-root.conf.template file to the installation script because there's nothing for the user to configure there during installation. This file will be baked into the Dockerfile and only the environment variables will be replaced during container start.
2020-10-16 10:00:33 +05:30
Arpit Mohan
eddfa25543 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-15 23:36:45 +05:30
allcontributors[bot]
ede03ba554
docs: add pc9795 as a contributor (#1233)
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2020-10-15 23:33:28 +05:30
allcontributors[bot]
c3748a6701
docs: add daniel-shuy as a contributor (#1232)
* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2020-10-15 23:30:39 +05:30
Daniel Shuy
a93bd52684
Don't append " Copy" suffix to cloned pages in cloned application (#1172)
* Add test to verify that Pages are cloned
2020-10-15 23:27:32 +05:30
Arpit Mohan
796264157c Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-15 22:16:47 +05:30
Abhinav Jha
e909cb2f05
Fix: refresh on chunk load error due to deployment (#800) 2020-10-15 22:16:01 +05:30
Automated Github Action
feade757e3 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-15 16:09:29 +00:00
Nikhil Nandagopal
0a149f9e54
added cancel request logic for update layout, api and action (#1224) 2020-10-15 20:58:54 +05:30
Arpit Mohan
ef28d8f1dd Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-15 17:49:05 +05:30