Commit Graph

1576 Commits

Author SHA1 Message Date
Hetu Nandu
b87fde64b1 Merge branch 'fix/action-evaluated-value' into 'release'
Action creator evaluated value fixes

See merge request theappsmith/internal-tools-client!699
2020-06-10 12:16:50 +00:00
Hetu Nandu
cb2867069f Action creator evaluated value fixes 2020-06-10 12:16:50 +00:00
Nikhil Nandagopal
bc9ec2a2eb Merge branch 'release' into fix/bugs 2020-06-10 17:11:23 +05:30
Arpit Mohan
58e75ee603 Merge branch 'hotfix/sorry-cypress-parallel' into 'release'
Adding sorry-cypress integration to ensure Cypress parallelization without the Cypress dashboard

Using the open source project sorry-cypress, we get the benefits of test parallelization without having to pay Cypress for the test recordings. This server is hosted on Heroku at this moment.

See merge request theappsmith/internal-tools-client!703
2020-06-10 11:14:58 +00:00
Arpit Mohan
7af301566c Adding sorry-cypress integration to ensure Cypress parallelization without the Cypress dashboard 2020-06-10 11:14:58 +00:00
vicky_primathon.in
a5986ed8a8 merge conflicts resolved 2020-06-10 16:34:11 +05:30
Nikhil Nandagopal
ed37c27c67 added pagination info 2020-06-10 15:51:16 +05:30
vicky_primathon.in
e930a3963c Merge branch 'feature/widget-actions-menu' of gitlab.com:theappsmith/internal-tools-client into fix/lightning-menu 2020-06-10 15:41:12 +05:30
Nikhil Nandagopal
a26e8ea51c Merge branch 'release' into fix/bugs
# Conflicts:
#	cypress/integration/Smoke_TestSuite/FormWidgets/DatePicker_spec.js
2020-06-10 14:22:04 +05:30
Trisha Anand
8b9bc4b42d Merge branch 'fix/acl-bugs' into 'feature/acl'
Fix acl-bugs

See merge request theappsmith/internal-tools-client!701
2020-06-10 08:29:21 +00:00
Tejaaswini Narendra
4f34b2c502 fix: Send organizationId for embedded datasources
- show organization title in invite form
- show form when clicking on share in dropdown
- show org name in org settings page
- remove the deleted application from the UI when delete is successful
- fix role update in user list table
2020-06-10 08:29:21 +00:00
Hetu Nandu
9e087de059 Merge branch 'fix/query-pane-evaluated-value' into 'release'
Query pane evaluated value

- Use `body` field of query action configuration
- Show evaluated value of a query field
- Update failing test

See merge request theappsmith/internal-tools-client!697
2020-06-10 07:49:27 +00:00
Hetu Nandu
e2eb590a86 Query pane evaluated value 2020-06-10 07:49:27 +00:00
Nikhil Nandagopal
32d934604f fixed tests 2020-06-10 12:04:46 +05:30
Tejaaswini
4196f11af9 Merge branch 'release' into feature/acl 2020-06-10 11:50:54 +05:30
Nikhil Nandagopal
2df86b79e9 fixed type def
resolved mr comments
2020-06-09 18:40:42 +05:30
Nikhil Nandagopal
7da961bcc9 fixed clearing date picker 2020-06-09 18:34:47 +05:30
Trisha Anand
450a65929a Merge branch 'fix/update-modal' into 'feature/acl'
Update modal

- Manage users redirect to manage user page
- Invite button display loader on load
- Invite form reset on success
- Invite form display success message when form submission is successful

See merge request theappsmith/internal-tools-client!698
2020-06-09 12:10:55 +00:00
Tejaaswini Narendra
91efefee09 fix: Minor change
- remove return
2020-06-09 12:10:55 +00:00
Nikhil Nandagopal
9becaa9a9f made form data visible at the top level 2020-06-09 17:34:38 +05:30
Nikhil Nandagopal
97d78ba379 commented datepicker required field test 2020-06-09 16:34:04 +05:30
Hetu Nandu
6b54eb8f9e Update displayWidgetDsl.json 2020-06-09 09:44:57 +00:00
Nikhil Nandagopal
a567622e0d minor fix 2020-06-09 14:29:08 +05:30
Nikhil Nandagopal
8501ebe670 added date format to date picker 2020-06-09 14:14:13 +05:30
Nikhil Nandagopal
563c74f1a9 fixed tests failing 2020-06-09 11:55:11 +05:30
rashmipn
e2ce5f929c Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into update/Dsl 2020-06-09 11:49:10 +05:30
Rashmi P
d9639266f1 Removed Required toggle fun DatePicker_spec.js 2020-06-09 06:16:53 +00:00
Nikhil Nandagopal
79c62d4863 fixed data tree path 2020-06-08 17:56:07 +05:30
Nikhil Nandagopal
8b0258b4b9 Merge branch 'release' into fix/bugs
# Conflicts:
#	src/pages/Editor/APIEditor/PostBodyData.tsx
2020-06-08 17:13:03 +05:30
Nikhil Nandagopal
b84384fa99 fixed filepicker not closing 2020-06-08 16:59:20 +05:30
Nikhil Nandagopal
dff9c60f9f fixed resize handles size
fixed body for url encoded form data
added defaults for dropdown and radio widget
added multipart type but hid it till we figure out logic
allowed number to be added to defaults of widgets
2020-06-08 16:39:13 +05:30
Trisha Anand
00aa8015c9 Merge branch 'fix/add-orgid' into 'feature/acl'
fix: Add orgId to datasource, 3P import and plugins API

See merge request theappsmith/internal-tools-client!695
2020-06-08 10:10:31 +00:00
Satbir Singh
dbd06b1cd9 Merge branch 'sc-names' into 'release'
Adding styled component names to dom for local env

See merge request theappsmith/internal-tools-client!692
2020-06-08 09:00:58 +00:00
Satbir Singh
618d6180e6 Adding styled component names to dom for local env 2020-06-08 09:00:58 +00:00
Tejaaswini
5b9f4ad16f fix: Add orgId to datasource, 3P import and plugins API 2020-06-08 14:21:53 +05:30
Tejaaswini
bbdec60516 Merge branch 'release' into feature/acl 2020-06-08 13:36:15 +05:30
Hetu Nandu
01c2f71bc0 Merge branch 'feature/custom-eval-value' into 'release'
Fix Chart series data

See merge request theappsmith/internal-tools-client!688
2020-06-05 16:20:24 +00:00
Hetu Nandu
e401844014 Fix Chart series data 2020-06-05 16:20:23 +00:00
Trisha Anand
f02ae99af4 Merge branch 'fix/create-api' into 'feature/acl'
fix: Create API and Curl Import API

See merge request theappsmith/internal-tools-client!690
2020-06-05 13:52:08 +00:00
Tejaaswini Narendra
817f361a69 Merge branch 'fix/invite-users' into 'feature/acl'
fix: Update minor UI changes

See merge request theappsmith/internal-tools-client!683
2020-06-05 13:42:37 +00:00
Tejaaswini
7c3d18b7f6 Merge branch 'feature/acl' into fix/invite-users 2020-06-05 18:58:21 +05:30
Tejaaswini
926a6caed4 fix: Create API and curl import flow 2020-06-05 18:52:30 +05:30
Trisha Anand
9c2529105c Merge branch 'fix/update-create-datasource' into 'feature/acl'
fix: pass organization id to create datasource APIs

See merge request theappsmith/internal-tools-client!687
2020-06-05 09:29:15 +00:00
Tejaaswini
81c1e0d5f4 feat: pass orgId to createDatasource APIs
- Set Current Organization Id based on the application that the user is accessing
- Send saved organization id in datasource creation APIs.
2020-06-05 14:13:01 +05:30
Tejaaswini
d33188adc1 Merge branch 'release' into feature/acl 2020-06-05 13:39:01 +05:30
rashmipn
e3729a4ea0 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into update/dsl 2020-06-05 09:18:59 +05:30
Hetu Nandu
410d2d1d2a Merge branch 'feature/evaluated-value' into 'release'
Evaluated value popup

See merge request theappsmith/internal-tools-client!621
2020-06-04 13:49:22 +00:00
Hetu Nandu
d9540f8927 Evaluated value popup 2020-06-04 13:49:22 +00:00
Tejaaswini
7a02d62682 Merge branch 'feature/acl' into fix/invite-users 2020-06-04 19:00:47 +05:30
Tejaaswini
efad40becd fix: Update UI changes 2020-06-04 18:42:19 +05:30