Commit Graph

10 Commits

Author SHA1 Message Date
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
Nikhil Nandagopal
f905417242 added actions & executor sagas 2019-09-13 15:26:11 +05:30
Nikhil Nandagopal
be5c516db8 added json path
added action interfaces
2019-09-12 16:49:38 +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
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
Abhinav Jha
d0f676be09 Fix issues caused to UI after resolving merge conflicts 2019-09-02 17:55:17 +05:30
Abhinav Jha
cf5ec97bb0 Drag drop monitor, code cleanup 2019-09-02 16:28:11 +05:30
Abhinav Jha
babc8fcfcd Linting, fixes, dragpreview fix 2019-08-29 16:52:09 +05:30
Abhinav Jha
02af80d3dc Implement Drag and Drop of components 2019-08-26 18:11:21 +05:30