Commit Graph

1911 Commits

Author SHA1 Message Date
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
Automated Github Action
c23cbe8a2d Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-15 12:10:21 +00:00
Hetu Nandu
863f5816e1
Fixes issue for pageOnload action timing out crashing the app. (#1219)
* Fixes issue for page onload timing out crashing the app.

* Add tests
2020-10-15 17:08:55 +05:30
Arpit Mohan
a762ed33d3 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-15 15:22:35 +05:30
satbir121
5c6b2e1f98
Removing a bad fix for Table column width. (#1213)
* Removing a bad fix in Table column.

* Removing unwanted code.
2020-10-15 14:56:27 +05:30
Automated Github Action
04d630a2b1 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-15 08:08:44 +00:00
akash-codemonk
47847cbc7c
Add widget cta in query pane (#1157) 2020-10-15 12:51:00 +05:30
Automated Github Action
7e0da20ee1 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-15 04:08:36 +00:00
NandanAnantharamu
dfe19b5693
wait added for toast message (#1191)
* wait added for toast message

* Updated the hard wait

* msg validation removed only widget update check enabled
2020-10-15 08:43:53 +05:30
Automated Github Action
d00849e05c Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-14 11:07:04 +00:00
devrk96
539253f17e
Feature: Create new-app flow (#926)
* create new app flow

* uncontrolled component error fixed

* loader added when user is deleting or user role is updating

* home page loader and create-new-app loader added

* user role changing and use deleting state fixed

* PR feeback changes added

* orgname loader added

* warnings removed

* fixed create-new-app flow and delete app test cases

* beforeAll test case condition fixed

* Initial navigation condition fixed in createOrg test cases

* app card loading state fixed
2020-10-14 16:05:19 +05:30
Automated Github Action
8c70379af5 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-14 06:08:57 +00:00
akash-codemonk
527b7b613e
Add "Add" text next to datasource lightning icon (#1158) 2020-10-14 11:03:06 +05:30
Shrikant Sharat Kandula
4a070c3d92
Fix blank scrollbars on Firefox (#1171)
* Fix blank scrollbars on Firefox

* Hide scrollbars on Firefox for consistency
2020-10-14 10:56:43 +05:30
NandanAnantharamu
242d1ea989
binding test added invloving form input and table (#1126) 2020-10-14 10:49:24 +05:30
NandanAnantharamu
ccb2c7013e
Feature/pause test (#1125)
* updated video widget tests

* Updated video widget test
2020-10-14 10:49:08 +05:30
Automated Github Action
8492205260 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-12 14:07:57 +00:00
Nikhil Nandagopal
c550e9202f Merge branch 'master' into release 2020-10-12 19:08:23 +05:30
akash-codemonk
25285033d6
Feat/add query flow (#1146)
* Add datasource connected page

* Default to show connected screen in datasource editor

* Update UI

* Fixes

- Change text from connected to saved
- Show key with empty values if there are no values
- After creating a new datasource go to edit mode

* Stop calling test on save

* Fix tests

* Fix test

* Dummy commit

* Always be in view mode unless clicked on edit mode

* Fixes

- Update datasource connected page for rest api datasource
- Fix empty array values not resetting

* Fix create new api crashing

- While creating new datasource show form in edit mode

* Fix tests
2020-10-12 19:07:18 +05:30
Automated Github Action
271298fb97 Merge branch 'release' of https://github.com/appsmithorg/appsmith into release 2020-10-12 13:07:19 +00:00
Abhinav Jha
76ae0103bf
Upgrade npm packages (#1079)
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
2020-10-12 18:36:05 +05:30
Nikhil Nandagopal
711507c501 Merge branch 'release' 2020-10-12 18:33:54 +05:30
Satbir Singh
91db71174f Merge branch 'release' of github.com:appsmithorg/appsmith-ee into release 2020-10-12 18:32:48 +05:30
Satbir Singh
ee47d34101 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2020-10-12 18:32:29 +05:30
satbir121
8bf80fe507
Google Recaptcha integration for button and form button widgets. (#1118)
* Adding base code for google re-captcha.

* Removing recaptcha as well

* Adding recaptchaToken on Button.

* Fixing updateMetaProperty errors.

* Handling recaptcha generation failed case.

* Adding a message for recaptcha token gen fail

* Rename setRecaptchaToken

* Adding loading state for recaptcha button

* Adding googleRecaptchaKey as a Btn prop

* Adding the bound functions in widgets

* Removing unused vars.

* Handling google recaptcha key error.

* Adding proper messages for
2020-10-12 18:31:19 +05:30
Nikhil Nandagopal
d789ac66d0
Fix/analytics (#1145)
* added app id to execute action tracking

* added route change analytics
2020-10-12 18:26:03 +05:30