Commit Graph

5314 Commits

Author SHA1 Message Date
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
Trisha Anand
566a56778a Merge branch 'bug/restApi' into 'master'
Bug/rest api

Closes #70

See merge request theappsmith/internal-tools-server!54
2019-11-04 11:20:18 +00:00
Trisha Anand
daeba007a1 Bug/rest api 2019-11-04 11:20:18 +00:00
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
Satbir Singh
04b29272f4 Table data array input now uses code editor. 2019-11-04 08:31:08 +00:00
Nikhil Nandagopal
2d6a20a7c7 added uppy filepicker 2019-11-01 17:23:24 +05:30
Arpit Mohan
023ef93969 Fixing Heroku credentials again. Need to find permanent solution to this. 2019-11-01 08:52:20 +01:00
Hetu Nandu
ecbd6cd067 Merge branch 'dynamic-binding-scaffold' into 'release'
Dynamic binding scaffold

See merge request theappsmith/internal-tools-client!104
2019-11-01 07:11:32 +00:00
Hetu Nandu
e380c489fb Dynamic binding scaffold 2019-11-01 07:11:32 +00:00
Abhinav Jha
197b0635d8 Merge branch 'feature/appviewer-theming' into 'release'
Feature- AppViewer SideNav Styling

See merge request theappsmith/internal-tools-client!105
2019-11-01 05:28:56 +00:00
Abhinav Jha
79bcd06141 Feature- AppViewer SideNav Styling 2019-11-01 05:28:56 +00:00
Nikhil Nandagopal
7ffd2416d6 Merge branch 'feature/image' into 'release'
Feature/image

See merge request theappsmith/internal-tools-client!103
2019-10-31 11:26:37 +00:00
Nikhil Nandagopal
f1804ebc47 Feature/image 2019-10-31 11:26:37 +00:00
Nikhil Nandagopal
765f6f3d07 Merge branch 'feature/table-component' into 'release'
Table will construct columns based on all data

See merge request theappsmith/internal-tools-client!102
2019-10-31 11:13:59 +00:00
Satbir Singh
f225266edb Table will construct columns based on all data 2019-10-31 11:13:59 +00:00
Nikhil Nandagopal
9339dd61f5 Merge branch 'feature/table-component' into 'release'
Adding table widget.

See merge request theappsmith/internal-tools-client!101
2019-10-31 10:10:57 +00:00
Satbir Singh
f5cf26f23f Adding table widget. 2019-10-31 10:10:57 +00:00
Hetu Nandu
64e8a6c68e Merge branch 'refactor/code-editor' into 'release'
Passing height and language as props to CodeEditor

See merge request theappsmith/internal-tools-client!100
2019-10-31 10:00:48 +00:00
Satbir Singh
7f7221ee9a Passing height and language as props to CodeEditor 2019-10-31 10:00:47 +00:00
Hetu Nandu
c65868c96b Merge branch 'feature/checkbox-radio' into 'release'
Added wiring for checkbox & radio button properties

See merge request theappsmith/internal-tools-client!99
2019-10-31 09:36:02 +00:00
Nikhil Nandagopal
d3179745d4 Merge branch 'release' into feature/checkbox-radio
# Conflicts:
#	src/propertyControls/StyledControls.tsx
2019-10-31 14:50:03 +05:30
Nikhil Nandagopal
e3e27e3754 Added wiring for checkbox & radio button properties 2019-10-31 14:34:19 +05:30
Abhinav Jha
2dedaf3ff1 Merge branch 'release' into 'master'
Release

Closes #114, #115, #118, #119, #133, #157, #160, #161, #162, #163, #164, #165, #169, #168, #167, #166, #151, and #22

See merge request theappsmith/internal-tools-client!98
2019-10-31 08:44:18 +00:00
Satbir Singh
d1248eb5fb Merge branch 'feature/application-preview' into 'release'
Feature - Application View

See merge request theappsmith/internal-tools-client!96
2019-10-31 08:36:04 +00:00
Abhinav Jha
ffb9b89620 WIP: Page Creation, Page Switching, Published Application Viewer, DropdownComponent
- Fixes #22, #151, #166, #167, #168, #169
2019-10-31 08:36:04 +00:00
Nikhil Nandagopal
77ece27edc Merge branch 'feature/dropdown' into 'release'
Feature/dropdown

See merge request theappsmith/internal-tools-client!95
2019-10-31 05:28:12 +00:00
Nikhil Nandagopal
9d659ddff0 Feature/dropdown 2019-10-31 05:28:11 +00:00
Nikhil Nandagopal
3b393a8089 Merge branch 'feature/components' into 'release'
Feature/components

See merge request theappsmith/internal-tools-client!93
2019-10-30 10:23:20 +00:00
Nikhil Nandagopal
72a02bd3d4 Feature/components 2019-10-30 10:23:20 +00:00
Hetu Nandu
0a66c22805 Merge branch 'fix/api-pane-fixes-3' into 'release'
Few more api pane fixes

See merge request theappsmith/internal-tools-client!88
2019-10-29 12:02:59 +00:00
Hetu Nandu
4c5850499d Few more api pane fixes
Fixes: #165 #164 #163 #162 #161 #160 #157 #133 #119 #118 #115 #114
2019-10-29 12:02:58 +00:00
Satbir Singh
8b78ae927f Merge branch 'feature/resize-dot-missing' into 'release'
Resize dot added to top and left edges

See merge request theappsmith/internal-tools-client!92
2019-10-29 10:28:34 +00:00
Satbir
1be614ce6e Resize dot added to top and left edges 2019-10-29 15:33:04 +05:30
Abhinav Jha
5a6a9b310a Merge branch 'feature/border-css-refactor' into 'release'
getBorderCSSShorthand uses lodash for looping the object.

See merge request theappsmith/internal-tools-client!91
2019-10-29 07:11:36 +00:00
Satbir Singh
11708c3c09 getBorderCSSShorthand uses lodash for looping the object. 2019-10-29 07:11:36 +00:00
Satbir Singh
d6f6e37c76 Merge branch 'master' into 'release'
The resizable area is too large needs to be halved

See merge request theappsmith/internal-tools-client!90
2019-10-28 13:32:41 +00:00