Skip to content
This repository has been archived by the owner on Oct 17, 2022. It is now read-only.

Commit

Permalink
Reverse broken PR (#673)
Browse files Browse the repository at this point in the history
* Publish latest changes (#642)

* add missing closing curly brackets to constructor (#596)

* Param order cleanup (#599)

Not a huge deal but just thought it was cleaner to have the orders be consistent :)

* Update crowdsale.md (#600)

I was getting a warning about unused local variables and was unable to compile this code in the Ethereum Wallet app. This fixes that problem and (I think) still does everything else correctly.

* Add prerequisites and correct minor typos. (#598)

* It was a bit confusing to hop into this tutorial right away without the context on (1) having installed geth and (2) the smart contract file type / compiler etc.
* Couple of minor typos

* Update links for the Parity client (#607)

Links to parity.io and parity.io/parity were outdated. Company renamed itself from Ethcore to Parity Technologies.

* Remade the presale ether checker to use the actual genesis (#604)

* keep track of balance for multiple coin purchases (#603)

Without the `+`, the `balanceOf` mapping only keeps track of the last purchase an account makes. 

I.e, if an account participates in the crowdsale multiple times, the coin sale fails and an account asks for a refund, the account won't get all of its Ether back.

* Minify vendor scripts (#594)

* Merge gh pages (#608)

* gh-pages build

* Update github pages (#288)

* updated token

* fix link from homepage

* adds security issue to the token code

* updates to the readme

* Bump to 0.7.6

* update Bernd Lapp bio

* typo

* bump version to 8.1

* Separated Approve and Approve And Call

* Updated README with GitHub pages instructions

* Just like before (#284)

removed an errant you

* update to 0.8.2 and removes mix

* Update Google Analytics tracking ID (#286)

* Update Build 0.8.2

* added v to download link

* update Ethereum Wallet links to 0.8.6

* added geth binaries

* test file

* removed binaries

* added mist geth binaries

* removed binaries

* Timelock and payable daos

* update to 0.8.8

* build

* merge and build

* Updated build

* Update foundation.md

* Update foundation.md

* Update foundation.html

* Update foundation.html

* Update foundation.html

* Update foundation.html

* Update foundation.html

* Update foundation.html

* Removed link to the legal notice

* updated build

* Updated build (#602)

* merge

* megre and build

* remove devcon1 content

* Fix 404 (#611)

To reflect current ethereum/homestead-guide#305 / The [cpp-ethereum documentation](http://www.ethdocs.org/en/latest/ethereum-clients/cpp-ethereum/index.html)

* Add link to solidity install instructions (#610)

At this point in the tutorial it is likely that the reader does not have solidity installed, so it probably makes sense to link to where/how to install it. I've included one link I found but if there is a better link that could be included as well. It seems other parts of this page may be out of date but this sentence should help.

* ensure privacy, cookies and terms and built

* Small grammatical fix

* Replace throw with 0.4.10 require syntax

* add allowance update to burnFrom (#619)

* add allowance update to burnFrom

burnFrom method should also update sender's allowance. Otherwise, it can burn as much as it wants.

* improved language as requested

* Added href to tipjar address + fixed typo (#628)

Bitcoin address had link to blockchain explorer, but not Ether address. Also Bitcoins -> Bitcoin typo fixed

* Cleaned up the code examples and changed a couple of sentences. (#624)

* Remove final throw() functions in the token example (#631)

* Removed final throws from the token example

* Update pragma

* Final pragma change

* Removed unneeded function

* Update token.md (#637)

* Fix dao md: "The Blockchain Congress" chapter. (#622)

* fix function name 'Change Membership' to 'Add Member'.

* fix deploy problem.
I can not deploy example code on Ethereum Wallet v0.8.10.
Because of removed line.

* fix description of `Add Member`.

* fix old icon name `Deposit` to `Transfer Ether & Tokens`

* fix description of "Execute contract" popup.

* fix contract name `democracy contract` to `congress contract`.

* fix `addMember` function in Congress contract.

* fix `addMember` function in TimeLockMultisig contract also.

* Fix basic token contract for updated solidity (#621)

Also, refactors some repeated code into an internal function

* Add draft for a page about the wallet software (#616)

* Add draft for a page about the wallet software

* Update according to review

* Update to Donation Page (#639)

* gh-pages build

* Update github pages (#288)

* updated token

* fix link from homepage

* adds security issue to the token code

* updates to the readme

* Bump to 0.7.6

* update Bernd Lapp bio

* typo

* bump version to 8.1

* Separated Approve and Approve And Call

* Updated README with GitHub pages instructions

* Just like before (#284)

removed an errant you

* update to 0.8.2 and removes mix

* Update Google Analytics tracking ID (#286)

* Update Build 0.8.2

* added v to download link

* update Ethereum Wallet links to 0.8.6

* added geth binaries

* test file

* removed binaries

* added mist geth binaries

* removed binaries

* Timelock and payable daos

* update to 0.8.8

* build

* merge and build

* Updated build

* Update foundation.md

* Update foundation.md

* Update foundation.html

* Update foundation.html

* Update foundation.html

* Update foundation.html

* Update foundation.html

* Update foundation.html

* Removed link to the legal notice

* updated build

* Updated build (#602)

* Update Links for Parity Client

Links for Parity Client were outdated. Company changed it's name to Parity Technologies.

* Added Gruntfile data and built html for legal-related files: cookie-policy, privacy-policy, terms-of-use.

* Legal: slight prettying of the Gruntfile data.

* Legal: attempt to restore the privacy-policy link (app was not finding the content).

* Foundation: updated the mission statement for clarity.

* Updated build

* Updated build

* Donation update

* update solidity exampoles (#640)

* Fix links and blank spaces (#641)

* update solidity exampoles

* Add some spaces and fix link

* Resolve merge conflicts

* attempt to fix

* revert broken pr

* merge resolve
  • Loading branch information
alexvansande committed Sep 13, 2017
1 parent 7410217 commit 616af3a
Show file tree
Hide file tree
Showing 453 changed files with 1,500 additions and 8,155 deletions.
44 changes: 22 additions & 22 deletions Gruntfile.js
Expand Up @@ -41,7 +41,7 @@ module.exports = function(grunt) {
cleanup_js: ['dist/js/*.*', '!dist/js/app.*'],
cleanup_css: ['dist/css/*.css', '!dist/css/app.*.css']
},
pug: {
jade: {
build: {
options: {
data: function(dest, src) {
Expand Down Expand Up @@ -79,61 +79,61 @@ module.exports = function(grunt) {
},
files: [
{
'dist/index.html': 'views/index.pug'
'dist/index.html': 'views/index.jade'
},
{
'dist/agreement.html': 'views/agreement.pug'
'dist/agreement.html': 'views/agreement.jade'
},
{
'dist/crowdsale.html': 'views/crowdsale.pug'
'dist/crowdsale.html': 'views/crowdsale.jade'
},
{
'dist/dao.html': 'views/dao.pug'
'dist/dao.html': 'views/dao.jade'
},
{
'dist/ether.html': 'views/ether.pug'
'dist/ether.html': 'views/ether.jade'
},
{
'dist/cli.html': 'views/cli.pug'
'dist/cli.html': 'views/cli.jade'
},
{
'dist/greeter.html': 'views/greeter.pug'
'dist/greeter.html': 'views/greeter.jade'
},
{
'dist/assets.html': 'views/assets.pug'
'dist/assets.html': 'views/assets.jade'
},
{
'dist/sale.html': 'views/sale.pug'
'dist/sale.html': 'views/sale.jade'
},
{
'dist/token.html': 'views/token.pug'
'dist/token.html': 'views/token.jade'
},
{
'dist/brand.html': 'views/brand.pug'
'dist/brand.html': 'views/brand.jade'
},
{
'dist/foundation.html': 'views/foundation.pug'
'dist/foundation.html': 'views/foundation.jade'
},
{
'dist/donate.html': 'views/donate.pug'
'dist/donate.html': 'views/donate.jade'
},
// {
// 'dist/swarm.html': 'views/swarm.pug'
// 'dist/swarm.html': 'views/swarm.jade'
// },
{
'dist/4b24096abefbcbb08cb2b482eef4e36.html': 'views/devcon2.pug'
'dist/4b24096abefbcbb08cb2b482eef4e36.html': 'views/devcon2.jade'
},
{
'dist/devgrants.html': 'views/devgrants.pug'
'dist/devgrants.html': 'views/devgrants.jade'
},
{
'dist/privacy-policy.html': 'views/privacy-policy.pug'
'dist/privacy-policy.html': 'views/privacy-policy.jade'
},
{
'dist/cookie-policy.html': 'views/cookie-policy.pug'
'dist/cookie-policy.html': 'views/cookie-policy.jade'
},
{
'dist/terms-of-use.html': 'views/terms-of-use.pug'
'dist/terms-of-use.html': 'views/terms-of-use.jade'
}
]
}
Expand Down Expand Up @@ -228,11 +228,11 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-pug');
grunt.loadNpmTasks('grunt-contrib-jade');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-http');

grunt.registerTask('default', ['http', 'clean', 'pug', 'copy', 'cssmin', 'concat:vendor', 'concat:app', 'uglify', 'concat:js', 'concat:css', 'clean:cleanup_js', 'clean:cleanup_css']);
grunt.registerTask('default', ['http', 'clean', 'jade', 'copy', 'cssmin', 'concat:vendor', 'concat:app', 'uglify', 'concat:js', 'concat:css', 'clean:cleanup_js', 'clean:cleanup_css']);
grunt.registerTask('build', 'default');
};
2 changes: 1 addition & 1 deletion app.js
Expand Up @@ -9,7 +9,7 @@ var app = express();

// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'pug');
app.set('view engine', 'jade');
app.use(favicon(path.join(__dirname, '/dist/images/favicon.png')));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false }));
Expand Down
2 changes: 1 addition & 1 deletion data/mist_releases.json

Large diffs are not rendered by default.

80 changes: 44 additions & 36 deletions dist/agreement.html

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions dist/assets.html

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions dist/brand.html
@@ -1,10 +1,13 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"><meta http-equiv="X-UA-Compatible" content="chrome=1"><title>Branding Guidelines</title><meta name="description" content="Ethereum is a decentralized platform for applications that run exactly as programmed without any chance of fraud, censorship or third-party interference."><meta name="twitter:card" value="summary"><meta property="og:title" content="Branding Guidelines"><meta property="og:type" content="article"><meta property="og:url" content="https://www.ethereum.org/brand"><meta property="og:image" content="https://ethereum.org/images/wallpaper-homestead.jpg"><meta property="og:image:width" content="500"><meta property="og:image:height" content="500"><meta property="og:description" content="Ethereum is a decentralized platform for applications that run exactly as programmed without any chance of fraud, censorship or third-party interference."><link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:200,400,600,900,400italic" rel="stylesheet" type="text/css"><link rel="stylesheet" href="/css/app.min.css"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/default.min.css"></head><body><div class="inner-header default-header scrollme"><div class="breadcrumb animateme" data-when="exit" data-from="1" data-to="0.8" data-opacity="0" data-translatey="-20"> <a class="index" href="/">Ethereum </a>» <strong>Branding Guidelines </strong></div><a class="back" href="/">« Main page</a><figure class="ethereum-logo animateme" data-when="exit" data-from="0" data-to="1" data-translatey="120" data-opacity="0.5" data-scale="0.6" data-easing="linear"></figure><h3 class="center animateme" data-when="exit" data-from="0" data-to="0.5" data-translatey="30" data-opacity="0" data-scale="0.7" data-easing="linear"> Branding Guidelines </h3></div><div class="main-tutorial inner-page even"><div class="container"><div class="row"><div class="col-md-12 center"><h2 class="center">Ethereum Visual Identity Guide</h2><p>If you are a designer using our logo in a work, please download the following PDF: <a href="/images/logos/Ethereum_Visual_Identity_1.0.0.pdf">Ethereum Visual Identity Guide</a>: </p><p class="center"><a href="/images/logos/Ethereum_Visual_Identity_1.0.0.pdf"><img alt="Ethereum Visual Identity Guide" src="images/logos/Ethereum_Visual_Identity_1.0.0.png" width="400"></a></p></div></div></div></div><div class="main-tutorial inner-page brand"><div class="container"><div class="row"><div class="col-md-12"><h2>Guidelines for Third Parties Using Ethereum Trademarks</h2>
<!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"><meta http-equiv="X-UA-Compatible" content="chrome=1"><title>Branding Guidelines</title><meta name="description" content="Ethereum is a decentralized platform for applications that run exactly as programmed without any chance of fraud, censorship or third-party interference."><meta name="twitter:card" value="summary"><meta property="og:title" content="Branding Guidelines"><meta property="og:type" content="article"><meta property="og:url" content="https://www.ethereum.org/brand"><meta property="og:image" content="https://ethereum.org/images/wallpaper-homestead.jpg"><meta property="og:image:width" content="500"><meta property="og:image:height" content="500"><meta property="og:description" content="Ethereum is a decentralized platform for applications that run exactly as programmed without any chance of fraud, censorship or third-party interference."><link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:200,400,600,900,400italic" rel="stylesheet" type="text/css"><link rel="stylesheet" href="/css/app.min.css"><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/default.min.css"></head><body><div class="inner-header default-header scrollme"><div data-when="exit" data-from="1" data-to="0.8" data-opacity="0" data-translatey="-20" class="breadcrumb animateme"> <a href="/" class="index">Ethereum </a>» <strong>Branding Guidelines </strong></div><a href="/" class="back">« Main page</a><figure data-when="exit" data-from="0" data-to="1" data-translatey="120" data-opacity="0.5" data-scale="0.6" data-easing="linear" class="ethereum-logo animateme"></figure><h3 data-when="exit" data-from="0" data-to="0.5" data-translatey="30" data-opacity="0" data-scale="0.7" data-easing="linear" class="center animateme"> Branding Guidelines </h3></div><div class="main-tutorial inner-page even"><div class="container"><div class="row"><div class="col-md-12 center"><h2 class="center">Ethereum Visual Identity Guide</h2><p>If you are a designer using our logo in a work, please download the following PDF: <a href="/images/logos/Ethereum_Visual_Identity_1.0.0.pdf">Ethereum Visual Identity Guide</a>: </p><p class="center"><a href="/images/logos/Ethereum_Visual_Identity_1.0.0.pdf"><img alt="Ethereum Visual Identity Guide" src="images/logos/Ethereum_Visual_Identity_1.0.0.png" width="400"></a></p></div></div></div></div><div class="main-tutorial inner-page brand"><div class="container"><div class="row"><div class="col-md-12"><h2>Guidelines for Third Parties Using Ethereum Trademarks</h2>

<p>We are revising those guidelines in order to have a more open approach towards the use of the Ethereum logo that is more community-friendly and supports the greater Ethereum and crypto innovation ecosystem. The current branding guidelines will be updated to reflect a policy that all current Ethereum logos are under Creative Commons attribution 3.0.</p>

<p>The Ethereum Foundation may be releasing a special seal for use by approved people or entities for foundation specific advocacy, fundraising, and mission-related efforts; more details will be announced.</p>

<h3>Contact Information</h3>
<p>If you have any questions or clarifications pertaining to these guidelines, please email us at
<a href="mailto:brand@ethereum.org">brand@ethereum.org</a></p>
<a class="button small" href="https://github.com/ethereum/ethereum-org/edit/master/views/content/branding.md">Improve this page</a></div></div></div></div><footer class="scrollme"><div class="footer"><div class="container"><div class="row"><div class="col-md-6 developers" id="developer-resources"><h2>Developer Resources</h2><ul><li>What is Ether? <a href="./ether">Read our FAQ</a></li><li>Source code on <a href="http://github.com/ethereum/">GitHub</a></li><li>Read the <a href="http://www.ethdocs.org/">Homestead Documentation</a></li><li>Learn the <a href="https://solidity.readthedocs.org/">Solidity Language</a></li><li>Learn more on the Ethereum <a href="http://ethdocs.org/en/latest/">documentation </a>and Ethereum <a href="https://github.com/ethereum/go-ethereum/wiki/">Go </a>Wiki</li><li>See latest data on <a href="https://ethstats.net">Network Stats</a></li><li>Download our <a href="assets">Logo assets </a></li><li>Want to write about us? <a href="mailto:press@ethereum.org ">Press inquiries</a></li></ul></div><div class="col-md-6" id="about-us"><h2>Ethereum Foundation</h2><p>Ethereum is developed by a worldwide team of passionate developers for the <a href="./foundation">Ethereum Foundation</a>, a Swiss nonprofit organization. </p><p> <a class="donate-button" href="./donate">Donate to support development </a><div class="caption">(and you can get a unicorn!)</div></p></div></div><div class="row"><div class="col-md-6 community" id="community"><h2>Community</h2><ul><li><a class="blog" href="https://blog.ethereum.org" target="_blank">Blog</a></li><li><a class="twitter" href="https://twitter.com/ethereumproject" target="_blank">Twitter</a></li><li><a class="youtube" href="https://www.youtube.com/user/ethereumproject" target="_blank">YouTube</a></li><li><a class="reddit" href="https://www.reddit.com/r/ethereum" target="_blank">Reddit</a></li><li><a class="gitter" href="https://gitter.im/orgs/ethereum/rooms" target="_blank">Gitter</a></li><li><a class="stackexchange" href="https://ethereum.stackexchange.com" target="_blank">Stack Exchange</a></li><li><a class="facebook" href="https://www.facebook.com/ethereumproject" target="_blank">Facebook </a></li><li><a class="meetups" href="https://ethereum.meetup.com" target="_blank">Meetups</a></li><li><a class="email" href="mailto:info@ethereum.org">Email us</a></li><li class="canary"><p>The Ethereum Foundation (Stiftung Ethereum) has never been contacted by any agency anywhere in the world in a way which requires that contact not to be disclosed.</p><p>Stiftung Ethereum will publicly disclose any sort of inquiry from government agencies that falls outside the scope of regular business operations.</p></li></ul></div><div class="col-md-6 news" id="news"><h2>Tweets</h2><a class="twitter-timeline" href="https://twitter.com/ethereumproject" data-widget-id="694952013856112640" data-chrome="nofooter noborders transparent noheader" height="360px">Tweets by @ethereumproject</a><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></div></div><div class="col-md-12"><p class="copyright">Ethereum Foundation (Stiftung Ethereum), Zug, Switzerland </p><p class="footer_links"> <a href="./privacy-policy">Privacy Policy </a>&nbsp; &nbsp; <a href="./cookie-policy">Cookie Policy</a>&nbsp; &nbsp; <a href="./terms-of-use">Terms of Use</a></p><p class="copyright">Copyright ©2017 Ethereum Foundation. All Rights Reserved. </p></div></div></div></footer><script src="/js/app.min.js"></script><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script><script>$(document).ready(function(){

<p>If you have any questions or clarifications pertaining to these guidelines, please email us at
<a href="mailto:brand@ethereum.org">brand@ethereum.org</a></p><a href="https://github.com/ethereum/ethereum-org/edit/master/views/content/branding.md" class="button small">Improve this page</a></div></div></div></div><footer class="scrollme"><div class="footer"><div class="container"><div class="row"><div id="developer-resources" class="col-md-6 developers"><h2>Developer Resources</h2><ul><li>What is Ether? <a href="./ether">Read our FAQ</a></li><li>Source code on <a href="http://github.com/ethereum/">GitHub</a></li><li>Read the <a href="http://www.ethdocs.org/">Homestead Documentation</a></li><li>Learn the <a href="https://solidity.readthedocs.org/">Solidity Language</a></li><li>Learn more on the Ethereum <a href="http://ethdocs.org/en/latest/">documentation </a>and Ethereum <a href="https://github.com/ethereum/go-ethereum/wiki/">Go </a>Wiki</li><li>See latest data on <a href="https://ethstats.net">Network Stats</a></li><li>Download our <a href="assets">Logo assets </a></li><li>Want to write about us? <a href="mailto:press@ethereum.org ">Press inquiries</a></li></ul></div><div id="about-us" class="col-md-6"><h2>Ethereum Foundation</h2><p>Ethereum is developed by a worldwide team of passionate developers for the <a href="./foundation">Ethereum Foundation</a>, a Swiss nonprofit organization. </p><p> <a href="./donate" class="donate-button">Donate to support development </a><div class="caption">(and you can get a unicorn!)</div></p></div></div><div class="row"><div id="community" class="col-md-6 community"><h2>Community</h2><ul><li><a href="https://blog.ethereum.org" target="_blank" class="blog">Blog</a></li><li><a href="https://twitter.com/ethereumproject" target="_blank" class="twitter">Twitter</a></li><li><a href="https://www.youtube.com/user/ethereumproject" target="_blank" class="youtube">YouTube</a></li><li><a href="https://www.reddit.com/r/ethereum" target="_blank" class="reddit">Reddit</a></li><li><a href="https://gitter.im/orgs/ethereum/rooms" target="_blank" class="gitter">Gitter</a></li><li><a href="https://ethereum.stackexchange.com" target="_blank" class="stackexchange">Stack Exchange</a></li><li><a href="https://www.facebook.com/ethereumproject" target="_blank" class="facebook">Facebook </a></li><li><a href="https://ethereum.meetup.com" target="_blank" class="meetups">Meetups</a></li><li><a href="mailto:info@ethereum.org" class="email">Email us</a></li><li class="canary"><p>The Ethereum Foundation (Stiftung Ethereum) has never been contacted by any agency anywhere in the world in a way which requires that contact not to be disclosed.</p><p>Stiftung Ethereum will publicly disclose any sort of inquiry from government agencies that falls outside the scope of regular business operations.</p></li></ul></div><div id="news" class="col-md-6 news"><h2>Tweets</h2><a href="https://twitter.com/ethereumproject" data-widget-id="694952013856112640" data-chrome="nofooter noborders transparent noheader" height="360px" class="twitter-timeline">Tweets by @ethereumproject</a><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></div></div><div class="col-md-12"><p class="copyright">Ethereum Foundation (Stiftung Ethereum), Zug, Switzerland </p><p class="footer_links"> <a href="./privacy-policy">Privacy Policy </a>&nbsp; &nbsp; <a href="./cookie-policy">Cookie Policy</a>&nbsp; &nbsp; <a href="./terms-of-use">Terms of Use</a></p><p class="copyright">Copyright ©2017 Ethereum Foundation. All Rights Reserved. </p></div></div></div></footer><script src="/js/app.min.js"></script><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script><script>$(document).ready(function(){
$("#toc").tableOfContents(
$(".main-tutorial"), // Scoped to div#wrapper
{
Expand Down

0 comments on commit 616af3a

Please sign in to comment.