Commit Graph

1936 Commits

Author SHA1 Message Date
Automated Github Action
a61dd3f5f4 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-20 15:08:15 +00:00
Akshay Avinash
4cd2d94f74
Updated positioning of delete icon and eslint error fix (#1304) 2020-10-20 20:29:28 +05:30
Automated Github Action
aefd966aca Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-20 10:08:13 +00:00
Nikhil Nandagopal
5b35d93374 Merge branch 'master' into release 2020-10-20 15:34:01 +05:30
Nikhil Nandagopal
8a97f25b1d
Fix/example apps (#1315)
* added signup for public apps that are not example apps

* minor fix
2020-10-20 15:33:21 +05:30
Arpit Mohan
087078938c Fixing merge conflicts 2020-10-20 14:46:29 +05:30
akash-codemonk
6a2a36aadb
Update application card colors (#1288) 2020-10-20 14:31:54 +05:30
akash-codemonk
380da11ef0
Query home page with datasource information (#1237) 2020-10-20 14:30:02 +05:30
Hetu Nandu
39d51fdc4c
Fix input navigate test (#1310) 2020-10-20 14:18:38 +05:30
Arpit Mohan
d1713ca802 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-20 13:25:00 +05:30
vicky-primathon
56225d2fdd
Rich text editor content with newline is parsed for RTE (#1296) 2020-10-20 13:24:05 +05:30
Arpit Mohan
6ba5057b81 Adding a condition to only build Docker containers on push and not on pull_request_target 2020-10-20 13:21:22 +05:30
Nikhil Nandagopal
f5abf29cea hotfix for page load actions 2020-10-20 13:15:57 +05:30
Hetu Nandu
83d91b23e8
Fix chunk loading reload issue (#1305) 2020-10-20 12:51:33 +05:30
Arpit Mohan
f080f3e7a0 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-20 12:45:07 +05:30
satbir121
6c1e13a6e9
Revert create new app flow to use the old flow for now (#1265) 2020-10-20 12:44:39 +05:30
Automated Github Action
a59aaa5409 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-19 17:07:35 +00:00
Adam
ff79074fc5
fix\Issues while performing actions on Home Page #749 (#1291)
Fixes #749
2020-10-19 21:46:27 +05:30
Automated Github Action
8fe172f5c2 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-19 14:08:14 +00:00
vicky-primathon
3ae032de38
Remove RTE intance from tinymce editor instances when component is unmounted (#1076)
Fixes #785
2020-10-19 19:10:00 +05:30
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
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
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
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
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
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
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
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
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
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
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