Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DDW-245] Integrate react-polymorph render props in Daedalus #950

Merged
merged 54 commits into from
Jul 23, 2018
Merged

[DDW-245] Integrate react-polymorph render props in Daedalus #950

merged 54 commits into from
Jul 23, 2018

Commits on May 29, 2018

  1. [DDW-245] Changes import syntax and paths for react-polymorph compone… 

    …nts to use new API
    @MarcusHurney
    MarcusHurney committed May 29, 2018
    Configuration menu
    Copy the full SHA
    6256b5d View commit details
    Browse the repository at this point in the history

  2. [DDW-245] Replaces react-css-themr ThemeProvider with react-polymorph… 

    … ThemeProvider
    @MarcusHurney
    MarcusHurney committed May 29, 2018
    Configuration menu
    Copy the full SHA
    1956f28 View commit details
    Browse the repository at this point in the history

  3. [DDW-245] Removes react-css-themr from dependencies

    @MarcusHurney
    MarcusHurney committed May 29, 2018
    Configuration menu
    Copy the full SHA
    e396312 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2018

  1. [DDW-245] Removes FormField wrapping Input components. Adds themeId t… 

    …o Checkbox component.
    @MarcusHurney
    MarcusHurney committed May 30, 2018
    Configuration menu
    Copy the full SHA
    da37ea0 View commit details
    Browse the repository at this point in the history

  2. [DDW-245] Removes react-css-themr dependency

    @MarcusHurney
    MarcusHurney committed May 30, 2018
    Configuration menu
    Copy the full SHA
    cbb07ae View commit details
    Browse the repository at this point in the history

  3. [DDW-245] Replaces react-css-themr ThemeProvider with react-polymorph's

    @MarcusHurney
    MarcusHurney committed May 30, 2018
    Configuration menu
    Copy the full SHA
    a366c07 View commit details
    Browse the repository at this point in the history

  4. [DDW-245] Removes FormField rendering Inputs. Passes label directly t… 

    …o Inputs.
    @MarcusHurney
    MarcusHurney committed May 30, 2018
    Configuration menu
    Copy the full SHA
    27058fa View commit details
    Browse the repository at this point in the history

  5. [DDW-245] Implements new react-polymorph API in import statements and… 

    … components' skin prop
    @MarcusHurney
    MarcusHurney committed May 30, 2018
    Configuration menu
    Copy the full SHA
    6a5a809 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' of github.com:input-output-hk/daedalus into ch… 

    …ore/ddw-245-integrate-react-polymorph-render-props-in-Daedalus

[DDW-245] Pulls latest from develop branch
    @MarcusHurney
    MarcusHurney committed May 30, 2018
    Configuration menu
    Copy the full SHA
    efe890b View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. [DDW-245] Corrects name of label prop for displaying wallet name

    @MarcusHurney
    MarcusHurney committed May 31, 2018
    Configuration menu
    Copy the full SHA
    4604ca4 View commit details
    Browse the repository at this point in the history

  2. [DDW-245] Updates CHANGELOG

    @MarcusHurney
    MarcusHurney committed May 31, 2018
    Configuration menu
    Copy the full SHA
    363d8c2 View commit details
    Browse the repository at this point in the history

  3. [DDW-245] Updates StoryDecorator.js to use react-polymorph ThemeProvider

    @MarcusHurney
    MarcusHurney committed May 31, 2018
    Configuration menu
    Copy the full SHA
    f82bd0d View commit details
    Browse the repository at this point in the history

  4. [DDW-245] Corrects InputSkin import path

    @MarcusHurney
    MarcusHurney committed May 31, 2018
    Configuration menu
    Copy the full SHA
    888f2ca View commit details
    Browse the repository at this point in the history

  5. [DDW-245] Updates yarn.lock

    @MarcusHurney
    MarcusHurney committed May 31, 2018
    Configuration menu
    Copy the full SHA
    039a673 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. [DDW-245] Updates line numbers in defaultMessages.json

    @MarcusHurney
    MarcusHurney committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    70b35f1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:input-output-hk/daedalus into ch… 

    …ore/ddw-245-integrate-react-polymorph-render-props-in-Daedalus

Pulls latest from develop branch into chore/ddw-245
    @MarcusHurney
    MarcusHurney committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    4095dec View commit details
    Browse the repository at this point in the history

  3. [DDW-245] Adds themeId prop for Checkbox component within TinySwitch.js

    @MarcusHurney
    MarcusHurney committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    782f055 View commit details
    Browse the repository at this point in the history

  4. [DDW-245] Adds themeId prop to Checkbox components with SwitchSkin

    @MarcusHurney
    MarcusHurney committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    275c704 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2018

  1. [DDW-245] Deletes lock files to avoid merge conflict when pulling in … 

    …develop branch
    @MarcusHurney
    MarcusHurney committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    7dfa149 View commit details
    Browse the repository at this point in the history

  2. [DDW-245] Pulls in latest changes from develop branch

    @MarcusHurney
    MarcusHurney committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    3f6ec78 View commit details
    Browse the repository at this point in the history

  3. [DDW-245] Updates AdaRedemptionNoWallets.js to use new react-polymorp… 

    …h API from develop branch
    @MarcusHurney
    MarcusHurney committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    6262833 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. Merge branch 'develop' into chore/ddw-245-integrate-react-polymorph-r… 

    …ender-props-in-Daedalus
    @DominikGuzei
    DominikGuzei committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    7b3692e View commit details
    Browse the repository at this point in the history

  2. update to react-polymorph 0.7.0

    @DominikGuzei
    DominikGuzei committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    dc46169 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. [DDW-245] fix conflicts with latest develop

    @DominikGuzei
    DominikGuzei committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    0823de1 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. [DDW-245] fix small bugs and acceptance tests

    @DominikGuzei
    DominikGuzei committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    4527b37 View commit details
    Browse the repository at this point in the history

  2. [DDW-245] merge-in latest develop

    @DominikGuzei
    DominikGuzei committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    1f38ba5 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. Merge branch 'develop' into chore/ddw-245-integrate-react-polymorph-r… 

    …ender-props-in-Daedalus
    @DominikGuzei
    DominikGuzei committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    6a31bad View commit details
    Browse the repository at this point in the history

  2. [DDW-245] fix clear feature on wallet restore dialog

    @DominikGuzei
    DominikGuzei committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    b698e70 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2018

  1. [DDW-245] Composes styles for wallet name and password input fields u… 

    …sing themeoverrides instead of global css class definitions
    @MarcusHurney
    MarcusHurney committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    851bf55 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2018

  1. [DDW-245] Adds option-checkmark-color variable to _config.scss and it… 

    …s corresponding values to all 3 daedalus themes to control color of checkmark in a selected option
    @MarcusHurney
    MarcusHurney committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    71bc7d6 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2018

  1. [DDW-245] Defines MnemonicWord's click handler as a const instead of … 

    …inline arrow function
    @MarcusHurney
    MarcusHurney committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    9e80749 View commit details
    Browse the repository at this point in the history

  2. [DDW-245] Defines MnemonicWord's styles in accordance to Button's the… 

    …me API from react-polymorph v0.7.0
    @MarcusHurney
    MarcusHurney committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    22f1f23 View commit details
    Browse the repository at this point in the history

  3. [DDW-245] Passes Button component MnemonicWord.scss's custom styles a… 

    …s themeOverrides. Defines onClick handler as const.
    @MarcusHurney
    MarcusHurney committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    43334e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2018

  1. [DDW-245] fix select arrow colors in all themes and states

    @DominikGuzei
    DominikGuzei committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    73abd1d View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2018

  1. [DDW-245] Adjusts paths to import react-polymorph components and skin… 

    …s directly from each file instead of from index.js
    @MarcusHurney
    MarcusHurney committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    84631e4 View commit details
    Browse the repository at this point in the history

  2. [DDW-245] fix conflicts with latest develop

    @DominikGuzei
    DominikGuzei committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    14a7630 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'chore/ddw-245-integrate-react-polymorph-render-props-in… 

    …-Daedalus' of https://github.com/input-output-hk/daedalus into chore/ddw-245-integrate-react-polymorph-render-props-in-Daedalus
    @DominikGuzei
    DominikGuzei committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    f07f65a View commit details
    Browse the repository at this point in the history

  4. [DDW-245] fixes all paths to react-polymorph components

    @DominikGuzei
    DominikGuzei committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    82362d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. [DDW-245] update to latest react-polymorph

    @DominikGuzei
    DominikGuzei committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    23d1a38 View commit details
    Browse the repository at this point in the history

  2. [DDW-245] Fixes import path for react-polymorph InputSkin

    @MarcusHurney
    MarcusHurney committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    bfdf4fb View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2018

  1. [DDW-245] Fix autocomplete clear and storybook imports

    @nikolaglumac
    nikolaglumac committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    2732208 View commit details
    Browse the repository at this point in the history

  2. [DDW-245] Fix checkbox disabled state styles

    @nikolaglumac
    nikolaglumac committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    37fbcdb View commit details
    Browse the repository at this point in the history

  3. [DDW-245] improve dynamic resolving based on environment

    @DominikGuzei
    DominikGuzei committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    5f93927 View commit details
    Browse the repository at this point in the history

  4. [DDW-245] update to latest react-polymorph without default theme to f… 

    …ix duplicated styles
    @DominikGuzei
    DominikGuzei committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    5c46570 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. [DDW-245] small refactorings

    @DominikGuzei
    DominikGuzei committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    dba38d4 View commit details
    Browse the repository at this point in the history

  2. [DDW-245] fix conflicts with latest develop branch

    @DominikGuzei
    DominikGuzei committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    b336c02 View commit details
    Browse the repository at this point in the history

  3. [DDW-245] revert resolver changes as they didnt improve anything

    @DominikGuzei
    DominikGuzei committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    b1f2370 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'chore/ddw-245-integrate-react-polymorph-render-props-in… 

    …-Daedalus' of https://github.com/input-output-hk/daedalus into chore/ddw-245-integrate-react-polymorph-render-props-in-Daedalus
    @DominikGuzei
    DominikGuzei committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    24b2429 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. [DDW-245] Fix failing acceptance tests

    @nikolaglumac
    nikolaglumac committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    715dc6e View commit details
    Browse the repository at this point in the history

  2. [DDW-245] Merge latest develop and fix conflicts

    @nikolaglumac
    nikolaglumac committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    8aade98 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2018

  1. [DDW-245] update to react-polymorph 0.7.1

    @DominikGuzei
    DominikGuzei committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    02c5f62 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'chore/ddw-245-integrate-react-polymorph-render-props-in… 

    …-Daedalus' of https://github.com/input-output-hk/daedalus into chore/ddw-245-integrate-react-polymorph-render-props-in-Daedalus
    @DominikGuzei
    DominikGuzei committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    a9c61b2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into chore/ddw-245-integrate-react-polymorph-r… 

    …ender-props-in-Daedalus
    @DominikGuzei
    DominikGuzei committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    d3a40c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2018

  1. Merge branch 'develop' into chore/ddw-245-integrate-react-polymorph-r… 

    …ender-props-in-Daedalus
    @DominikGuzei
    DominikGuzei committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    b0ddb30 View commit details
    Browse the repository at this point in the history