Commit Graph

4 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
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
6bd89d65a1 added action events to widgets 2019-09-12 17:49:46 +05:30
Nikhil Nandagopal
cd1b088568 added widget config reducer 2019-09-12 13:41:25 +05:30