Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Integrate UI 2 #6819

Merged
merged 344 commits into from
Oct 19, 2017
Merged

Integrate UI 2 #6819

merged 344 commits into from
Oct 19, 2017
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 10, 2017

  1. grumbles

    CraigglesO committed May 10, 2017
    Configuration menu
    Copy the full SHA
    19d9713 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f014891 View commit details
    Browse the repository at this point in the history
  3. SemanticButton

    CraigglesO committed May 10, 2017
    Configuration menu
    Copy the full SHA
    66843a3 View commit details
    Browse the repository at this point in the history
  4. style fix

    CraigglesO committed May 10, 2017
    Configuration menu
    Copy the full SHA
    a0929c4 View commit details
    Browse the repository at this point in the history
  5. style fix

    CraigglesO committed May 10, 2017
    Configuration menu
    Copy the full SHA
    4944f59 View commit details
    Browse the repository at this point in the history
  6. Ui 2 depends & fixes (#5590)

    * File paths
    
    * Align balance overlays & sizes
    
    * Copy works as expected
    
    * Re-arrange imports
    
    * Icon props
    
    * Move packages to their original dependencies
    
    * Dependencies to packages
    
    * Update test babel overrides
    jacogr committed May 10, 2017
    Configuration menu
    Copy the full SHA
    b9c4e5b View commit details
    Browse the repository at this point in the history
  7. Merge branch 'ui-2' into menu

    jacogr committed May 10, 2017
    Configuration menu
    Copy the full SHA
    1c262b2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c3ee7f0 View commit details
    Browse the repository at this point in the history
  9. Fix tests

    jacogr committed May 10, 2017
    Configuration menu
    Copy the full SHA
    7799883 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    35a5c47 View commit details
    Browse the repository at this point in the history
  11. Merge branch 'master' into ui-2

    # Conflicts:
    #	js/src/shared/redux/middleware.js
    #	js/src/shared/redux/providers/registry/middleware.js
    #	js/src/shell/Application/application.js
    #	js/src/ui/Actionbar/actionbar.js
    #	js/src/ui/Button/button.js
    #	js/src/ui/Form/AddressSelect/addressSelect.js
    #	js/src/ui/Form/Input/input.js
    #	js/src/ui/MethodDecoding/methodDecoding.js
    jacogr committed May 10, 2017
    Configuration menu
    Copy the full SHA
    566b6a1 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    7c78dff View commit details
    Browse the repository at this point in the history

Commits on May 11, 2017

  1. Merge pull request #5559 from paritytech/menu

    dropdowns
    CraigglesO committed May 11, 2017
    Configuration menu
    Copy the full SHA
    85cf93e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b1a3909 View commit details
    Browse the repository at this point in the history
  3. Ui 2 Select component conversion (#5598)

    * Remove mui/Paper from PasswordManager
    
    * Aliasses for @parity packages
    
    * Remove mui/Card from contract queries
    
    * Toggle component replacement (mui-only)
    
    * Semantic-ui toggle component
    
    * LabelComponent warpper for Toggle
    
    * Convert Selectors
    
    * Test fixes
    
    * Fix case
    jacogr committed May 11, 2017
    Configuration menu
    Copy the full SHA
    78b6de5 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2017

  1. Configuration menu
    Copy the full SHA
    79e991d View commit details
    Browse the repository at this point in the history
  2. Ui 2 radios & imports (#5609)

    * Remove mui IconButton
    
    * Token type selection
    
    * Convert RadioButtons
    
    * RadioButtons consistency
    
    * Import @parity/ui
    
    * Import @parity/ui
    
    * Explicit name for RadioButtons
    
    * Convert to semantic Radio
    jacogr committed May 12, 2017
    Configuration menu
    Copy the full SHA
    5da7c32 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1243728 View commit details
    Browse the repository at this point in the history
  4. Ui 2 remove mui from views & shell (#5613)

    * Stepper from semantic-ui
    
    * Tabs component
    
    * ui/Tabs in loadContract
    
    * Adapt Dropdown events
    
    * Remove direct use of semantic-ui
    
    * Remove IconButton & Subheader
    
    * Remove IconMenu
    
    * ui/List & List.Item
    
    * Be explicit in context props
    jacogr committed May 12, 2017
    Configuration menu
    Copy the full SHA
    7cdddd3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9bc8254 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2017

  1. Configuration menu
    Copy the full SHA
    c5fa984 View commit details
    Browse the repository at this point in the history
  2. Ui 2 additional MUI replacements (#5623)

    * Loader spinner
    
    * Progressbar conversion
    
    * Update Progress
    
    * Transfer operational again
    
    * Remove List/ListItem from features
    
    * Remove extra animation
    
    * Remove iconButton
    
    * Remove underline(input to be replaced)
    
    * Convert Sort to Popup
    
    * Remove unused AutoComplete component
    
    * Simplify ModalBox
    
    * Allow empty Actionbar
    
    * Adjust shapeshift icon
    
    * Simplify MUI theme (before removal)
    
    * Update tests
    jacogr committed May 15, 2017
    Configuration menu
    Copy the full SHA
    c27d96a View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. Ui 2 mui to sui conversion (#5633)

    * Split chip rendering from input
    
    * Slider component
    
    * Render Chip without MUI
    
    * Adjust InputChip styling
    
    * Remove mui chip input
    
    * Remove mui-chip-input from build
    
    * Convert input to sui
    jacogr committed May 16, 2017
    Configuration menu
    Copy the full SHA
    665998e View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into ui-2

    # Conflicts:
    #
    js/src/shell/Signer/components/TransactionPendingFormConfirm/transaction
    PendingFormConfirm.js
    #	js/src/ui/Container/Title/title.js
    #	js/src/views/Application/Snackbar/snackbar.js
    #	js/src/views/Status/Peers/peers.js
    jacogr committed May 16, 2017
    Configuration menu
    Copy the full SHA
    31be9d2 View commit details
    Browse the repository at this point in the history
  3. Ui 2 complete MUI removal (#5635)

    * Convert DateTime input component
    
    * Remove muiTheme context
    jacogr committed May 16, 2017
    Configuration menu
    Copy the full SHA
    95f6f70 View commit details
    Browse the repository at this point in the history
  4. Ui 2 cleanups (unused components, shared assets) (#5636)

    * Remove unused components
    
    * Move to dapp/index.js
    
    * Move assets to @parity/shared
    jacogr committed May 16, 2017
    Configuration menu
    Copy the full SHA
    673cde3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f7ea667 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2017

  1. Configuration menu
    Copy the full SHA
    ab86f9e View commit details
    Browse the repository at this point in the history

Commits on May 18, 2017

  1. flow (#5606)

    * FLOW
    
    * ui-2-one more fix
    CraigglesO authored and jacogr committed May 18, 2017
    Configuration menu
    Copy the full SHA
    78461d8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4b5a1d0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e0927f0 View commit details
    Browse the repository at this point in the history
  4. Ui 2 components cleanups (#5653)

    * Add autoFocus for search
    
    * Remove old/unused renderer
    
    * LabelComponent -> LabelWrapper
    
    * Consistent LabelWrapper usage
    jacogr committed May 18, 2017
    Configuration menu
    Copy the full SHA
    20bda5f View commit details
    Browse the repository at this point in the history
  5. style-fix (#5649)

    CraigglesO authored and jacogr committed May 18, 2017
    Configuration menu
    Copy the full SHA
    6978e38 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2017

  1. Merge branch 'master' into ui-2

    # Conflicts:
    #	js/src/shell/Connection/connection.js
    #	js/src/ui/Icons/index.js
    #	js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js
    jacogr committed May 19, 2017
    Configuration menu
    Copy the full SHA
    602115d View commit details
    Browse the repository at this point in the history

Commits on May 22, 2017

  1. Form fixes (#5664)

    * label fix
    
    * label-tx-row
    
    * form fixes
    CraigglesO authored and jacogr committed May 22, 2017
    Configuration menu
    Copy the full SHA
    7a4eb15 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    368e3d1 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2017

  1. Merge pre-update

    jacogr committed May 24, 2017
    Configuration menu
    Copy the full SHA
    d33d54d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    45c6cc6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    37c3f51 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2017

  1. Configuration menu
    Copy the full SHA
    fce0167 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2017

  1. Merge branch 'master' into ui-2

    # Conflicts:
    #	js/src/modals/FirstRun/Welcome/welcome.js
    jacogr committed May 30, 2017
    Configuration menu
    Copy the full SHA
    d888190 View commit details
    Browse the repository at this point in the history
  2. UI2 fixes for Signer popup (#5711)

    * Fix new origin shape
    
    * Pass input types through (<input /> tag)
    
    * Update build
    jacogr committed May 30, 2017
    Configuration menu
    Copy the full SHA
    fd3c8bc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    265618f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2017

  1. UI 2 Api providers (#5714)

    * Add providers
    
    * Convert rpc calls to use provider
    
    * Update SecureApi for provider
    jacogr committed May 31, 2017
    Configuration menu
    Copy the full SHA
    a328eef View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2017

  1. Configuration menu
    Copy the full SHA
    6a480ff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bba1688 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2017

  1. Configuration menu
    Copy the full SHA
    dec0c8d View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2017

  1. Merge branch 'master' into ui-2

    # Conflicts:
    #	js/src/ui/Balance/balance.js
    jacogr committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    c1599a3 View commit details
    Browse the repository at this point in the history
  2. Ui 2 provider for dapps (#5799)

    * Import web3Provider
    
    * Import api
    
    * {Transport,Provider}/Ws -> WsSecure
    
    * PostMessage provider with filters
    
    * PromiseWrapper -> PromiseProvider
    jacogr committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    7f4a7ab View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Merge branch 'master' into ui-2

    # Conflicts:
    #	js/package.json
    #	js/src/api/local/ethkey/worker.js
    #	js/src/modals/FirstRun/TnC/tnc.js
    #	js/src/modals/FirstRun/Welcome/welcome.js
    #	js/src/ui/Form/Input/input.js
    #	js/src/ui/VaultCard/Accounts/accounts.spec.js
    #	js/src/views/Accounts/accounts.js
    #	js/src/views/Application/TabBar/tabBar.js
    #	js/src/views/Settings/Views/defaults.js
    #	js/src/views/Settings/Views/views.js
    #	js/webpack/app.js
    #	js/webpack/libraries.js
    jacogr committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    7bbd48a View commit details
    Browse the repository at this point in the history
  2. Additional merge fixes

    jacogr committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    a2fdf38 View commit details
    Browse the repository at this point in the history
  3. Update test for packages

    jacogr committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    6ea932b View commit details
    Browse the repository at this point in the history
  4. Package updates

    jacogr committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    8f5a863 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2017

  1. Merge branch 'master' into ui-2

    # Conflicts:
    #	Cargo.lock
    #	ethcore/src/evm/instructions.rs
    #	js/package.json
    #	js/src/modals/CreateAccount/AccountDetails/accountDetails.js
    #	js/src/modals/FirstRun/TnC/tnc.js
    #	js/src/modals/FirstRun/Welcome/welcome.js
    #	js/src/ui/Form/Input/input.js
    #	js/src/views/Accounts/accounts.js
    #	js/src/views/Settings/Views/defaults.js
    #	js/src/views/Settings/Views/views.js
    #	js/webpack/app.js
    #	js/webpack/libraries.js
    jacogr committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    121b742 View commit details
    Browse the repository at this point in the history
  2. Update package-lock

    jacogr committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    38b4ba8 View commit details
    Browse the repository at this point in the history
  3. Filter request popups (#5843)

    * Formatting
    
    * Update dapps to use web3Provider
    
    * Remove secure flag from config
    
    * Basic request approve/reject popup
    
    * Lenient provider checks
    
    * Case sensitivity fix
    jacogr committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    58f15f1 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. UI 2 Approve-all for Filters (#5846)

    * Approve all requests or type for token
    
    * Approve all functionality
    
    * Remove extra console.log
    jacogr committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    df52394 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2017

  1. Updated

    jacogr committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    acf9096 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4dd26c0 View commit details
    Browse the repository at this point in the history
  3. Updated after merge

    jacogr committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    d4532fa View commit details
    Browse the repository at this point in the history
  4. Method intercept dialog selection (#5875)

    * Cleanup filter config
    
    * Show single request of type (at a time)
    
    * Align packages
    
    * DappFilter -> DappRequests
    
    * Methods dialog (WIP)
    
    * Initial dapp methods modal
    
    * Align dialog & popup permissions
    
    * appname -> token mapping TODOs
    
    * Case
    jacogr committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    e479260 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2017

  1. Configuration menu
    Copy the full SHA
    97c67bc View commit details
    Browse the repository at this point in the history
  2. Secure API access via single-use tokens (#5892)

    * Single use token for dapp permissions
    
    * Add accountsInfo & allAccountsInfo
    
    * Covert token -> dappName in requests
    jacogr committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    a6d3d4e View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2017

  1. Configuration menu
    Copy the full SHA
    72f3576 View commit details
    Browse the repository at this point in the history
  2. Update

    jacogr committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    d9cb2c7 View commit details
    Browse the repository at this point in the history
  3. Update

    jacogr committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    6dfa097 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2017

  1. Configuration menu
    Copy the full SHA
    8798ed4 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2017

  1. Configuration menu
    Copy the full SHA
    1896c27 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9f8467a View commit details
    Browse the repository at this point in the history
  3. Save permissions (#5970)

    jacogr committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    15d4bc9 View commit details
    Browse the repository at this point in the history
  4. Cleanup selector (#5971)

    jacogr committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    7f77e60 View commit details
    Browse the repository at this point in the history
  5. Ui 2 expand method filters (#5974)

    * Add account & vault APIs
    
    * Additional status methods
    
    * Move permission modals into Dapp
    
    * Adjust display position
    
    * Don't publish invalid events
    jacogr committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    15a9e56 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c33ff96 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2017

  1. Configuration menu
    Copy the full SHA
    76f0247 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2017

  1. Ui 2 updates subscribe (#6027)

    * Add account & vault APIs
    
    * Additional status methods
    
    * Move permission modals into Dapp
    
    * Adjust display position
    
    * Don't publish invalid events
    
    * Cleanup Wallet display
    
    * Update package-lock
    
    * Align icon buttons center
    
    * Adjust account selectors
    
    * Adjust wallet white
    
    * Allow display of boolean/false values
    
    * Pass value through correctly for disabled inputs
    
    * Split requests into sections
    
    * onClict -> onClick
    
    * Update label
    
    * Update skip step
    
    * Connect provider interfaces
    jacogr committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    cbcda14 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    84f1127 View commit details
    Browse the repository at this point in the history
  3. Update package-lock.json

    jacogr committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    699aab0 View commit details
    Browse the repository at this point in the history
  4. Ui 2 provider rename (web3Provider -> ethereum) (#6031)

    * Rename web3Provider -> ethereumProvider
    
    * ethereumProvider -> ethereum
    jacogr committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    4dd68f1 View commit details
    Browse the repository at this point in the history
  5. UI 2 dapp configuration dapps (#6032)

    * Add shell_ APIs
    
    * Allow handling of shell_ calls
    
    * Retrieve API info via call
    
    * Split Dapp Method config into dapp
    
    * Allow shell API for configuring dapps
    
    * Move dapp toggles to dapp itself
    
    * Align provider naming
    
    * Selection of default accounts via dapp
    
    * Remove duplicated spec
    jacogr committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    801b6e0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3d24ae0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    03b0ea6 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2017

  1. Configuration menu
    Copy the full SHA
    a1a8181 View commit details
    Browse the repository at this point in the history
  2. Update after merge

    jacogr committed Jul 11, 2017
    Configuration menu
    Copy the full SHA
    92a9ff3 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2017

  1. Configuration menu
    Copy the full SHA
    d8c3c24 View commit details
    Browse the repository at this point in the history
  2. Fix lint issue.

    jacogr committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    2007de3 View commit details
    Browse the repository at this point in the history
  3. Update tests to master version

    jacogr committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    e36a7fa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2dc92fc View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. Configuration menu
    Copy the full SHA
    aaff343 View commit details
    Browse the repository at this point in the history
  2. Upated dependencies

    jacogr committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    fcdaa0d View commit details
    Browse the repository at this point in the history
  3. Ui 2 package upgrades (#6076)

    * Upgrade to React 15.6
    
    * Import PropTypes from prop-types
    
    * Update package.json
    
    * UI version in built version
    
    * Cleanup /api/health status failures
    
    * Check reponse.ok
    
    * Add icons to view dapps
    
    * Adjust layout for dapps
    
    * Slightly darker balance background
    
    * Adjust shadows
    jacogr committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    36f94fd View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2017

  1. Configuration menu
    Copy the full SHA
    7f3bb37 View commit details
    Browse the repository at this point in the history
  2. Ui 2 move to packages/* (#6113)

    * Move secureApi to shell
    
    * Extract isTestnet test
    
    * Use mobx + subscriptions for status
    
    * Re-add status indicator
    
    * Add lerna
    
    * Move intial packages to js/packages
    
    * Move 3rdparty/{email,sms}-verification to correct location
    
    * Move package.json & README to library src
    
    * Move tests for library packages
    
    * Move views & dapps to packages
    
    * Move i18n to root
    
    * Move shell to actual src (main app)
    
    * Remove ~ references
    
    * Change ~ to root (explicit imports)
    
    * Finalise convert of ~
    
    * Move views into dapps as well
    
    * Move dapps to packages/
    
    * Fix references
    
    * Update css
    
    * Update test spec locations
    
    * Update tests
    
    * Case fix
    
    * Skip flakey tests
    
    * Update enzyme
    
    * Skip previously ignored tests
    
    * Allow empty api for hw
    
    * Re-add theme for embed
    jacogr committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    49fdd23 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2017

  1. Pubsub for postMessage Provider (UI2)

    Proper method-name displaying on request approval is missing
    kaikun213 committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    13b96ae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a562f2c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    381ed50 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c894f7a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    de76b8a View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2017

  1. Configuration menu
    Copy the full SHA
    715fb68 View commit details
    Browse the repository at this point in the history
  2. Fix previous merge

    jacogr committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    decc592 View commit details
    Browse the repository at this point in the history
  3. Upgrade webpack

    jacogr committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    09e40c2 View commit details
    Browse the repository at this point in the history
  4. Ui 2 pubsub components (#6152)

    * Remove Application.orig from merge
    
    * Disable i18n extraction for development
    
    * Retrieve blockNumber via pubsub
    
    * Chain via pubsub
    
    * StatusIndicator with health
    
    * WIP
    
    * WIP
    
    * s/BlockStatus/BlockNumber/
    
    * Adjust BlockNumber display
    
    * Cleanup debug
    
    * Fix statusbar indicator
    
    * NetPeers component
    
    * Add BlockTimestamp
    
    * Export statics on observer
    
    * Cleanup debug logs
    
    * Update references
    jacogr committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    a068f72 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2017

  1. whisper-js

    kaikun213 committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    cd0fbbe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e317fcf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    31a0f5e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3e85beb View commit details
    Browse the repository at this point in the history
  5. Add missing dependencies

    jacogr committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    0bdd4a9 View commit details
    Browse the repository at this point in the history
  6. Link dapp-develop/account

    jacogr committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    53bde28 View commit details
    Browse the repository at this point in the history
  7. Add oo7 deps

    jacogr committed Jul 27, 2017
    Configuration menu
    Copy the full SHA
    5830767 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2017

  1. Ui 2 packages (#6169)

    * Ensure all internal dapps have package.json
    
    * Update compilation rules
    
    # Conflicts:
    #	js/src/redux/providers/balancesActions.js
    #	js/src/ui/Form/TypedInput/typedInput.js
    
    * Remove SignerIcon
    
    * Cleanup providers
    
    * Enable request of new token from app
    
    * Queue when no token (yet)
    
    * Add location & token request
    
    * Cleanup send logic
    
    * Request token
    
    * Request comms token
    
    * Remove yarn.lock (not updated)
    
    * Update version to 1.99.99 (publish prepare)
    
    * Move jsonrpc to seperate repo
    
    * Update jsonrpc references
    
    * Update repo info
    
    * Update repo info
    
    * Additional debugging
    
    * Update repo references
    
    * Move ABI to js-abi repo
    
    * Move webWorker to shared
    
    * Fix package reference
    
    * Worker location
    
    * Move js-ui & js-shared components
    
    * Update file references
    
    * Update package repo locations
    
    * Remove debugging info
    
    * Cleanup debug
    
    * Split api into own repo
    
    * Update api local references
    
    * Update app loading
    
    * Update dependencies
    
    * Allow serving of /parity-utils
    
    * Error when EthereumProvider has not been attached
    
    * Use inject.js
    
    * Correct appId retrieval
    jacogr committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    a1b8fab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e70d5c5 View commit details
    Browse the repository at this point in the history
  3. Ui 2 js build fixes (#6176)

    * Update API reference
    
    * Deprecation warning
    
    * Add missing parity-reactive-ui
    
    * Add dapps to packages/dapps
    
    * Add parity.js dependency
    jacogr committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    4000ec6 View commit details
    Browse the repository at this point in the history
  4. Ui 2 parity build fixes (#6182)

    * Update API reference
    
    * Deprecation warning
    
    * Add missing parity-reactive-ui
    
    * Add dapps to packages/dapps
    
    * Add parity.js dependency
    
    * Update with js-ui with compiled bundle.js
    jacogr committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    abb62d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2017

  1. Fix NODE_ENV=production build

    jacogr committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    6349da2 View commit details
    Browse the repository at this point in the history
  2. Cleanup unused vars

    jacogr committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    6a51ff2 View commit details
    Browse the repository at this point in the history
  3. Additional compose removed

    jacogr committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    ec62d6f View commit details
    Browse the repository at this point in the history
  4. Remove extra options

    jacogr committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    58c3948 View commit details
    Browse the repository at this point in the history
  5. Update webpack

    jacogr committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    fdebeaf View commit details
    Browse the repository at this point in the history
  6. Build with parallel-webpack

    jacogr committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    7f6e2a3 View commit details
    Browse the repository at this point in the history
  7. Remove embed (for now)

    jacogr committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    0b71baa View commit details
    Browse the repository at this point in the history
  8. Update build

    jacogr committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    0e7c115 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. Build update

    jacogr committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    317a59d View commit details
    Browse the repository at this point in the history
  2. Re-add webpack-dev-server

    jacogr committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    b5f4c40 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c509733 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f8bf4a1 View commit details
    Browse the repository at this point in the history
  5. Update inject

    jacogr committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    52828c0 View commit details
    Browse the repository at this point in the history
  6. Use serviceWorker from shared

    jacogr committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    9b678a5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    dea25b1 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    67db54d View commit details
    Browse the repository at this point in the history
  9. Updated with working accounts

    jacogr committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    3006ab9 View commit details
    Browse the repository at this point in the history
  10. Update

    jacogr committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    1d96ba7 View commit details
    Browse the repository at this point in the history
  11. Add addresses dapp

    jacogr committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    34a8daa View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    aa95c09 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. Cleanup webpack config

    jacogr committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    cbd3203 View commit details
    Browse the repository at this point in the history
  2. Add dapp-develop

    jacogr committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    0a3a860 View commit details
    Browse the repository at this point in the history
  3. Update build

    jacogr committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    ffd53ed View commit details
    Browse the repository at this point in the history
  4. Don't copy source window

    jacogr committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    45f91fa View commit details
    Browse the repository at this point in the history
  5. Update with latest dapps

    jacogr committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    696089c View commit details
    Browse the repository at this point in the history
  6. Import UI components directly

    jacogr committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    f94f69c View commit details
    Browse the repository at this point in the history
  7. Update locked versions

    jacogr committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    e99f86a View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. Update file-loader

    jacogr committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    34f9e69 View commit details
    Browse the repository at this point in the history
  2. Update build

    jacogr committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    e7641e3 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. Update dependencies

    jacogr committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    c088a9a View commit details
    Browse the repository at this point in the history
  2. Update sourcemap types

    jacogr committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    0892bc9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2df7a5f View commit details
    Browse the repository at this point in the history
  4. Really excluse node_modules

    jacogr committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    1bf851a View commit details
    Browse the repository at this point in the history
  5. Re-add modules path

    jacogr committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    44a7c3d View commit details
    Browse the repository at this point in the history
  6. Update webpack

    jacogr committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    49a4499 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b7ebfab View commit details
    Browse the repository at this point in the history
  8. Update build

    jacogr committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    28e2383 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2017

  1. Configuration menu
    Copy the full SHA
    0371dcb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a48f321 View commit details
    Browse the repository at this point in the history
  3. Update/rebuild after merge

    jacogr committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    b0228e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2017

  1. Configuration menu
    Copy the full SHA
    a11e9ac View commit details
    Browse the repository at this point in the history
  2. Remove ~ alias

    jacogr committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    317addb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9aae461 View commit details
    Browse the repository at this point in the history
  4. Add shell_loadApp API

    jacogr committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    2d5541f View commit details
    Browse the repository at this point in the history
  5. Don't mask top-level params

    jacogr committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    f967bc4 View commit details
    Browse the repository at this point in the history
  6. Move shell APIs to middleware

    jacogr committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    4176936 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    039729a View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2017

  1. Rebuild

    jacogr committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    f0e2014 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2017

  1. Configuration menu
    Copy the full SHA
    630118b View commit details
    Browse the repository at this point in the history
  2. Update dependencies

    jacogr committed Aug 22, 2017
    Configuration menu
    Copy the full SHA
    21e8c31 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2017

  1. Update dependencies

    jacogr committed Aug 24, 2017
    Configuration menu
    Copy the full SHA
    ae66b98 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e08829 View commit details
    Browse the repository at this point in the history
  3. Add @parity/jsonrpc explicitly

    jacogr committed Aug 24, 2017
    Configuration menu
    Copy the full SHA
    d97f6b3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    10a7750 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2017

  1. Configuration menu
    Copy the full SHA
    7438cfc View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2017

  1. Configuration menu
    Copy the full SHA
    1b0efa9 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2017

  1. Update

    jacogr committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    2a08202 View commit details
    Browse the repository at this point in the history
  2. Update dependencies

    jacogr committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    39cf190 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c2f0778 View commit details
    Browse the repository at this point in the history
  4. Don't show tags for dapps

    jacogr committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    2593477 View commit details
    Browse the repository at this point in the history
  5. Update webpack

    jacogr committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    35202e2 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2017

  1. Update packages

    jacogr committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    b1428c2 View commit details
    Browse the repository at this point in the history
  2. Init history in dapp module

    jacogr committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    d7de40a View commit details
    Browse the repository at this point in the history
  3. Basic electron interface

    jacogr committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    be56a06 View commit details
    Browse the repository at this point in the history
  4. Update for non HTTP use

    jacogr committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    5b8236c View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2017

  1. Configuration menu
    Copy the full SHA
    0238295 View commit details
    Browse the repository at this point in the history
  2. Update to cater for token URL

    jacogr committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    d957a10 View commit details
    Browse the repository at this point in the history
  3. Override uiUrl

    jacogr committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    d0d8002 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2017

  1. Configuration menu
    Copy the full SHA
    a1bde40 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fb7b115 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2017

  1. Configuration menu
    Copy the full SHA
    7818ed9 View commit details
    Browse the repository at this point in the history
  2. Signer plugin attachment

    jacogr committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    a5cc14c View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2017

  1. Adjust Signer title colours

    jacogr committed Sep 5, 2017
    Configuration menu
    Copy the full SHA
    1d8886f View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2017

  1. Cleanup handler determination

    jacogr committed Sep 7, 2017
    Configuration menu
    Copy the full SHA
    afb101e View commit details
    Browse the repository at this point in the history
  2. Update CSS linting

    jacogr committed Sep 7, 2017
    Configuration menu
    Copy the full SHA
    ee4f370 View commit details
    Browse the repository at this point in the history
  3. Merge master

    jacogr committed Sep 7, 2017
    Configuration menu
    Copy the full SHA
    6d8b511 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2017

  1. Disable signer plugin

    jacogr committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    093eb39 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ceb1dd8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2bcdb07 View commit details
    Browse the repository at this point in the history
  4. file: protocol updates

    jacogr committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    dc85c66 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2017

  1. Update with recent @parity/ui

    jacogr committed Sep 12, 2017
    Configuration menu
    Copy the full SHA
    6e2e122 View commit details
    Browse the repository at this point in the history
  2. Update packages

    jacogr committed Sep 12, 2017
    Configuration menu
    Copy the full SHA
    94df97a View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2017

  1. Configuration menu
    Copy the full SHA
    5d774d3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4a184db View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    baeab01 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2017

  1. Update test execution

    jacogr committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    935d147 View commit details
    Browse the repository at this point in the history
  2. Update dependencies

    jacogr committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    1e1137a View commit details
    Browse the repository at this point in the history
  3. Update dependencies

    jacogr committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    afec835 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' into ui-2

    # Conflicts:
    #	js/package-lock.json
    #	js/src/Application/application.js
    #	js/src/api/rpc/parity/parity.js
    #	js/src/api/subscriptions/manager.spec.js
    #	js/src/api/subscriptions/personal.spec.js
    #	js/src/jsonrpc/interfaces/parity.js
    #	js/src/mobx/hardwareStore.js
    #	js/src/mobx/hardwareStore.spec.js
    #	js/src/modals/index.js
    #	js/src/redux/providers/signerMiddleware.spec.js
    #	js/src/ui/SelectionList/selectionList.css
    #	js/src/views/Account/account.spec.js
    #	js/src/views/Accounts/accounts.spec.js
    #	js/src/views/Application/Extension/store.js
    #	js/src/views/Signer/components/SignRequest/signRequest.spec.js
    jacogr committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    db9a70d View commit details
    Browse the repository at this point in the history
  5. Update master merge packages

    jacogr committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    312360e View commit details
    Browse the repository at this point in the history
  6. Fix merge linting issues

    jacogr committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    2b48668 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3795a48 View commit details
    Browse the repository at this point in the history
  8. Align request overlay styling

    jacogr committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    2eac4f6 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2017

  1. Update status styling

    jacogr committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    413da80 View commit details
    Browse the repository at this point in the history
  2. Update dependencies

    jacogr committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    51674f2 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2017

  1. Make status always visible

    jacogr committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    7e1cb97 View commit details
    Browse the repository at this point in the history
  2. Empty block

    jacogr committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    ac3d548 View commit details
    Browse the repository at this point in the history
  3. Add latest @parity/ui

    jacogr committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    206abae View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    abb94c8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f9b7be7 View commit details
    Browse the repository at this point in the history
  6. Update failing tests

    jacogr committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    d02c696 View commit details
    Browse the repository at this point in the history
  7. CSS lint fixes

    jacogr committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    32a29c1 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    dfe4533 View commit details
    Browse the repository at this point in the history
  9. Update status plugins

    jacogr committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    4fa4dd8 View commit details
    Browse the repository at this point in the history
  10. Adjust Requests position

    jacogr committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    9ed8178 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2017

  1. Configuration menu
    Copy the full SHA
    61bbc19 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2017

  1. Update packages

    jacogr committed Sep 22, 2017
    Configuration menu
    Copy the full SHA
    ab902bf View commit details
    Browse the repository at this point in the history
  2. Update submodules to master version

    # Conflicts:
    #	js/src/api/contract/contract.js
    #	js/src/redux/providers/requestsActions.js
    jacogr committed Sep 22, 2017
    Configuration menu
    Copy the full SHA
    81c71ff View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2017

  1. Update dependencies

    jacogr committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    9daa884 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2017

  1. Configuration menu
    Copy the full SHA
    39b5e5b View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2017

  1. Fix form submission issues

    jacogr committed Oct 2, 2017
    Configuration menu
    Copy the full SHA
    3416976 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2017

  1. Rebuild

    jacogr committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    9f00159 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    55b0b09 View commit details
    Browse the repository at this point in the history
  3. Add sync warning to top

    jacogr committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    290060e View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2017

  1. Update after merge

    jacogr committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    21c95bb View commit details
    Browse the repository at this point in the history
  2. Lint fixes

    jacogr committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    4f082da View commit details
    Browse the repository at this point in the history
  3. SyncWarning store

    jacogr committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    0be5326 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2017

  1. Configuration menu
    Copy the full SHA
    439eb29 View commit details
    Browse the repository at this point in the history
  2. Merge master

    jacogr committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    c116e06 View commit details
    Browse the repository at this point in the history
  3. Update lint

    jacogr committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    afb9647 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2017

  1. Merge branch 'master' into ui-2

    # Conflicts:
    #	js/package-lock.json
    #	js/package.json
    #	js/src/api/api.js
    #	js/src/api/local/accounts/accounts.js
    #	js/src/api/local/localAccountsMiddleware.js
    #	js/src/api/local/transactions.js
    #	js/src/api/pubsub/signer/signer.js
    #	js/src/api/subscriptions/signer.js
    #	js/src/api/transport/jsonRpcBase.js
    #	js/src/api/transport/middleware.js
    #	js/src/api/util/format.js
    #	js/src/api/util/format.spec.js
    #	js/src/contracts/abi/index.js
    #	js/src/contracts/badgereg.js
    #	js/src/dapps/tokenreg/Application/application.css
    #	js/src/dapps/tokenreg/Application/application.js
    #	js/src/modals/CreateWallet/WalletDetails/walletDetails.js
    #	js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
    #	js/src/modals/CreateWallet/createWalletStore.js
    #	js/src/modals/DeployContract/ParametersStep/parametersStep.js
    #	js/src/modals/DeployContract/deployContract.js
    #	js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
    #	js/src/modals/WalletSettings/walletSettings.js
    #	js/src/redux/providers/certifications/actions.js
    #	js/src/redux/providers/certifications/middleware.js
    #	js/src/redux/providers/certifications/reducer.js
    #	js/src/redux/providers/requestsActions.js
    #	js/src/redux/providers/tokensActions.js
    #	js/src/ui/AccountCard/accountCard.css
    #	js/src/ui/Balance/balance.js
    #	js/src/ui/Balance/balance.spec.js
    #	js/src/ui/DappCard/dappCard.js
    #	js/src/ui/Form/AddressSelect/addressSelect.js
    #	js/src/ui/Form/AddressSelect/addressSelectStore.js
    #	js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
    #	js/src/ui/Form/TypedInput/typedInput.js
    #	js/src/ui/IdentityIcon/identityIcon.js
    #	js/src/ui/MethodDecoding/tokenValue.js
    #	js/src/util/tx.js
    #	js/src/util/wallets.js
    #	js/src/util/wallets/consensys-wallet.js
    #	js/src/util/wallets/foundation-wallet.js
    #	js/src/views/Account/account.js
    #	js/src/views/Accounts/List/list.js
    #	js/src/views/Contract/Queries/inputQuery.js
    #	js/src/views/Contract/Queries/queries.js
    #	js/src/views/Contract/contract.js
    #	js/src/views/Signer/components/SignRequest/signRequest.css
    #	js/src/views/Signer/components/SignRequest/signRequest.js
    #	js/src/views/Signer/components/SignRequest/signRequest.spec.js
    jacogr committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    8453dda View commit details
    Browse the repository at this point in the history
  2. Rebuild after master merge

    jacogr committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    b49d7ee View commit details
    Browse the repository at this point in the history
  3. Add babel-polyfill entry

    jacogr committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    de6066d View commit details
    Browse the repository at this point in the history
  4. Update warning layout

    jacogr committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    9e4c1fe View commit details
    Browse the repository at this point in the history
  5. Updated dependencies

    jacogr committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    a76f768 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2017

  1. Updated dependencies

    jacogr committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    9c5b96c View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into ui-2

    # Conflicts:
    #	js/src/views/Signer/components/SignRequest/signRequest.js
    jacogr committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    d852e6b View commit details
    Browse the repository at this point in the history
  3. Updated dependencies

    jacogr committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    9a62119 View commit details
    Browse the repository at this point in the history
  4. Integrate old UI.

    tomusdrw committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    0f8fb62 View commit details
    Browse the repository at this point in the history
  5. Updated dependencies

    jacogr committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    fc2b58a View commit details
    Browse the repository at this point in the history
  6. Support both versions.

    tomusdrw committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    304b067 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2017

  1. Configuration menu
    Copy the full SHA
    9e04be7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2472a2b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    48ac6cb View commit details
    Browse the repository at this point in the history
  4. Update build scripts.

    tomusdrw committed Oct 18, 2017
    Configuration menu
    Copy the full SHA
    da6bd41 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    195305c View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2017

  1. Fix tests.

    tomusdrw committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    490f771 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bfcf4c4 View commit details
    Browse the repository at this point in the history