Changes to the way TemplateVar is handled #1
Conversation
This file contains 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
added 5 commits
May 13, 2016 11:27
…e it" This reverts commit 8d35510.
|
Looks good, though it looks there are merge conflicts that need to be resolved. Plus in the template itself I have fixed the |
|
Changed the title issue. Not sure which merge issues are there but will merge them myself then, since the purpose of this PR was just to give feedback on the templateVar |
|
@alexvandesande In ethereum#559 I changed the title attribute values and the inner text to all be using i18n. I'm surprised you didn't get any merge conflicts that way. |
|
Oh I did. Haven't uploaded the templatevar changes yet.. |
hiddentao
pushed a commit
that referenced
this pull request
Jul 14, 2016
hiddentao
pushed a commit
that referenced
this pull request
Jul 25, 2016
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 (ethereum#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
# for free
to join this conversation on GitHub.
Already have an account?
# 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.