Commit Graph

13528 Commits

Author SHA1 Message Date
vicky_primathon.in
e950a3f935 wrapping action code issue fixed. tree component is changed. 2020-06-19 13:00:11 +05:30
Abhinav Jha
9681ae2c51 Merge branch 'fix/minor-bugs' into 'release'
fix: bug fixes

See merge request theappsmith/internal-tools-client!727
2020-06-19 07:26:29 +00:00
Shrikant Kandula
5ce19962a3 Merge branch 'chore/sending-email-should-be-nonblocking' into 'release'
Sending emails is now done in a non-blocking way

See merge request theappsmith/internal-tools-server!396
2020-06-19 07:14:43 +00:00
Nikhil Nandagopal
0ea0d5f3d1 Merge branch 'master' of gitlab.com:theappsmith/internal-tools-client into fix/date-picker-2 2020-06-19 11:58:33 +05:30
Tejaaswini
f3bc246ecb fix: revert changes 2020-06-19 11:25:20 +05:30
vicky_primathon.in
f1bc994888 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into fix/action-selectors 2020-06-18 23:22:20 +05:30
Satbir Singh
e2a30da1c3 Merge branch 'master' into 'release'
Backmerge master to release.

See merge request theappsmith/internal-tools-client!754
2020-06-18 16:24:21 +00:00
Hetu Nandu
8a80132820 Merge branch 'fix/date-picker-2' into 'master'
minor fix for date picker validator

See merge request theappsmith/internal-tools-client!748
2020-06-18 16:11:42 +00:00
Hetu Nandu
60b9bba24b Merge branch 'fix/hot-fixes-2' into 'master'
Action draft fixes

See merge request theappsmith/internal-tools-client!753
2020-06-18 14:16:49 +00:00
Hetu Nandu
ded1a130e3 Action draft fixes 2020-06-18 14:16:49 +00:00
Hetu Nandu
e6f0048f7d Merge branch 'fix/hot-fixes' into 'master'
Fix dropdown default value issue

See merge request theappsmith/internal-tools-client!749
2020-06-18 13:57:56 +00:00
Tejaaswini
c02acf21bc fix: Minor change 2020-06-18 18:01:56 +05:30
Tejaaswini
d4456b9653 Merge branch 'fix/minor-bugs' of https://gitlab.com/theappsmith/internal-tools-client into fix/minor-bugs 2020-06-18 17:48:41 +05:30
Tejaaswini
0ffff9db4f merge 'release' into 'fix/minor-bugs' 2020-06-18 17:46:46 +05:30
Shrikant Kandula
5f0a3034b8 Sending emails is now done in a non-blocking way 2020-06-18 17:29:36 +05:30
Tejaaswini
c34f06cf18 Merge branch 'release' into fix/minor-bugs 2020-06-18 17:27:27 +05:30
Nikhil Nandagopal
452c9adcf8 Merge branch 'master' of gitlab.com:theappsmith/internal-tools-client into fix/date-picker-2 2020-06-18 17:22:09 +05:30
vicky_primathon.in
700b74136e image validation regex updated to support query values 2020-06-18 16:53:11 +05:30
Hetu Nandu
549b9ba0ad Fix dropdown default value issue 2020-06-18 16:30:05 +05:30
Shrikant Kandula
70c312ca40 Merge branch 'bug/disallow-delete-datasource-with-actions' into 'release'
Fail deleting datasource if there's actions against it

See merge request theappsmith/internal-tools-server!388
2020-06-18 10:41:49 +00:00
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