Commit Graph

299 Commits

Author SHA1 Message Date
Nikhil Nandagopal
793ab07eed Merge branch 'master' into release
# Conflicts:
#	src/sagas/ActionSagas.ts
#	src/widgets/TableWidget.tsx
2019-11-12 14:09:37 +05:30
Nikhil Nandagopal
62ecb0f00f Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into release 2019-11-12 14:04:13 +05:30
Nikhil Nandagopal
8acfa99096 Merge branch 'feature/date-picker' into 'release'
Feature/date picker

See merge request theappsmith/internal-tools-client!131
2019-11-12 07:57:12 +00:00
Nikhil Nandagopal
3881fe699c Feature/date picker 2019-11-12 07:57:12 +00:00
Nikhil Nandagopal
2cc0e13006 Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into release 2019-11-12 12:06:46 +05:30
Satbir Singh
6bc39636a2 Merge branch 'feature/rowIndex' into 'release'
Selected row data has been moved from selectedRow.data to selectedRow

Previously, if you wanted to use selectedRow data in a field, you would do `{{selectedRow.data.<property>}}`
With this change, you only have to do `{{selectedRow.<property>}}`

See merge request theappsmith/internal-tools-client!129
2019-11-12 06:03:46 +00:00
Satbir Singh
20e829dceb Selected row data has been moved from selectedRow.data to selectedRow 2019-11-12 06:03:46 +00:00
Satbir Singh
91e7b6416c Merge branch 'feature/chaining' into 'release'
Added functionality to execute actions on successful call or on error of an action.

An action can be configured to have a onSuccess and onError action.

See merge request theappsmith/internal-tools-client!127
2019-11-12 05:22:32 +00:00
Satbir Singh
93c1b790d0 Added functionality to execute actions on successful call or on error of an action. 2019-11-12 05:22:32 +00:00
Nikhil Nandagopal
6dfbb4d445 Merge branch 'release' into 'master'
Release

See merge request theappsmith/internal-tools-client!125
2019-11-11 11:42:52 +00:00
Nikhil Nandagopal
1f40d135f3 Release 2019-11-11 11:42:52 +00:00
Nikhil Nandagopal
2a7508cc00 Merge branch 'master' into 'release'
Master

See merge request theappsmith/internal-tools-client!126
2019-11-11 11:34:43 +00:00
Nikhil Nandagopal
f0a57e8aab Master 2019-11-11 11:34:42 +00:00
Nikhil Nandagopal
be25ac3208 Merge branches 'master', 'release' and 'release' of gitlab.com:theappsmith/internal-tools-client into release 2019-11-11 17:01:25 +05:30
Hetu Nandu
45a168d1b9 Merge branch 'feature/view-dynamic-bindings' into 'release'
View Dynamic bindings

See merge request theappsmith/internal-tools-client!123
2019-11-08 11:02:00 +00:00
Hetu Nandu
f222c34b07 View Dynamic bindings 2019-11-08 11:02:00 +00:00
Satbir Singh
9bdeee7cee Merge branch 'feature/table-row-select' into 'release'
Row select action call

See merge request theappsmith/internal-tools-client!119
2019-11-07 11:17:53 +00:00
Satbir Singh
e06b7f5a2c Row select action call 2019-11-07 11:17:53 +00:00
Hetu Nandu
7013449b90 fix merge issues 2019-11-07 16:03:04 +05:30
Hetu Nandu
dc18277abc Merge branch 'release' 2019-11-07 15:45:33 +05:30
Hetu Nandu
1de6368646 Merge branch 'fix/rename-resources-to-dataSources' into 'release'
Rename "resources" to "datasources"

See merge request theappsmith/internal-tools-client!120
2019-11-07 09:32:38 +00:00
Hetu Nandu
7687d68b61 Rename "resources" to "datasources" 2019-11-07 09:32:38 +00:00
Abhinav Jha
0d8f84178e Merge branch 'feature/scaffold-application-create' into 'release'
Feature - Applications Scaffold Page - Create Application

See merge request theappsmith/internal-tools-client!117
2019-11-07 04:59:41 +00:00
Abhinav Jha
9ba528830d Feature - Applications Scaffold Page - Create Application 2019-11-07 04:59:40 +00:00
Nikhil Nandagopal
b244c4d784 Merge branch 'feature/date-picker' into 'release'
Feature/date picker

See merge request theappsmith/internal-tools-client!118
2019-11-06 12:12:41 +00:00
Nikhil Nandagopal
a031606fa1 Feature/date picker 2019-11-06 12:12:41 +00:00
Hetu Nandu
b7b92a9bdd Merge branch 'feature/dynamic-property-input' into 'release'
Dynamic Property in Editor mode

See merge request theappsmith/internal-tools-client!114
2019-11-06 06:35:15 +00:00
Hetu Nandu
895649d77f Dynamic Property in Editor mode 2019-11-06 06:35:15 +00:00
Nikhil Nandagopal
185abd9dc6 Merge branch 'feature/appviewer-page-routing' into 'release'
AppViewer - Routing updates the page

See merge request theappsmith/internal-tools-client!106
2019-11-06 06:21:56 +00:00
Abhinav Jha
ab8270536e AppViewer - Routing updates the page 2019-11-06 06:21:56 +00:00
Satbir Singh
747bf3e1ef Merge branch 'feature/actions' into 'release'
Adding action selector control.

See merge request theappsmith/internal-tools-client!115
2019-11-05 12:08:41 +00:00
Satbir Singh
cb478e8d1c Adding action selector control. 2019-11-05 12:08:41 +00:00
Arpit Mohan
fd5b79a869 Merge branch 'fix/json-string-post-body' into 'release'
Post body in API now only supports string

See merge request theappsmith/internal-tools-client!116
2019-11-05 11:17:46 +00:00
Hetu Nandu
48901e0f2e fix body as string 2019-11-05 16:20:58 +05:30
Nikhil Nandagopal
22629544d1 Merge branch 'release' into 'master'
Release

See merge request theappsmith/internal-tools-client!112
2019-11-05 05:09:50 +00:00
Nikhil Nandagopal
3e9f278b95 Release 2019-11-05 05:09:50 +00:00
Nikhil Nandagopal
54a6657c38 Merge branch 'feature/file-date-picker' into 'release'
Feature/file date picker

See merge request theappsmith/internal-tools-client!113
2019-11-05 05:06:16 +00:00
Nikhil Nandagopal
741cd6c025 Merge branch 'release' into feature/file-date-picker 2019-11-04 23:47:26 +05:30
Nikhil Nandagopal
fcae560b6e Merge branch 'master' into release 2019-11-04 23:46:56 +05:30
Nikhil Nandagopal
22d731517a Merge branch 'feature/file-date-picker' into 'release'
Feature/file date picker

See merge request theappsmith/internal-tools-client!108
2019-11-04 14:22:50 +00:00
Nikhil Nandagopal
735fbbcbd7 Feature/file date picker 2019-11-04 14:22:50 +00:00
Nikhil Nandagopal
e6b85465a6 added shallow equal 2019-11-04 19:47:48 +05:30
Nikhil Nandagopal
a1dcb98e44 added shallow compare 2019-11-04 17:47:35 +05:30
Nikhil Nandagopal
074d566e3c minor fixes 2019-11-04 16:57:35 +05:30
Nikhil Nandagopal
1cf180a5a8 removed logs 2019-11-04 16:50:21 +05:30
Nikhil Nandagopal
c7ce78c01b Merge branch 'release' into feature/file-date-picker
# Conflicts:
#	src/utils/PropertyControlRegistry.tsx
2019-11-04 16:48:29 +05:30
Nikhil Nandagopal
8cdc3f22ec Merge branch 'feature/folder-struct' into 'release'
refactored folder structure

See merge request theappsmith/internal-tools-client!111
2019-11-04 10:57:19 +00:00
Nikhil Nandagopal
11e8c456a5 refactored folder structure 2019-11-04 10:57:19 +00:00
Nikhil Nandagopal
d4ff6ba4a0 added should component update 2019-11-04 15:57:18 +05:30
Satbir Singh
3adfeae9f3 Merge branch 'feature/property-code-editor' into 'release'
Table data array input now uses code editor.

See merge request theappsmith/internal-tools-client!109
2019-11-04 08:31:08 +00:00