Commit Graph

19139 Commits

Author SHA1 Message Date
Abhinav Jha
20a3e19ad3 WIP: code changes to allow for dragging and dropping 2019-09-17 15:39:00 +05:30
Trisha Anand
16dca65a64 Merge branch 'feature/docker-ci-cd' into 'master'
Docker

See merge request theappsmith/internal-tools-server!19
2019-09-17 09:35:13 +00:00
Trisha Anand
4498a301a6 Docker 2019-09-17 09:35:13 +00:00
Trisha Anand
b4643dd6fd Merge branch 'action-changes-review' into 'master'
Incorporated review comments from Nikhil on action

See merge request theappsmith/internal-tools-server!18
2019-09-17 07:23:30 +00:00
Trisha Anand
14ec5260d9 Incorporated review comments from Nikhil on action 2019-09-17 07:23:30 +00:00
Trisha Anand
7c1561a969 Merge branch 'bug/#53' into 'master'
Add Page Actions to Page object.

Closes #53

See merge request theappsmith/internal-tools-server!16
2019-09-17 06:25:07 +00:00
Trisha Anand
5468436d9f Add Page Actions to Page object. 2019-09-17 06:25:07 +00:00
Nikhil Nandagopal
a4fb46fd67 Merge branch 'feature/widget-cards-pane' into 'release'
Feature/widget cards pane

See merge request theappsmith/internal-tools-client!21
2019-09-16 15:45:27 +00:00
Arpit Mohan
f5ea85f636 Running only part of build.sh in the buildpack-run.sh. This is because all the buildpacks in Heroku are run sequentially 2019-09-16 17:19:55 +05:30
Arpit Mohan
cdba3a5b68 Adding Procfile for custom run command in Heroku 2019-09-16 17:12:26 +05:30
Abhinav Jha
71029406d7 Fixes #5 and #9. Fix build script. Remove public files. Code Review Fixes 2019-09-16 17:08:37 +05:30
Arpit Mohan
bb84e74c23 Re-arranging the files to fix bad merge that threw compile errors 2019-09-16 17:04:07 +05:30
Arpit Mohan
661111daaa Setting java version to 11 in system.properties.
This is required by Java Heroku buildpack
2019-09-16 16:54:28 +05:30
Arpit Mohan
dc7ede7c4f Merge branch 'feature/pf4j' into 'master'
See merge request theappsmith/internal-tools-server!17
2019-09-16 11:21:57 +00:00
Arpit Mohan
b3c987a9f9 Convert the project into a multi-module structure
We are moving to a multi-module structure so that different parts of the codebase can be exposed to the public while others can remain private. Using pf4j for plugin framework.

Also adding a build script `build.sh` which compiles the code and creates the `dist` folder for distribution purposes. Now we can build the code via

```
$ ./build.sh -DskipTests
```
2019-09-16 11:21:57 +00:00
Nikhil Nandagopal
a8adc4e5f3 ran lint & prettier manually 2019-09-16 16:07:38 +05:30
Nikhil Nandagopal
1861ca89cd WIP:dummy 2019-09-16 16:02:35 +05:30
Nikhil Nandagopal
635982ad95 WIP:dummy 2019-09-16 16:01:23 +05:30
Abhinav Jha
e6f5588488 Remove canvas poc code. Create build script for generating font files 2019-09-16 13:38:03 +05:30
Abhinav Jha
9fbde3261a Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into feature/widget-cards-pane 2019-09-16 11:46:28 +05:30
Abhinav Jha
ebdcfa0819 Merge branch 'feature/actions' into 'release'
Feature/actions

See merge request theappsmith/internal-tools-client!20
2019-09-13 13:30:51 +00:00
Nikhil Nandagopal
4aa07970d7 minor fix 2019-09-13 17:32:28 +05:30
Nikhil Nandagopal
1baff6d93c Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into feature/actions
# Conflicts:
#	package.json
#	src/actions/pageActions.tsx
#	src/actions/widgetCardsPaneActions.tsx
#	src/api/Api.tsx
#	src/api/ApiRequests.tsx
#	src/api/ApiResponses.tsx
#	src/api/WidgetCardsPaneApi.tsx
#	src/constants/ActionConstants.tsx
#	src/constants/ApiConstants.tsx
#	src/normalizers/CanvasWidgetsNormalizer.tsx
#	src/reducers/entityReducers/canvasWidgetsReducer.tsx
#	src/reducers/entityReducers/index.tsx
#	src/reducers/entityReducers/widgetConfigReducer.tsx.tsx
#	src/reducers/index.tsx
#	src/reducers/uiReducers/canvasReducer.tsx
#	src/reducers/uiReducers/editorReducer.tsx
#	src/reducers/uiReducers/widgetCardsPaneReducer.tsx
#	src/sagas/PageSagas.tsx
#	src/sagas/WidgetCardsPaneSagas.tsx
#	src/sagas/index.tsx
#	src/utils/AppsmithUtils.tsx
#	src/widgets/AlertWidget.tsx
#	src/widgets/ButtonWidget.tsx
#	src/widgets/CheckboxWidget.tsx
#	src/widgets/DatePickerWidget.tsx
#	src/widgets/DropdownWidget.tsx
#	src/widgets/RadioGroupWidget.tsx
#	src/widgets/TableWidget.tsx
2019-09-13 17:29:45 +05:30
Abhinav Jha
01d3e46a63 Fix Merge conflicts. Fixes #5 2019-09-13 17:00:22 +05:30
Nikhil Nandagopal
8db06d4ba5 Merge branch 'feature/basic-styling' into 'release'
Feature/basic styling

See merge request theappsmith/internal-tools-client!15
2019-09-13 10:48:30 +00:00
Nikhil Nandagopal
29cf9bb450 Merge branch 'release' into feature/basic-styling
# Conflicts:
#	src/constants/ActionConstants.tsx
#	src/constants/WidgetConstants.tsx
#	src/editorComponents/CheckboxComponent.tsx
#	src/editorComponents/RadioGroupComponent.tsx
#	src/mockResponses/WidgetCardsPaneResponse.tsx
#	src/pages/Editor/Canvas.tsx
#	src/pages/Editor/EditorDragLayer.tsx
#	src/reducers/entityReducers/index.tsx
#	src/reducers/index.tsx
#	src/utils/WidgetRegistry.tsx
#	src/widgets/BaseWidget.tsx
#	src/widgets/BreadcrumbsWidget.tsx
#	src/widgets/ButtonWidget.tsx
#	src/widgets/CalloutWidget.tsx
#	src/widgets/CheckboxWidget.tsx
#	src/widgets/IconWidget.tsx
#	src/widgets/InputGroupWidget.tsx
#	src/widgets/NumericInputWidget.tsx
#	src/widgets/RadioGroupWidget.tsx
#	src/widgets/TagInputWidget.tsx
#	src/widgets/TextWidget.tsx
2019-09-13 16:15:49 +05:30
Nikhil Nandagopal
f905417242 added actions & executor sagas 2019-09-13 15:26:11 +05:30
Abhinav Jha
7f28788c6a Merge branch 'feature/widget_properties' into 'release'
Feature/widget properties

See merge request theappsmith/internal-tools-client!19
2019-09-13 09:53:53 +00:00
Nikhil Nandagopal
cbc23349c7 added api & query data in entities 2019-09-12 19:14:25 +05:30
Nikhil Nandagopal
6bd89d65a1 added action events to widgets 2019-09-12 17:49:46 +05:30
Nikhil Nandagopal
a33074af79 added action API & interfaces 2019-09-12 17:14:18 +05:30
Nikhil Nandagopal
be5c516db8 added json path
added action interfaces
2019-09-12 16:49:38 +05:30
Nikhil Nandagopal
cd1b088568 added widget config reducer 2019-09-12 13:41:25 +05:30
Trisha Anand
57f98d7581 Merge branch 'bug/nestedDataLayout' into 'master'
Fixes nested data object in Layout. Renamed data to 'dsl'

Closes #43

See merge request theappsmith/internal-tools-server!15
2019-09-11 11:51:25 +00:00
Trisha Anand
467b3e6db5 Fixes nested data object in Layout. Renamed data to 'dsl' 2019-09-11 11:51:25 +00:00
Trisha Anand
e6ef59295a Merge branch 'feature/page-crud' into 'master'
CRUD for pages and layouts.

Closes #33

See merge request theappsmith/internal-tools-server!14
2019-09-11 10:44:31 +00:00
Trisha Anand
07614d8980 CRUD for pages and layouts. 2019-09-11 10:44:31 +00:00
Abhinav Jha
8e8866175c Resolve #5
- Add Missing Icons
- Remove extraneous components (for Beta)
- Add missing widget cards
2019-09-10 16:31:48 +05:30
Abhinav Jha
3136515f23 Merge branch 'feature/basic-styling' into 'develop'
Feature/basic styling

See merge request theappsmith/internal-tools-client!16
2019-09-09 11:57:29 +00:00
Abhinav Jha
2aeff35ea4 Resolve #2 2019-09-09 16:39:13 +05:30
Abhinav Jha
51d2284c6b Merge branch 'feature/basic-styling' of gitlab.com:theappsmith/internal-tools-client into feature/basic-styling 2019-09-09 16:33:10 +05:30
Abhinav Jha
aafea7a05f Resolve #2
- Update to latest react-router-dom version
2019-09-09 16:31:18 +05:30
Abhinav Jha
054b3e85da Update to latest react-router-dom version 2019-09-09 16:25:11 +05:30
Abhinav Jha
69eeb8c586 WIP: Remove extra lint-staged config 2019-09-09 16:02:04 +05:30
Abhinav Jha
6f19e0d17a WIP: Fix Prettier formatting issues and add precommit hook 2019-09-09 16:00:22 +05:30
Abhinav Jha
b9718bdaec WIP: Fix eslint errors 2019-09-09 14:38:54 +05:30
Abhinav Jha
2c34b6d09b WIP: Generate font icons from SVGs using CLI 2019-09-09 13:53:53 +05:30
Trisha Anand
59f85cef96 Merge branch 'app-crud' into 'master'
Application CRUD

See merge request theappsmith/internal-tools-server!13
2019-09-09 06:54:36 +00:00
Trisha Anand
7e0cb75ed2 Added domains for application and pages. Edited the layout domain to make it an embedded object inside a page instead of existing in the database on its own. 2019-09-09 06:54:36 +00:00
Arpit Mohan
a03c0a8bde Merge branch 'feature/oauth2-custom-domain' into 'master'
A hacky approach to limiting the Google OAuth2 to a set of custom domains.

Closes #18

See merge request theappsmith/internal-tools-server!12
2019-09-09 05:16:42 +00:00