Commit Graph

2890 Commits

Author SHA1 Message Date
Abhinav Jha
f70d92b8d0 Merge branch 'fix/remove-console-warnings' into 'release'
Remove console warnings

- Remove console eslint warnings like react hook dependency warnings and unused vars warnings

See merge request theappsmith/internal-tools-client!738
2020-06-18 05:53:41 +00:00
Abhinav Jha
78ebdfc9d8 Fix modal overlay covering widget cards pane issue 2020-06-18 10:56:50 +05:30
Satbir Singh
acec05ef62 Merge branch 'fix/modal-overlay-issue' into 'master'
Fix modal overlay z-index issue

See merge request theappsmith/internal-tools-client!741
2020-06-17 16:35:05 +00:00
Abhinav Jha
57e341b7e8 Fix modal overlay z-index issue 2020-06-17 16:35:05 +00:00
Satbir Singh
8bdc1e7563 Merge branch 'master' into 'release'
Hotfix api name edit backmerge.

See merge request theappsmith/internal-tools-client!737
2020-06-17 13:58:29 +00:00
Abhinav Jha
fdd826d929 Remove console warnings like react hook dependency warnings and unused vars 2020-06-17 19:23:01 +05:30
Satbir Singh
54c97e83ef Merge branch 'hotfix/edit-name' into 'master'
Handling api name change error.

See merge request theappsmith/internal-tools-client!736
2020-06-17 13:16:14 +00:00
Satbir Singh
98f65405a7 Handling api name change error. 2020-06-17 13:16:14 +00:00
vicky_primathon.in
f479e1d1d1 wrapping action code reverted 2020-06-17 18:28:26 +05:30
Arpit Mohan
f44c979e49 Merge branch 'bug/page-edit-without-perm' into 'release'
In case a page is opened in edit mode, it should open with permission of MANAGE_PAGE. In case the user is a viewer, the page must not open.

See merge request theappsmith/internal-tools-server!392
2020-06-17 12:11:32 +00:00
Trisha Anand
e5282dac11 In case a page is opened in edit mode, it should open with permission of MANAGE_PAGE. In case the user is a viewer, the page must not open. 2020-06-17 17:34:26 +05:30
Arpit Mohan
7c85a81bed Merge branch 'newUITest' into 'release'
Fixing tests for ACL flow

The current push for fixing tests in the new ACL flow.

1. New way to handle create application.
2. API login 
3. Removed redundant tests.
4. Fixed Issues wrt ACL changes

See merge request theappsmith/internal-tools-client!713
2020-06-17 10:47:02 +00:00
Nandan H A
7bba999c9f Fixing tests for ACL flow
The current push for fixing tests in the new ACL flow.

1. New way to handle create application.
2. API login
3. Removed redundant tests.
4. Fixed Issues wrt ACL changes
2020-06-17 10:47:01 +00:00
Arpit Mohan
50a8391e6b Merge branch 'feature/acl' into 'release'
ACL feature changes

This MR introduces the new ACL framework for the entire product.

See merge request theappsmith/internal-tools-client!735
2020-06-17 10:19:56 +00:00
Arpit Mohan
fc8e43da1f Query pane fixes
- Show mongo execute response in seperate cards for each record
- Update postgres read template
- Show query execute error message in the UI.
2020-06-17 10:19:56 +00:00
Trisha Anand
e9086c15b5 Merge branch 'feature/acl-spring-object' into 'release'
ACL

See merge request theappsmith/internal-tools-server!383
2020-06-17 09:51:57 +00:00
vicky_primathon.in
51545bf774 changes for child fields 2020-06-17 15:10:29 +05:30
Trisha Anand
893698f09e Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
2020-06-17 15:10:23 +05:30
Arpit Mohan
decdde179c Merge branch 'bug/acl-invite-admin-admin' into 'feature/acl-spring-object'
In case a user is invited to an organization as developer, correct top...

See merge request theappsmith/internal-tools-server!391
2020-06-17 09:33:01 +00:00
Trisha Anand
8fc99cf0bd In case a user is invited to an organization as developer, correct top permissions are being assigned via Appsmith role. 2020-06-17 09:33:00 +00:00
Abhinav Jha
e8c4080f54 Merge branch 'release' into 'master'
Release

See merge request theappsmith/internal-tools-client!733
2020-06-17 08:27:04 +00:00
Abhinav Jha
6390213ff4 Merge branch 'fix/button-sizes' into 'release'
Fix button sizes globally

See merge request theappsmith/internal-tools-client!732
2020-06-17 08:26:17 +00:00
Abhinav Jha
d7cac27c8f Remove 100% width from button size 2020-06-17 13:14:25 +05:30
Abhinav Jha
28b66346c5 Merge branch 'release' into 'master'
Release

See merge request theappsmith/internal-tools-client!731
2020-06-17 07:04:06 +00:00
Shrikant Kandula
8e40240f25 Fix parse error when there's a space in header in curl command 2020-06-17 12:32:08 +05:30
Abhinav Jha
3eb7fbdf18 Merge branch 'fix/new-widget-borders' into 'release'
Prevent widget name un-highlight when clicking on property pane.

See merge request theappsmith/internal-tools-client!730
2020-06-17 06:39:22 +00:00
Abhinav Jha
ffef90acbe Merge branch 'fix/back-to-editor-button-size' into 'release'
Fix Back to editor button size

See merge request theappsmith/internal-tools-client!729
2020-06-17 06:38:10 +00:00
Abhinav Jha
044df2b08d Add max width to back to editor button on appviewer 2020-06-17 11:59:09 +05:30
Abhinav Jha
246a3b84c0 Merge branch 'release' into 'master'
Release

See merge request theappsmith/internal-tools-client!728
2020-06-17 06:15:29 +00:00
Abhinav Jha
cd47a342f2 Merge branch 'fix/empty-cells-for-empty-table' into 'release'
Fix/empty cells for empty table

- Add empty rows in case of empty space in table widget.

See merge request theappsmith/internal-tools-client!726
2020-06-17 06:00:44 +00:00
Vicky Bansal
232f5a9206 Fix/empty cells for empty table 2020-06-17 06:00:43 +00:00
Tejaaswini
16606a45a2 fix: bug fixes
- refresh users list
- show orgdropdown and share based on permission
2020-06-17 09:47:25 +05:30
Arpit Mohan
0e0909b68e Merge branch 'release' into 'master'
Release

See merge request theappsmith/internal-tools-client!725
2020-06-16 13:10:54 +00:00
Satbir Singh
efcbde656b Merge branch 'feature/api-name' into 'release'
Api name editable.

See merge request theappsmith/internal-tools-client!717
2020-06-16 10:23:19 +00:00
Satbir Singh
7e3df81302 Api name editable. 2020-06-16 10:23:19 +00:00
Abhinav Jha
0f7fd2287a Stop click propagation on property pane to prevent the widget from getting unselected 2020-06-16 15:42:17 +05:30
Arpit Mohan
0abd0fb682 Merge branch 'fix/table-bugs' into 'release'
Fixing table bugs

This MR fixes a bunch of bugs associated with the react-base-table. Some of them include:
1. Show loading state for the table 
2. Handling nested objects when displaying table data
3. Truncate long text instead of overlapping it with the next column
4. Displaying Youtube video URLs in the table column

See merge request theappsmith/internal-tools-client!704
2020-06-16 07:37:39 +00:00
Vicky Bansal
5643a53c9f Fixing table bugs 2020-06-16 07:37:39 +00:00
Tejaaswini
c99640df91 Merge branch 'release' into feature/acl 2020-06-16 11:44:44 +05:30
Arpit Mohan
c6af229a97 Merge branch 'bug/default-page-action-refactor' into 'release'
Adding the widget names set to the default layout for a page

During action name refactor, we require the widget names to exist in the layout. Hence all default layouts must have the widgetName set.

See merge request theappsmith/internal-tools-server!387
2020-06-16 05:25:54 +00:00
Arpit Mohan
e27af0f525 Merge branch 'bug/curl-import-with-url-argument' into 'release'
Fix cURL import when using `--url` argument

See merge request theappsmith/internal-tools-server!386
2020-06-16 05:21:43 +00:00
vicky_primathon.in
02d841a1b1 changes for tree structure 2020-06-16 10:50:46 +05:30
Arpit Mohan
a4132d5845 Adding the widget names set to the default layout for a page 2020-06-16 10:50:07 +05:30
Shrikant Kandula
dd0ba857c2 Fix cURL import when using --url argument
Also fixes cases where there's a space between `-X` and `POST` and
similar cases.
2020-06-16 09:59:43 +05:30
Hetu Nandu
428cb5e287 Merge branch 'feat/tabKeyNavigation' into 'release'
Feat/tab key navigation

- Extend existing extraKeys to avoid overriding the `Tab` extraKey

See merge request theappsmith/internal-tools-client!724
2020-06-15 13:14:39 +00:00
Akash N
1d38c98a7f Fix tab key navigation for headers and query params
- Extend existing extraKeys to avoid overriding the `Tab` extraKey
2020-06-15 13:14:39 +00:00
Abhinav Jha
2609f26117 Merge branch 'fix/lightning-menu' into 'release'
Fix/lightning menu

- Add lightning menu to assist users in binding
- Change the action selection display for consistency.

See merge request theappsmith/internal-tools-client!706
2020-06-15 10:51:20 +00:00
Hetu Nandu
0f066a2192 Merge branch 'fix/bad-styles' into 'release'
Add missing semicolons in styles

See merge request theappsmith/internal-tools-client!722
2020-06-15 08:56:40 +00:00
Hetu Nandu
70d4818767 add missing semi-colons in styles 2020-06-15 14:21:00 +05:30
Satbir Singh
cb628d26b2 Merge branch 'fix/remove-ff' into 'release'
ApiPaneV2 DocsV2 QueryV2 DatasourceV2 feature flag removed

See merge request theappsmith/internal-tools-client!721
2020-06-15 08:03:07 +00:00