Commit Graph

99 Commits

Author SHA1 Message Date
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
Abhinav Jha
71029406d7 Fixes #5 and #9. Fix build script. Remove public files. Code Review Fixes 2019-09-16 17:08:37 +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
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
Abhinav Jha
29d6bd52da WIP: Workflow fixes 2019-09-06 17:10:00 +05:30
Abhinav Jha
5a5a5019be Merge branch 'release' into 'master'
Release

Closes #2

See merge request theappsmith/internal-tools-client!14
2019-09-06 09:43:00 +00:00
Abhinav Jha
53091a52d0 Merge branch 'feature/basic-styling' into 'release'
Feature/basic styling

See merge request theappsmith/internal-tools-client!13
2019-09-06 09:37:49 +00:00
Abhinav Jha
c23724effe Resolve #2 Basic Editor Styling
- Add Widget Icons
- Font face observer
- Widget Pane styling based on Theme
2019-09-06 15:00:22 +05:30
gray
6284f07c76 Add default theme base 2019-09-05 23:17:50 +05:30
Nikhil Nandagopal
8d13ae3895 minor fix for protection 2019-09-03 13:48:14 +05:30
Abhinav Jha
773b6dcd68 Merge branch 'feature/dnd_v1' into 'master'
Feature/dnd v1

See merge request theappsmith/internal-tools-client!12
2019-09-03 03:40:53 +00:00
Abhinav Jha
a3ccf9f3c3 Fix merge conflicts with master - 3-sept 2019-09-03 08:35:37 +05:30
Nikhil Nandagopal
ebe31f4acb fixes for netlify user identity 2019-09-02 21:06:24 +05:30
Nikhil Nandagopal
46237873bd Merge branch 'feature/integration' 2019-09-02 20:20:25 +05:30
Nikhil Nandagopal
588db871ee added protecrted routes and login page 2019-09-02 20:20:01 +05:30
Nikhil Nandagopal
744e5b7043 fixed redirect 2019-09-02 18:05:18 +05:30
Nikhil Nandagopal
4c2e44d366 minor fix 2019-09-02 17:57:55 +05:30
Abhinav Jha
d0f676be09 Fix issues caused to UI after resolving merge conflicts 2019-09-02 17:55:17 +05:30
Nikhil Nandagopal
ebe70b0e99 added redirects file 2019-09-02 17:51:36 +05:30
Abhinav Jha
1f2e0f8dd0 Fix Merge Conflicts with master 2019-09-02 17:45:41 +05:30
Abhinav Jha
cf5ec97bb0 Drag drop monitor, code cleanup 2019-09-02 16:28:11 +05:30
Nikhil Nandagopal
892448db33 Merge branch 'feature/integration' 2019-09-02 16:26:39 +05:30
Nikhil Nandagopal
bf69b401e7 removed identity widget 2019-09-02 14:00:57 +05:30
Nikhil Nandagopal
267314b35c Merge branch 'feature/integration' into 'master'
removed package lock

See merge request theappsmith/internal-tools-client!11
2019-09-02 07:10:39 +00:00
Nikhil Nandagopal
f588373918 removed package lock
fixed yarn
2019-09-02 12:39:29 +05:30
Nikhil Nandagopal
351be76c1d Merge branch 'feature/integration' into 'master'
added netlify auth widget

See merge request theappsmith/internal-tools-client!10
2019-09-02 06:43:58 +00:00
Nikhil Nandagopal
ca4bad77bc added netlify auth widget 2019-09-02 12:08:13 +05:30