Skip to content

Conversation

@jbadan
Copy link
Contributor

@jbadan jbadan commented Jan 4, 2019

Fix merge conflicts that were accidentally checked in by travis automation.

bcullman and others added 30 commits December 18, 2018 13:44
* eject from create react app; prep for linting
* remove babel config from package.json
* sort deps
* remove npm warning about missing repostory field
* remove dupe jest dep warning
* init lint; comment out failing lints
* eslint fix: comma-dangle
* eslint fix: comma-spacing
* eslint fix: comma-style
* eslint fix: dot-notation
* eslint fix: eol-last
* eslint fix: keyword-spacing
* eslint fix: jsx-quotes
* eslint fix: no-multi-spaces
* eslint fix: no-trailing-spaces
* eslint fix: quote-props
* eslint fix: semi
* eslint fix: space-before-blocks
* eslint fix: semi-spacing
* eslint fix: space-infix-ops
* eslint fix: space-before-function-paren
* eslint fix: react/sort-prop-types
* eslint fix: react/self-closing-comp
* eslint fix: react/prop-types
* eslint fix: react/jsx-tag-spacing
* eslint fix: react/jsx-max-props-per-line
* eslint fix: react/jsx-indent-props
* eslint fix: react/jsx-indent
* eslint fix: react/jsx-equals-spacing
* eslint fix: react/jsx-closing-bracket-location
* eslint fix: react/jsx-boolean-value
* eslint fix: quotes
* eslint fix: loosely-restrict-imports/loosely-restrict-imports
* IE11 Polyfill for babel

* Removing Object.includes from Datepicker

* fix package.json sort
* add helper package.json scripts

* emit coverage for travis run

* add build for fix branches
…ng rules (#118)

* more lint extend react-app to eslintrc. comment out due to failing rules

* remove test scripts
…#123)

* Issue#90: adds shellbar component implementation, popover refactoring

* Issue#90: failing test for popover
* update webpack-dev-server to 3.1.14

* update

* fix failing unit test
* Issue#93: adds className and spread props for Button and ActionBar

* Issue#93: adds className and spread props for Alert and Status Indicators

* Issue#93: adds className and spread props for Breadcrumb and Calendar

* Issue#93: fix broken tests

* Issue#93: adds className and spread props Combobox, DatePicker and Dropdown

* Issue#93: adds className and spread props for Forms

* Issue#93: adds className and spread props for Icon, Identifier and Image

* Issue#93: adds className and spread props for the rest of the components

* Issue#93: adds ...props for the Popover, Search Input and Tabs

* Issue#93: adds omitted ...props for the Calendar, adds new snapshots for Dropdown and Popover after adding ...props
* update unit tests

* updated test cases for className, init test for ShellBar

* fixes the broken Show Code btn functionality
#128)

* Adds icons and notification count in the dropdown menu when items collapse

* fixes failing tests and build

* deals with some console warnings realted to passing the props from Date Picker to Calendar
* 📚 issue #124 add copy button for documentation code

* 📚 issue #124 center button

* 📚 issue #124 fix css error
…136)

* adds onChange props, option to hide the search btn and compact mode for Search Input component

* adds new snapshot for the search input test

* adds an example with custom onChange func
@jbadan jbadan merged commit bde4634 into master Jan 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants