Commit Graph

18100 Commits

Author SHA1 Message Date
Shrikant Kandula
8ea8fb295e Handle 500 when JSON body doesn't make up an object data type. 2020-04-30 13:32:24 +00:00
Shrikant Kandula
ee18dc5685 Merge branch 'bug/invalid-content-type-throws-500' into 'release'
Check the value of `Content-Type` before trying to make an HTTP call.

See merge request theappsmith/internal-tools-server!315
2020-04-30 12:30:17 +00:00
Trisha Anand
bc99ce9244 Merge branch 'release' into feature/acl-spring-object 2020-04-30 17:50:32 +05:30
Shrikant Kandula
c8e8c9136d Check the value of Content-Type before trying to make an HTTP call. 2020-04-30 16:50:17 +05:30
Shrikant Kandula
50a8bad19e Merge branch 'bug/restapi-test-without-port' into 'release'
Fix testing of REST API datasources fails when no port is set.

See merge request theappsmith/internal-tools-server!307
2020-04-30 06:02:28 +00:00
Shrikant Kandula
be7f1c0a81 Fix testing of REST API datasources fails when no port is set. 2020-04-30 06:02:28 +00:00
Hetu Nandu
ac4353f076 Merge branch 'fix/plugin-name-usage' into 'release'
Remove references of plugin name

See merge request theappsmith/internal-tools-client!530
2020-04-29 13:17:51 +00:00
Hetu Nandu
2cf1b8d135 Remove references of plugin name 2020-04-29 13:17:51 +00:00
Hetu Nandu
744ce9f5af Merge branch 'feature/form-config-api' into 'release'
Datasource get form config from api

See merge request theappsmith/internal-tools-client!528
2020-04-29 12:08:41 +00:00
Akash N
4cd24112b1 Fix incorrect action type 2020-04-29 17:28:02 +05:30
Shrikant Kandula
68182f9b49 Merge branch 'feat/plugin-names' into 'release'
More readable plugin names.

See merge request theappsmith/internal-tools-server!303
2020-04-29 11:49:06 +00:00
Shrikant Kandula
fc1b73773e More readable plugin names. 2020-04-29 11:49:06 +00:00
Shrikant Kandula
86669fa7e4 Merge branch 'feat/updated-plugin-form-configs' into 'release'
Update form.json for datasource configurations.

See merge request theappsmith/internal-tools-server!314
2020-04-29 10:59:46 +00:00
Shrikant Kandula
06e85c308f Update form.json for datasource configurations. 2020-04-29 16:25:30 +05:30
Akash N
cf0da78dd4 Merge branch 'release' of https://gitlab.com/theappsmith/internal-tools-client into feature/form-config-api 2020-04-29 16:21:11 +05:30
Shrikant Kandula
a8c2377420 Merge branch 'bug/index-include-deleted-field' into 'release'
Add `deletedAt` field into the unique index of datasources and pages.

See merge request theappsmith/internal-tools-server!313
2020-04-29 10:50:26 +00:00
Shrikant Kandula
7dfa1bd8ca Add deletedAt field into the unique index of datasources and pages. 2020-04-29 16:16:09 +05:30
Abhinav Jha
2493c12d62 Merge branch 'fix/map-tab-issues' into 'release'
Fix/map tab issues

*  Chart widget property pane "Add data" renamed to "Add Series"
*  Tabs widgets, display adding tabs in pane configurations
*  Clicking Pick my location will not trigger onMarkerCreated action
* Added generateClassName in tabs widget
* Date picker flicker time after selection issue fix

See merge request theappsmith/internal-tools-client!493
2020-04-29 10:29:02 +00:00
Vicky Bansal
1f9294b608 Fix/map tab issues 2020-04-29 10:29:02 +00:00
Abhinav Jha
3e2dea745f Merge branch 'fix/widget-name-restrictions' into 'release'
Widget Name Restrictions

- Add restrictions to widget name. Conflicts with Widget Names, Page Names and Action Names

See merge request theappsmith/internal-tools-client!509
2020-04-29 10:20:12 +00:00
Abhinav Jha
7b0f659ff2 Widget Name Restrictions 2020-04-29 10:20:12 +00:00
Trisha Anand
8db71d00a9 Merge branch 'release' into feature/acl-spring-object 2020-04-29 15:49:57 +05:30
Trisha Anand
90ac43a831 Merge branch 'bug/copy-3p-action' into 'release'
Create action with template id was leading to mock response. Removed this.

See merge request theappsmith/internal-tools-server!312
2020-04-29 10:19:01 +00:00
Trisha Anand
89f179397f Create action with template id was leading to mock response. Removing this to allow for copy of actions which have been created using 3p API 2020-04-29 10:19:01 +00:00
Abhinav Jha
6478f4a4ac Merge branch 'fix/container-colore' into 'release'
Fix Container background color

Fix for issue: Canvas background was being set in templates, as a result, container's background wasn't perceived to be set.

See merge request theappsmith/internal-tools-client!523
2020-04-29 10:09:27 +00:00
Abhinav Jha
d6c1e9b0c7 Fix Container background color 2020-04-29 10:09:27 +00:00
Hetu Nandu
76c722d0a7 Merge branch 'feature/deleteDatasource' into 'release'
Delete datasource

See merge request theappsmith/internal-tools-client!527
2020-04-29 10:03:56 +00:00
Hetu Nandu
061292bd8a Datasource bug fixes
- Prefill datasource title
- Decrease field width
- Save button should have loading state
- Back button in form screen
- Right align save button
- Add new plugin images
and other fixes
2020-04-29 10:03:56 +00:00
Abhinav Jha
06bc85ac12 Merge branch 'fix/page-name-breadcrumbs' into 'release'
Page Name updates

- Remove use of `reselect` in `editorSelectors`. 
- Rename action from UPDATE_CURRENT_PAGE to SWITCH_CURRENT_PAGE_ID. 
- Update new page name in bread crumbs

See merge request theappsmith/internal-tools-client!503
2020-04-29 09:41:30 +00:00
Abhinav Jha
299c2fbbb2 Remove use of reselect in editorSelectors. Rename action from UPDATE_CURRENT_PAGE to SWITCH_CURRENT_PAGE_ID. Update new page name in bread crumbs 2020-04-29 09:41:30 +00:00
Trisha Anand
0b496e1ecc Untested add policies to an object code. 2020-04-29 15:03:56 +05:30
Akash N
9c1991aaa3 Get form configs from api 2020-04-29 14:53:23 +05:30
Hetu Nandu
bca47fb3f5 Merge branch 'feat/apiProviderSearch' into 'release'
Api pane provider search

See merge request theappsmith/internal-tools-client!515
2020-04-29 09:06:31 +00:00
Hetu Nandu
7174ce0a8a fix: search container ui fixes
- remove unwanted imports
2020-04-29 09:06:30 +00:00
Satbir Singh
517f4b7ce0 Merge branch 'feature/nav-dyn-bind' into 'release'
NavigateTo dynamic binding support

See merge request theappsmith/internal-tools-client!498
2020-04-29 05:35:02 +00:00
Satbir Singh
141d556334 NavigateTo dynamic binding support 2020-04-29 05:35:02 +00:00
Satbir Singh
79a597b799 Merge branch 'fix/table-scroll' into 'release'
Fixing table scroll on load issue.

See merge request theappsmith/internal-tools-client!500
2020-04-29 05:13:02 +00:00
Satbir Singh
275518da4c Fixing table scroll on load issue. 2020-04-29 05:13:02 +00:00
Shrikant Kandula
1cd3c94e9e Merge branch 'bug/hide-rapid-api-from-datasource-create-view' into 'release'
Add `allowUserDatasources` to plugins to hide from create datasource UI.

See merge request theappsmith/internal-tools-server!310
2020-04-28 12:44:56 +00:00
Shrikant Kandula
079e185ed2 Add allowUserDatasources to plugins to hide from create datasource UI. 2020-04-28 12:44:56 +00:00
Trisha Anand
2d1fe9d8b4 Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	appsmith-interfaces/src/main/java/com/appsmith/external/models/SSHPrivateKey.java
#	appsmith-server/src/main/java/com/appsmith/server/filters/AclFilter.java
#	appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
#	appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
2020-04-28 18:13:06 +05:30
Shrikant Kandula
b161ff1403 Merge branch 'feat/no-ssl-option-for-plugins' into 'release'
Add NO_SSL option to SSL authType to turn off SSL explicitly.

See merge request theappsmith/internal-tools-server!311
2020-04-28 12:31:34 +00:00
Shrikant Kandula
23bd4e1722 Add NO_SSL option to SSL authType to turn off SSL explicitly. 2020-04-28 12:31:34 +00:00
Trisha Anand
790a329581 Merge branch 'bug/search-marketplace-URI-encoding' into 'release'
URL decoding the provider name before searching for it.

See merge request theappsmith/internal-tools-server!309
2020-04-28 11:06:27 +00:00
Trisha Anand
219a594a4c URL decoding the name before searching for it. 2020-04-28 16:31:19 +05:30
Trisha Anand
e99ede9d86 Minor comments added for TODOs 2020-04-28 16:18:28 +05:30
Hetu Nandu
20921d4578 Merge branch 'fix/api-pane-fixes' into 'release'
Fix provider cards ui fixes

See merge request theappsmith/internal-tools-client!514
2020-04-28 10:47:59 +00:00
Hetu Nandu
89ab91361e fix: provider cards ui fixes
- alignment of provider cards in api home screen fixes
- do not load the providers if already present
- fix 'Add to page' button moving on cliick in provider templates
2020-04-28 10:47:59 +00:00
Shrikant Kandula
89d04f11e7 Merge branch 'bug/show-password-in-datasource-form' into 'release'
Show passwords in datasource forms.

See merge request theappsmith/internal-tools-server!308
2020-04-28 09:34:46 +00:00
Shrikant Kandula
b092692922 Merge branch 'bug/npe-if-opa-not-ready' into 'release'
Fix NPE when accessing services before OPA is ready.

See merge request theappsmith/internal-tools-server!300
2020-04-28 09:22:05 +00:00