Skip to content

Commit

Permalink
Merge pull request #1 from super3/master
Browse files Browse the repository at this point in the history 
rebase
  • Loading branch information
@lakerta06
lakerta06 committed Jan 28, 2014
2 parents 7590ea6 + 8a4d41c commit a275d93
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 36 deletions.
12 changes: 6 additions & 6 deletions bitshares-ags.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<h3>Take part in BitShares Solutions</h3>
<p style="text-align: justify;">
Both BitShares PTS and BitShares AGS rely upon the willingness of us and Allied developers to honor these donations
with credits in new decentralized block-chain based products that we as Invictus Innovations and others develop. All
with credits in new decentralized blockchain-based products that we as Invictus Innovations and others develop. All
of our products are open source and therefore anyone is able to honor the donors who made these technologies possible.

From Allied developers we expect a Social Consensus to form in the marketplace about
Expand All @@ -79,7 +79,7 @@
(a) Developers should seek a reasonable balance between equal-opportunity lotteries and ways to compensate
those who sacrifice their savings or labor. (b) The market needs to give developers freedom to raise
funds to develop, support and promote their new DACs. We believe that the following allocation represents
the minimum fair genesis-block allocation for block-chain based solutions.
the minimum fair genesis-block allocation for blockchain-based solutions.
</p>
<ul style="list-style-type: circle;">
<li>At least 10% of the BitShares should be allocated to holders of BitShares PTS.</li>
Expand All @@ -88,7 +88,7 @@
</ul>
<br/>
This emerging social consensus and resulting network effect will be further reinforced by the Social Consensus Software License
which will require all derivative software products to initialize their blockchain according to this consensus.
which will require each derivative software products to initialize its blockchain according to this consensus.
<br/>
<br/>
<br/>
Expand All @@ -105,7 +105,7 @@
</p>
<a href="https://blockchain.info/address/1ANGELwQwWxMmbdaSWhWLqBEtPTkWb8uDc"><pre>1ANGELwQwWxMmbdaSWhWLqBEtPTkWb8uDc</pre></a>
<p>
Those who donate PTS to this angel Address will proportionally split 5,000 AGS
Those who donate PTS to this Angel Address will proportionally split 5,000 AGS:
</p>
<a href="https://coinplorer.com/PTS/Addresses/PaNGELmZgzRQCKeEKM6ifgTqNkC4ceiAWw"><pre>PaNGELmZgzRQCKeEKM6ifgTqNkC4ceiAWw</pre></a>
<p>
Expand All @@ -118,8 +118,8 @@
<a class="btn btn-yellow btn-lg" href="http://angelshares.info/beta/">Visit angelshares.info</a>
</p>
</p>
<h3 style="color:orange"><i>You must send all donations from a wallet for which you control the Private Key such as Bitcoin-Qt</i></h3>
<h3 style="color:red">Do not send donations directly from an exchange or the exchange will be credited with the AGS instead of you.</h3>
<h3 style="color:orange"><i>You must send all your donations from a wallet for which you control the Private Key, such as Bitcoin-Qt.</i></h3>
<h3 style="color:red">Do not send donations directly from an exchange, or the exchange will be credited with the AGS instead of you.</h3>
</div>
</div><!-- /row -->

Expand Down
12 changes: 6 additions & 6 deletions bitshares-pts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<p style="text-align: justify;">
BitShares PTS is a Bitcoin clone that allows you to buy and trade ownership in future BitShares created by
Invictus Innovations or derived from our software. A BitShare is a stake in what we like to call a
decentralized autonomous company and Invictus has many innovative blockchains on our roadmap.
Decentralized Autonomous Company (DAC), and Invictus has many innovative blockchains on our roadmap.
</p>
<p>
BitShares PTS comes with a social contract to allocate at least 10% of the total shares in all future
Expand All @@ -42,13 +42,13 @@
<div class="pts-resources">
<h3> Mining Pools</h3>

<p>Mining PTS on your own is hard. The network consists of many computers running calculations in the client software or special mining software. This keep the network intact.
<p>Mining PTS on your own is hard. The network consists of many computers running calculations in the client software or special mining software. This keeps the network secure.
But you can mine coins with your own processing power or cloud servers. The pool combines the power of all
connected nodes and pays you proportionally for your sharerate. See our <a href="mining.html">mining guide</a> for more explanation. Most pools have their own optimized miners, so do check out their get started pages.</p>
connected nodes and pays you proportionally for your sharerate. Most pools have their own optimized miners, so do check out their "get started" pages.</p>

<p>This is a list of pools mining PTS:</p>
<ul style="list-style-type: circle;">
<li><a href="http://pts.beeeeer.org">http://pts.beeeeer.org</a> - 2.5% fee, Pay Per Share</li>
<li><a href="http://ptsweb.beeeeer.org">http://ptsweb.beeeeer.org</a> - 2.5% fee, Pay Per Share</li>
<li><a href="http://pts.rpool.net">http://pts.rpool.net</a> - 3% fee, payout per share of last round</li>
<li><a href="http://ptspool.com/">http://ptspool.com/</a> - 3% fee, Pay Per Share </li>
<li><a href="http://ypool.net">http://ypool.net</a> - 5% fee, multicoin pool, Pay Per Share</li>
Expand Down Expand Up @@ -90,7 +90,7 @@

<h3> Exchanges</h3>

<p>Exchanges are the trading websites where you can buy or sell PTS. Be careful not to place large sums of PTS on exchanges without adequate security measures as a good password and 2-factor authentication</p>
<p>Exchanges are the trading websites where you can buy or sell PTS. Be careful not to place large sums of PTS on exchanges without adequate security measures, such as a good password and 2-factor authentication</p>
<ul style="list-style-type: circle;">
<li><a href="https://bter.com/">Bter Exchange</a></li>
<li><a href="https://www.cryptsy.com/">Cryptsy Exchange</a></li>
Expand All @@ -99,7 +99,7 @@
</ul>

<h3> Tools and Forum</h3>
<p>Exchanges are the trading websites where you can buy or sell PTS. Be careful not to place large sums of PTS on exchanges without adequate security measures as a good password and 2-factor authentication.</p>
<p>To learn more about PTS, explore the following resources:</p>
<ul style="list-style-type: circle;">
<li><a href="http://btsblock.com/chain/ProtoShares">Blockchain explorer - View transactions by pts adress</a></li>
<li><a href="https://coinplorer.com/PTS">PTS Coin Information - Current PTS Statistics</a></li>
Expand Down
8 changes: 4 additions & 4 deletions bitshares.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@

<ul>
<!--<li><h3>Your current Bank</h3></li>-->
<li>All revenue spent on security</li>
<li>Additional 12% security tax</li>
<li>All Revenue Spent on Security</li>
<li>Additional 12% Security Tax</li>
<li>Slow Confirmations</li>
<li>Consumes Billions Annually</li>
<li class="final"><span>Many alt-coins with the same unprofitable business model</span></li>
Expand All @@ -91,8 +91,8 @@

<ul>
<!--<li><img class="bitsharesx-logo" src="assets/img/bitsharesx.png" alt="BitsharesX" /></li><-->
<li>All revenues paid as dividends</li>
<li>No security tax</li>
<li>All revenues Paid as Dividends</li>
<li>No Security Tax</li>
<li>Fast Confirmation</li>
<li>Efficient Operation</li>
<li class="final"><span>Many alt-companies with creative profit models.</span></li>
Expand Down
4 changes: 2 additions & 2 deletions bitsharesx.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@
<div class="col-md-3">
<center>
<img style="border-radius: 15px;"width="200px" height="200px"src="assets/img/mortgage.jpg" alt="blocks" />
<h3><b>Lends Dollars</b></h3> <h4>into existance <br/> on collateral.</h4>
<h3><b>Lends Dollars</b></h3> <h4>into existence <br/> on collateral.</h4>
</center>
</div>
<div class="col-md-3">
<center>
<img style="border-radius: 15px;"width="200px" height="200px"src="assets/img/paid-stamp.jpg" alt="blocks" />
<h3><b>Repays Loan</b></h3> <h4>to take dollars<br/> out of existance.</h4>
<h3><b>Repays Loan</b></h3> <h4>to take dollars<br/> out of existence.</h4>
</center>
</div>
<div class="col-md-3">
Expand Down
12 changes: 6 additions & 6 deletions devcon.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
<h1> Beyond Bitcoin Summit </h1>
<p>
This summit will be the first event in the Bitcoin space that focuses entirely on
the future of blockchain based businesses. Since we first <a href="http://letstalkbitcoin.com/is-bitcoin-overpaying-for-false-security">introduced</a> the concept of Decentralized Autonomous
Companies (DACs) in September 2013 the idea has gone viral and now everyone from Mastercoin to Ethereum is talking
the future of blockchain-based businesses. Since we first <a href="http://letstalkbitcoin.com/is-bitcoin-overpaying-for-false-security">introduced</a> the concept of Decentralized Autonomous
Companies (DACs) in September 2013 the idea has gone viral, and now everyone from Mastercoin to Ethereum is talking
about Distributed Applications or Decentralized Autonomous Organizations.
</p>
<p>
Max Keiser recently did a <a href="http://www.youtube.com/watch?v=VPmkeio3jJQ">report on Capitalism 2.0</a> where they
Max Keiser recently did a <a href="http://www.youtube.com/watch?v=VPmkeio3jJQ">report on Capitalism 2.0</a> in which they
declared "2014 is going to show the true power of the blockchain". The Beyond Bitcoin Summit is ground zero. We
are calling all entrepreneurs, investors, and software developers to meet in Las Vegas where we are assembling unique content
and opportunities that is far beyond that of any Bitcoin conference to date.
and opportunities that are far beyond those of any Bitcoin conference to date.
</p>
</div>
</div>
Expand All @@ -57,8 +57,8 @@
opportunity to assemble the necessary talent and capital to launch your own venture.
</p><p>
Invictus is leading the way with our BitShares X platform which implements the business model of a bank and exchange on a blockchain, but there
are more opportunities in this space than anyone can currently imagine. There are so many potential business models to consider including:
voting, auctions, domains, intellectual property, gambling, insurance, and governance that anyone with an understanding of the
are more opportunities in this space than anyone can currently imagine. There are so many potential business models to consider &ndash; including:
voting, auctions, domains, intellectual property, gambling, insurance, and governance &ndash; that anyone with an understanding of the
concepts being discussed at this summit can launch a revolutionary and <i>profitable</i> new business.
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<i class="fa fa-angle-right"></i> <a href="https://github.com/InvictusInnovations">GitHub Repository</a><br/>
<i class="fa fa-angle-right"></i> <a href="http://wiki.invictus.io">Wiki</a><br/>
<i class="fa fa-angle-right"></i> <a href="https://github.com/super3/invictus">Code for Invictus.io</a><br/>
<i class="fa fa-angle-right"></i> <a href="https://github.com/super3/invictus/issues?milestone=1&amp;state=open">Report Problems with Invictus.io</a>
<i class="fa fa-angle-right"></i> <a href="https://github.com/super3/invictus/issues?milestone=1&amp;state=open">Report problems with Invictus.io</a>
</p>
</div><!-- /col-lg-3 -->
Expand Down
4 changes: 2 additions & 2 deletions keyhotee.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
<div class="row">
<div class="col-md-4 col-md-offset-2">
<h3>Your new Email</h3>
<p>If you know how to use email you already know how to use Keyhotee. What makes Keyhotee different is that your communication is secure by default.</p>
<p>If you know how to use email, you already know how to use Keyhotee. What makes Keyhotee different is that your communication is secure by default.</p>
</div>
<div class="col-md-4 col-md-offset-1">
<h3>Your new Identity</h3>
<p>Keyhotee uses blockchain technology to uniquely assign every user a globally unique identity that can be used anywhere on the internet.</p>
<p>Keyhotee uses blockchain technology to provide each user with a globally-unique identity that can be used anywhere on the internet.</p>
</div>
</div><!-- end row -->
</div><!-- end container -->
Expand Down
19 changes: 10 additions & 9 deletions team.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,36 @@
<a class="zoom blue" href="#"><img class="img-responsive" src="assets/img/team/Daniel Larimer - Bio Card.png" alt="" /></a>
<!--<p> Daniel Larimer <br>CEO America, CTO, Founder, Chairman </p>
<p style="text-align: justify;">
Daniel Larimer is a Virginia based entrepreneur and software engineer with a passion to find free market solutions to secure life, liberty and property for all.
Daniel Larimer is a Virginia-based entrepreneur and software engineer with a passion to find free market solutions to secure life, liberty and property for all.
In addition to software development, Daniel is a self-taught expert in Austrian economics. He has recently co-founded Invictus Innovations Incorporated with the mission of
developing decentralized solutions to centralized problems where he serves as the CTO and is the chief architect of the BitShares peer-to-peer trust-less,
black-chain-based,financial system.
blackchain-based, financial system.
</p> -->
</div>
<div class="col-lg-6 desc">
<a class="zoom blue" href="#"><img class="img-responsive" src="assets/img/team/Bo Shen - Bio Card.png" alt="" /></a>
<!--<p> Bo Shen<br>Director, CEO China </p>
<p style="text-align: justify;">
Bo Shen is an evangelist, entrepreneur and inverter in math based ecosystem. As a veteran of the financial and Internet industries, Bo Shen has been actively involved in Bitcoin, Ripple and BitShares.
He is currently the one of three founding members of the Bitcoin Foundation's China Chapter, the Director of MyBitfund, Invictus Innovations and RippleChina.
He is currently one of the three founding members of the Bitcoin Foundation's China Chapter, the Director of MyBitfund, Invictus Innovations and RippleChina.
</p>-->
</div>
<div class="col-lg-6 desc">
<a class="zoom blue" href="#"><img class="img-responsive" src="assets/img/team/Li Xiaolai - Bio Card.png" alt="" /></a>
<!--<p> Li Xiaolai<br>Director </p>
<p style="text-align: justify;">
Li Xiaolai is an entrepreneur, author, social innovator and educator based in Beijing. Author of the best-selling book Befriending Time.
Li Xiaolai is an entrepreneur, author, social innovator and educator based in Beijing.
He is author of the best-selling book <i>Befriending Time</i>.
His work at the New Oriental School gave him recognition as one of the best teachers in China.
Xiaolai is the founder of several ventures including the website knewone.com, the venture capital fundbitfund.pe and
Xiaolai is the founder of several ventures, including the website knewone.com, the venture capital fundbitfund.pe and
his own chain of private schools in Beijing,Shanghai,Shenzhen and Nanjing. He supports bitcointalk.org as a VIP member and as a lifetime member of the Bitcoin Foundation.
</p>-->
</div>
<div class="col-lg-6 desc">
<a class="zoom blue" href="#"><img class="img-responsive" src="assets/img/team/Stan Larimer - Bio Card.png" alt="" /></a>
<!--<p> Stan Larimer<br>President, Chief Operating Officer </p>
<p style="text-align: justify;">
Stan Larimer is a senior program manager and systems/hardware/ software engineer with 37 years experience with unmanned systems in the aerospace and internet industries.
Stan Larimer is a senior program manager and systems/hardware/ software engineer with 37 years' experience with unmanned systems in the aerospace and internet industries.
He has served as an Assistant Vice President for Science Applications International Corporation (SAIC) and has worked with and for
the Air Force Wright Patterson Labs and many of the top companies in the American aerospace industry, He also taught rocket science at the U.S.Air Force Academy.
</p>-->
Expand All @@ -70,7 +71,7 @@
Brian Page is a trends investor, entrepreneur and marketing specialist with a passion for building the next great brand.
His primary talent is the ability to craft a simple message that's relevant, consistent and recognizable.
He takes pride in making the complex easy to understand and championing the revolutionary concepts of crypto-currencies, crypto-equities and decentralization.
He's thrilled to be joining the Invictus team as its brand champion.
He's thrilled to be joining the Invictus Innovations Incorporated team as its brand champion.
</p>-->
</div>
<div class="col-lg-6 desc">
Expand All @@ -79,7 +80,7 @@
<p style="text-align: justify;">
Teaches Finance and Economics, both on-line and in the classroom and has spent the past two decades working on the Internet in several capacities.
Served as financial cryptographic consultant on several online payments system startups during the height of the Dot.Com Era. Dean of Online Business Programs for Keiser University in Florida.
Currently developing economic underpinnings for Invictus Innovations while teaching on-line and building Pecuniology.corn, which is dedicated to promoting economic and financial literacy worldwide.
Currently developing economic underpinnings for Invictus Innovations Incorporated while teaching on-line and building Pecuniology.corn, which is dedicated to promoting economic and financial literacy worldwide.
</p>-->
</div>
<div class="row mt centered">
Expand Down Expand Up @@ -115,4 +116,4 @@

</div><!-- /container -->
</div><!-- /container -->
<?php include 'footer.php'; ?>
<?php include 'footer.php'; ?>

0 comments on commit a275d93

Please sign in to comment.