Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
16,958 Commits 1 Branch 0 Tags 507 MiB
d0162013f6
Commit Graph

16958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shrikant Kandula
9f6a4f6ea5 Fail deleting datasource if there's actions against it 2020-06-18 10:41:48 +00:00
Shrikant Kandula
45961ddcde Merge branch 'bug/fail-on-invalid-page-id-when-creating-action' into 'release' 
Fail with an error if can't find page when creating an action

See merge request theappsmith/internal-tools-server!394
 2020-06-18 10:25:13 +00:00
Nikhil Nandagopal
ba8f9fa00e minor fix for date picker validator 2020-06-18 15:50:53 +05:30
Trisha Anand
63852041de Merge branch 'bug/delete-application-app-viewer' into 'release' 
Bug Fix : Application and page can only be deleted if you have manage application/page permissions respectively.

See merge request theappsmith/internal-tools-server!395
 2020-06-18 10:20:50 +00:00
Shrikant Kandula
f19764ab99 Merge branch 'bug/space-not-needed-in-header-in-curl' into 'release' 
Fix parse error when there's a space in header in curl command

See merge request theappsmith/internal-tools-server!390
 2020-06-18 10:11:39 +00:00
Trisha Anand
4337e88934 Application and page can only be deleted if you have manage application/page permissions respectively. 2020-06-18 15:35:30 +05:30
Shrikant Kandula
1d5fa960db Fail with an error if can't find page when creating an action 2020-06-18 15:05:55 +05:30
Abhinav Jha
82e3b4ffa7 Merge branch 'fix/modal-overlay' into 'release' 
Fix modal overlay covering widget cards pane issue

See merge request theappsmith/internal-tools-client!743
 2020-06-18 09:25:41 +00:00
Abhinav Jha
fb8fd1b2aa Merge branch 'fix/chart-widget-crash' into 'release' 
Fix the chart widget crash issue

- Fix chart widget crash issue which was caused due to incorrect default values.

See merge request theappsmith/internal-tools-client!744
 2020-06-18 09:25:05 +00:00
Abhinav Jha
e9377d8187 Add singleChartData to chartData migration 2020-06-18 14:31:12 +05:30
Arpit Mohan
69dd082cf6 Merge branch 'bug/acl-invite-not-null-assertion' into 'release' 
Invite User to Organisation : Throw a bad request error in case all the invite dto fields are not set.

See merge request theappsmith/internal-tools-server!393
 2020-06-18 08:45:51 +00:00
Satbir Singh
2c36fbeb00 Merge branch 'fix/backmerge' into 'release' 
Backmerge master to release.

See merge request theappsmith/internal-tools-client!746
 2020-06-18 08:39:46 +00:00
Satbir Singh
bb54ffcd0c Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into fix/backmerge 2020-06-18 14:07:23 +05:30
Trisha Anand
ec8c63bfee For invitation, throw a bad request error in case all the invite dto fields are not set. 2020-06-18 14:05:48 +05:30
Abhinav Jha
8add047d70 Cleanup 2020-06-18 13:18:19 +05:30
Satbir Singh
56f714a6a0 Merge branch 'hotfix/edit-perf' into 'master' 
Fixing performance issue in apiName

See merge request theappsmith/internal-tools-client!742
 2020-06-18 07:46:53 +00:00
Satbir Singh
fd3f4c2028 Fixing performance issue in apiName 2020-06-18 07:46:53 +00:00
Abhinav Jha
1d2e165a71 Fix the chart widget crash issue 2020-06-18 13:16:04 +05:30
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