diff --git a/README.md b/README.md index ff65c64067..f7ee5e51f1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/ethereum/browser-solidity.svg?branch=master)](https://travis-ci.org/ethereum/browser-solidity) +[![Build Status](https://travis-ci.org/ethereum/remix-ide.svg?branch=master)](https://travis-ci.org/ethereum/remix-ide) # Remix @@ -22,7 +22,7 @@ Note: it contains the latest release of Solidity available at the time of the pa Install **npm** and **node.js** (see https://docs.npmjs.com/getting-started/installing-node), then do: ```bash -git clone https://github.com/ethereum/browser-solidity.git +git clone https://github.com/ethereum/remix-ide.git cd browser-solidity npm install ``` @@ -55,7 +55,7 @@ npm run linkremixdebugger Some things to consider if you have trouble building the package: -- Make sure that you have the correct version of `node`, `npm` and `nvm`. You can find the version that is tested on Travis CI by looking at the log in the [build results](https://travis-ci.org/ethereum/browser-solidity). +- Make sure that you have the correct version of `node`, `npm` and `nvm`. You can find the version that is tested on Travis CI by looking at the log in the [build results](https://travis-ci.org/ethereum/remix-ide). Run: @@ -102,8 +102,12 @@ After that, follow these steps: - Browse to `chrome://extensions/` - Make sure 'Developer mode' has been checked - Click 'Load unpacked extension...' to pop up a file-selection dialog +<<<<<<< HEAD - Select your `browser-solidity` folder ## Documentation To see details about how to use Remix for developing and/or debugging Solidity contracts, please see [our documentation page](https://remix.readthedocs.io) +======= +- Select your `remix-ide` folder +>>>>>>> rename browser-solidity => remix.ide diff --git a/ci/deploy_from_travis_master.sh b/ci/deploy_from_travis_master.sh index 1d0838d3d6..ab5a2935bf 100755 --- a/ci/deploy_from_travis_master.sh +++ b/ci/deploy_from_travis_master.sh @@ -9,7 +9,7 @@ git config user.email "$COMMIT_AUTHOR_EMAIL" git checkout --orphan gh-pages git rm --cached -r . echo "# Automatic build" > README.md -echo "Built website from \`$SHA\`. See https://github.com/ethereum/browser-solidity/ for details." >> README.md +echo "Built website from \`$SHA\`. See https://github.com/ethereum/remix-ide/ for details." >> README.md echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md # ZIP the whole directory zip -r remix-$SHA.zip $FILES_TO_PACKAGE diff --git a/ci/deploy_from_travis_remix-live.sh b/ci/deploy_from_travis_remix-live.sh index 98d9a0462e..27e5492c3c 100755 --- a/ci/deploy_from_travis_remix-live.sh +++ b/ci/deploy_from_travis_remix-live.sh @@ -9,7 +9,7 @@ git config user.email "$COMMIT_AUTHOR_EMAIL" git checkout --orphan gh-pages git rm --cached -r . echo "# Automatic build" > README.md -echo "Built website from \`$SHA\`. See https://github.com/ethereum/browser-solidity/ for details." >> README.md +echo "Built website from \`$SHA\`. See https://github.com/ethereum/remix-ide/ for details." >> README.md echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md # ZIP the whole directory zip -r remix-$SHA.zip $FILES_TO_PACKAGE diff --git a/manifest.json b/manifest.json index 466cd37dd9..998eda1025 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Solidity", "description": "Realtime compiler and runtime", - "update_url": "https://ethereum.github.io/browser-solidity/", + "update_url": "https://ethereum.github.io/remix-ide/", "version": "1.1", "manifest_version": 2, "background": { diff --git a/package.json b/package.json index aba16682a4..5735086b7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "browser-solidity", + "name": "remix-ide", "version": "0.0.0", "description": "Minimalistic browser-based Solidity IDE", "devDependencies": { @@ -60,7 +60,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/ethereum/browser-solidity.git" + "url": "git+https://github.com/ethereum/remix-ide.git" }, "keywords": [ "ethereum", @@ -70,9 +70,9 @@ "author": "chriseth", "license": "MIT", "bugs": { - "url": "https://github.com/ethereum/browser-solidity/issues" + "url": "https://github.com/ethereum/remix-ide/issues" }, - "homepage": "https://github.com/ethereum/browser-solidity#readme", + "homepage": "https://github.com/ethereum/remix-ide#readme", "standard": { "ignore": [ "build/", diff --git a/src/app.js b/src/app.js index e15bfe646b..7def44c7c4 100644 --- a/src/app.js +++ b/src/app.js @@ -469,7 +469,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org filesProviders: filesProviders }) - // Add files received from remote instance (i.e. another browser-solidity) + // Add files received from remote instance (i.e. another remix-ide) function loadFiles (filesSet, fileProvider) { if (!fileProvider) fileProvider = 'browser' diff --git a/src/app/panels/file-panel.js b/src/app/panels/file-panel.js index 1e3910f708..02a26d034b 100644 --- a/src/app/panels/file-panel.js +++ b/src/app/panels/file-panel.js @@ -286,7 +286,7 @@ function filepanel (appAPI, filesProvider) { console.log(error) modalDialogCustom.alert('Failed to create gist: ' + error) } else { - var description = 'Created using browser-solidity: Realtime Ethereum Contract Compiler and Runtime. \n Load this file by pasting this gists URL or ID at https://ethereum.github.io/browser-solidity/#version=' + queryParams.get().version + '&optimize=' + queryParams.get().optimize + '&gist=' + var description = 'Created using remix-ide: Realtime Ethereum Contract Compiler and Runtime. \n Load this file by pasting this gists URL or ID at https://ethereum.github.io/remix-ide/#version=' + queryParams.get().version + '&optimize=' + queryParams.get().optimize + '&gist=' console.log(packaged) minixhr({ url: 'https://api.github.com/gists', @@ -308,7 +308,7 @@ function filepanel (appAPI, filesProvider) { // ------------------ copy files -------------- function copyFiles () { - modalDialogCustom.prompt(null, 'To which other browser-solidity instance do you want to copy over all files?', 'https://ethereum.github.io/browser-solidity/', (target) => { + modalDialogCustom.prompt(null, 'To which other remix-ide instance do you want to copy over all files?', 'https://ethereum.github.io/remix-ide/', (target) => { doCopy(target) }) function doCopy (target) { diff --git a/src/app/tabs/support-tab.js b/src/app/tabs/support-tab.js index ad16078380..29b9bbb105 100644 --- a/src/app/tabs/support-tab.js +++ b/src/app/tabs/support-tab.js @@ -5,7 +5,7 @@ var css = require('./styles/support-tab-styles') var infoText = yo`
Have a question, found a bug or want to propose a feature? Have a look at the - issues or check out + issues or check out the documentation page on Remix or Solidity.