merge rebase #2
Merged
merge rebase #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* reject non-hex payloads for eth.sendTransaction
* add i18n bundler
* Removing unneeded code * Checking if DB is writable * Resolving DB sync when database is empty * Enhancing selected tab defaults at startup * Checking for R/W permissions * Restoring log entry * Improving error handling
* filter returned account list even for batch calls * more fixes|
Also updated Solidity to 0.3.6 via Npm Thanks Chris!
# Conflicts: # nodes/eth/mac-x64/libevmasm.dylib # nodes/eth/mac-x64/liblll.dylib # nodes/eth/mac-x64/libnatspec.dylib # nodes/eth/mac-x64/libsolidity.dylib # nodes/eth/mac-x64/libtestutils.dylib # nodes/eth/win-x64/eth.ilk # nodes/eth/win-x64/eth.pdb # nodes/eth/win-x64/msvcp120.dll # nodes/eth/win-x64/msvcr120.dll # package.json
* Fullscreen shortcuts according with current system
* add params plataform in README.md * Change option plataform to default (all) * Fix translate * Add options all, and link to options platform * More details of options platform * improve details of options platform * Change Mac OSX to macOS
* Inititial stab at putting function signature in the interface using an http request * Loading function signatures from local file * Parsing 4byte api * handling hash-collision: multiple sigs for hash * Updating signatures dictionary * ABI decode module * Pretty-printing contract parameters * Display signatures * filter returned account list even for batch calls * Remote function lookup by user interaction * new confirmation pane * new confirmation pane * add scrolling area * add throw warning * better error handling * check bytecode even if not for a contract * more fixes| * Fixing byte display * moved styles to elements pacakages * update signatures * Upload contract should not have signature
* Spectron iteration * Updating spectron * Creating switch for mist.lokidb for automated tests * Adding chai-as-expected * Changing IPC flag * Pairing spectron and electron versions * [ESLint] Minor fixes * Adding chai-string * Couple of tests passing * update .eslintrc.yml * Simplifying code * Removing delay in favor of better window management * Adding tests for URL bar * Focusing window before each test * Minor fixes * Improving mist setup and teardown * Fixing wallet test * adding html fixture * Improving test helpers * Tests for ETH-01-002 * Updating tests * Starting local HTTP server to deal with html fixtures * Updating tests setup * Adding more tests * Updating travis file to run spectron tests * Refactoring tests * Tests for ETH-01-007 * Downloading geth on the fly * Fine-tuning geth download during tests * Changing linux binary dir * Fixing binary path on linux * Travis debug * Travis debug * Changing fixtures * Fixing tests * Fixing travis file * More tests * Adjusting timeouts * Adjusting GULP_PLATFORM test env variable * Adjusting timeouts * Disabling some tests for now * Disabling a test
* Update dependencies * Updating yarn lock
* updated solc again * updated solc to 0.4.6 * Update geth to 1.5.5 (ethereum#1520) * Update geth to 1.5.5 * corrected windows zip's internal paths * changed sanity check * made node starting better * also log path from which to fetch * show fetching origin URL * fix ESLint errors * removed -stable
* updated solc again * updated solc to 0.4.6 * Update geth to 1.5.5 (ethereum#1520) * Update geth to 1.5.5 * corrected windows zip's internal paths * changed sanity check * made node starting better * also log path from which to fetch * show fetching origin URL * fix ESLint errors * removed -stable * fixes the immediate startup issue (ethereum#1540) * fixes ethereum#1532 (ethereum#1534) * [ESLint] autofix 'modules' (ethereum#1536) * [ESLint] update customProtocols.js (ethereum#1538) * added postinstall step for interface dir (ethereum#1546) * [ESLint] update 'scripts' (ethereum#1539) * [ESLint] update 'scripts' * add comments to .eslintrc * update paths * update comments * Adding badges for (up|out)dated dependencies (ethereum#1525) * Changes to splash screen and onboarding (ethereum#1545) * change fast to light * light client * remove '--cache' flag * remove cache * text changes` * changes to onboarding screen * changes to onboarding * ropstein in eth * experimental label` * checking network label position * Theres no I in Ropsten * changes algotithm for displaying * allows app to be ready if no sync is happening * bring changes to splash screen * remove changes from ethereumNode * remove changes from menuItems * speed changes * clean up and add comments * fixes onboarding shapeshift window loading * simplify code * add comments * shows ready to launch when there are less than a 100 blocks * Error pages (ethereum#1559) * added not found and crash error page * add source sans * [readme] minor typo * [mistAPI] add 'mist.solidity.version' (ethereum#1586) * add 'mist.solidity.version' to mistAPI * Adding tests for in Mist API * fixes (ethereum#1600) * add hash and queries to breadcrumb (ethereum#1596) * fix offline-startup edge-case (ethereum#1571) * NSIS installer (ethereum#1499) * Update travis config to new format * fixes * install gulp * fixes * tweaks * use same install & script tasks for all builds * Expand build matrix * tweaks * fixes * try to fix wine installation * Enable mac build * Extend run time to 30 minutes * see if extra dependencies resolves build issue for linwin * Install yarn with npm on osx * linux and windows in one * Add gulp to Mac * Bump timeout to 60 minutes * remove download-signatures from processing / travis tweaks * cleanup * enable gitter notifications * fix bash double ampersand * try to build nsis script * fix nsis verbosity flag * Customized NSIS installer * Fix order of commands * Improve uninstaller * Add logic and movefile plugins * Enable separate DATADIR location * Remove INSTDIR and replace with FILEDIR * Fix compiler warnings about unknown variables * Enforce UAC admin requirement * Move NSI to scripts directory and add plugins * Include version in output filename * Remove duplicate execution level command * Move files from nested folder into main folder * Update shortcut names and params * initial architecture detection + various cleanup * More flexible environment vars * Cleanup * User-selectable location for Mist's data files * Include icon in installation directory * Cleanup * Improve/fix registry entries * Show shortcuts after successful installation * Estimate installation size * Fix removal of start menu shortcuts * Open DATADIR and NODEDATADIR on uninstallation * Handle firewall rules * Disable firewall updates * Include multiple architectures into single installer * Don't allow user to select Mist data directory * Integrate NSIS build into Gulp * Cleanup lint suggestions * Cleanup more lint suggestions * One more linter fix * Remove testnet startmenu entry * Double the estimated installed size * Create desktop shortcut * Delete temporary zips * Store user settings in HKCU for uninstallation * Remove user registry settings on uninstallation * Improved uninstallation to not rely on stack variables * Compute actual program directory size * Cleanup * [travis] various fixes (ethereum#1601) * various fixes * disable code-signing on 'develop' * fix yarn on xcode8 image * rectify if statement * comments * improvement * Adjust formatter for addPeer ethereum#1543 (ethereum#1599) * recreate PR * add fixes * fix [null] * [gulp] new task 'upload-binaries' (to github) (ethereum#1578) * add gulp-task 'upload-binaries' * fix ESLint errors * improvements and fixes * switch URLs to ethereum/mist repo * also build wallet if on master branch * make sure all sendTransaction is valid HEX (ethereum#1606) * Adding a develop menu option to open Remix IDE (ethereum#1608) * Adding browser solidity menu item * Adding i18n keys for Remix menu item * Moving Remix menu option UP * Opening Remix on a separated popup * Changing display name * minor refactor * reverting travis change * Update app.nl.i18n.json (ethereum#1609) Dutch translation * adjust content order, feather and window size (ethereum#1585) * fix mention-bot (ethereum#1587) * Improve importer (ethereum#1598) * rename 'presaleFile' IPC actions to generic 'walletFile' * update the import-screen depending on wallet type * leverage ethereum-keyfile-recognizer * update yarn.lock * fix merge relic * [ESLint] * polish * update dependency and fix ESLint * improvements * update menu-label * Dutch translation improved (ethereum#1610) * Update mist.nl.i18n.json Dutch translations * Corrected proposed changes for Dutch translations. Capital "E"ther and changed from formal to informal throughout the file. * change window height (ethereum#1612) * Allow for operators while parsing 'mist.solidity.version' (ethereum#1613) * Allow for operators while parsing 'mist.solidity.version' * minor improvement in regex * Sync Dutch translation file to English + corrections (ethereum#1616) * Sync Dutch translations to English + corrections Mostly rearranged the lines to get equal to the English translation file for easier future maintenance. Also did some small spelling corrections and improved a few translations when I matched the Dutch and English files. * Fixed JSON syntax Fixed JSON syntax * Processed suggestions, many thanks! * update i18n files according to english base files (ethereum#1618) * [travis] don't wait for mac build on PR check (ethereum#1611) * 36 * 37 * [gulp] don't build NSIS installer on 'wallet' task (ethereum#1614) * don't build NSIS installer in 'wallet' task * [readme] add 'makensis' to brew install * Bump version string to 0.8.9 (ethereum#1626) * Spectron testing suite (ethereum#1553) * Spectron iteration * Updating spectron * Creating switch for mist.lokidb for automated tests * Adding chai-as-expected * Changing IPC flag * Pairing spectron and electron versions * [ESLint] Minor fixes * Adding chai-string * Couple of tests passing * update .eslintrc.yml * Simplifying code * Removing delay in favor of better window management * Adding tests for URL bar * Focusing window before each test * Minor fixes * Improving mist setup and teardown * Fixing wallet test * adding html fixture * Improving test helpers * Tests for ETH-01-002 * Updating tests * Starting local HTTP server to deal with html fixtures * Updating tests setup * Adding more tests * Updating travis file to run spectron tests * Refactoring tests * Tests for ETH-01-007 * Downloading geth on the fly * Fine-tuning geth download during tests * Changing linux binary dir * Fixing binary path on linux * Travis debug * Travis debug * Changing fixtures * Fixing tests * Fixing travis file * More tests * Adjusting timeouts * Adjusting GULP_PLATFORM test env variable * Adjusting timeouts * Disabling some tests for now * Disabling a test * Fix raw data display ('0x') in data-less TXs (ethereum#1625) * Update dependencies (ethereum#1623) * Update dependencies * Updating yarn lock * udpate (ethereum#1622) * Cleaner mocha-in-browser test results (ethereum#1630) * Removing DavidDM broken badges (ethereum#1631) * Update geth to 1.5.5 (ethereum#1520) (ethereum#1522) (ethereum#1633) * updated solc again * updated solc to 0.4.6 * Update geth to 1.5.5 (ethereum#1520) * Update geth to 1.5.5 * corrected windows zip's internal paths * changed sanity check * made node starting better * also log path from which to fetch * show fetching origin URL * fix ESLint errors * removed -stable
* Update geth (osx still missing) * include mac
* sync was being skipped * sync was being skipped
* updates confirmation window size issue * updated to web3.js 0.18.2, please run yarn * improved gas estimation errors * add error check only when estimatedGas is lower than providedGas
* removed dechunker * added legacyWeb3Provider * added comment * warn on websocket connection * added old full web3 for legacy reasons
* fix rule "intend" * fix rule "no-trailing-spaces" * fix rule "eol-last" (new line at end of file) * fix rule "keyword-spacing" * fix rule "space-before-blocks" * fix rule "space-infix-ops" (space before and after operators) * fix rule "space-before-function-paren" * fix rule "object-curly-spacing" * fix rule "no-multi-spaces" * fix rule "curly" * fix rule "no-multiple-empty-lines" * fix rule "quotes" * fix rule "semi-spacing" * fix rule "semi" * fix rule "key-spacing" * fix rule "space-in-parens" * fix rule "spaced-comment" * fix rule "comma-spacing" * fix rule "no-lonely-if" * fix rule "eqeqeq"
…thereum#1775) * show backup hint when createing accounts, demanding min 8 characters * fix typo
chrisfranko
pushed a commit
that referenced
this pull request
Mar 27, 2017
chrisfranko
pushed a commit
that referenced
this pull request
Mar 27, 2017
Merging of Choose account popup ethereum#814 * Creating change account modals * connect popup * fixing typo * connect account popup * Straightens checkbox on connect account modal * Connect account popup interface * fixing scroll gradient on choose account popup * Informing account names on connect popup * Adding animations on account and dapp info * Improvements on connect popup * Tweaking URL breakdown to show arrows when necessary * Fixing edgy cases on breadcrumb * Removing browserBar interface * Removing browser bar fold-down element * Vertical flexbox - window stretches appropriately * Popup updates * change dapp style and icon (#1) * more working code * Reload permissions and code cleaning * Website placeholder icon * Cleaning code * Unpin tab * Not showing remove button on wallet tab * Merge Hard Fork choice - Mist into master (ethereum#979) * bump version to 0.7.6 * updated os timesync * adding setting to change UI language (fixes ethereum#813) (ethereum#896) * simple language setting menu * use i18n label in menu * simple language setting menu * use i18n label in menu * change language of menu bar by triggering 'backendAction_setLanguage' * adds translations for language names * remove duplicate 'gulp update-nodes' (ethereum#897) * add i18n entry for OSX's 'Services' (ethereum#887) * add i18n entry for OSX's 'Services' * update missing osx menu strings * update-popup-window: prevent maximize (ethereum#885) * update-popup-window prevent maximize * add resizable:false * added shrinkwrap (ethereum#903) * fixed webview tagd and updated electrong to 1.2.5 (ethereum#905) * Fixes the node start IPC connection (ethereum#841) * fixed eth start, but crash is not graceful * better socket connection logic, remove master ps logic for eth * fix splash screen display of state text for eth * better gulp download plugin, remove master passwd stuff once and for all * Adds Toggle password visibility to on boarding screen (ethereum#909) * add password visibilty toggle to onboarding * replaced 'showPassword' with 'passwordInputType' * changed id into class * 18n cleanup (former ethereum#889) (ethereum#910) * Renamed Korean and Albanian to ISO standards * Added menu items to set to Dutch, Farsi, Albanian and Italian (these three are rather incomplete) * changed log error to warn * fixed ipcBackend notifications * Fixing wallet tab insertion (ethereum#911) * small cleanup * added admin:true permission * removed webview duplicate * Fully automated UI testing (ethereum#788) * got app launching via test * work towards testing - private net integration * change how we name options to pass directly to geth, so that test suite works * refactor preloader scripts * cleanly quitting the app at the end of tests * trying to get electron working properly, upgrade to 1.2.2 * upgrade spectron * work towards getting tests to work * dont use NODE_ENV var as Meteor production uses it * fixed eth start, but crash is not graceful * better socket connection logic, remove master ps logic for eth * fix splash screen display of state text for eth * better gulp download plugin, remove master passwd stuff once and for all * got basic test working * update travis build * trigger build * update readme, travis * fix gulp-download-stream use * fix build command * testing account creation * added account creation test * only do a shallow clone * final deposit test * should be able to find geth executable now * adds the wallet as the default tab (ethereum#924) * Text updates Fix typos and make writing more clear and accurate * Capitalization consistency * adds the wallet as the default tab * always upsert * Update version to 0.8 (ethereum#930) * update to 0.8 * fixes menu margin clipping * remove comma * work towards new minimonogo sync * fix ipcpath bug * got basic persistence working * minor error * refactor sendTransaction error alerts (ethereum#959) * "Change language" translated in mist.nb.i18n.json (ethereum#953) "Change language" translated in mist.nb.i18n.json * timer delay on menu refreshing from tab updates * rename 'passwordError' to 'wrongPassword' for consistency (ethereum#951) * sync not specific to a window * refactor to enable access to mongo sync from all windows * update .meteor paths on .gitignore (ethereum#977) * DAO fork support (ethereum#970) * created DAO fork dummy code * text update * added node flags choice * changed DAO fork texts * disable eth-node switch until hardfork is supported (ethereum#975) * disable eth-node until hardfork is supported * remove test function * reworded the disclaimer link * Syncing Tabs after account connection * Enable Tabs sync and persistence in all windows (#2) * sync not specific to a window * refactor to enable access to mongo sync from all windows * Pin/unpin Tabs * Adding show password on Create account popup * change remove button animation * add globe image as default non-icon
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.