diff --git a/README.md b/README.md index a214ffa..0bf6caf 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ At the moment, jQuery is only used for the form submissions for its simple `$.aj - Greg McMullen ([@gmcmullen](https://github.com/gmcmullen)) - [IPDB Foundation](https://ipdb.io) - Morgan Sutherland ([@msutherl](https://github.com/msutherl)) - [IPDB Foundation](https://ipdb.io) -- Matthias Kretschmann ([@kremalicious](https://github.com/kremalicious)) - [BigchainDB](https://www.bigchaindb.com) +- Matthias Kretschmann ([@kremalicious](https://github.com/kremalicious)) - [BigchainDB](https://www.bigchaindb.com)/[Ocean Protocol](https://oceanprotocol.com) - Members of the BigchainDB development team - Representatives of Caretakers in the IPDB diff --git a/_design/caretakers.sketch b/_design/caretakers.sketch index 324f77a..086676c 100644 Binary files a/_design/caretakers.sketch and b/_design/caretakers.sketch differ diff --git a/_src/_assets/img/board/constance-choi.jpg b/_src/_assets/img/board/constance-choi.jpg deleted file mode 100755 index 2f0ac37..0000000 Binary files a/_src/_assets/img/board/constance-choi.jpg and /dev/null differ diff --git a/_src/_assets/img/board/elfriede-sixt.jpg b/_src/_assets/img/board/elfriede-sixt.jpg new file mode 100644 index 0000000..f54bc28 Binary files /dev/null and b/_src/_assets/img/board/elfriede-sixt.jpg differ diff --git a/_src/_assets/img/board/joachim-lohkamp.jpg b/_src/_assets/img/board/joachim-lohkamp.jpg new file mode 100644 index 0000000..52e3939 Binary files /dev/null and b/_src/_assets/img/board/joachim-lohkamp.jpg differ diff --git a/_src/_assets/img/board/kaspar-korjus.jpg b/_src/_assets/img/board/kaspar-korjus.jpg deleted file mode 100755 index 9f6274c..0000000 Binary files a/_src/_assets/img/board/kaspar-korjus.jpg and /dev/null differ diff --git a/_src/_assets/img/board/thomas-fürstner.jpg b/_src/_assets/img/board/thomas-fürstner.jpg new file mode 100644 index 0000000..b4256d4 Binary files /dev/null and b/_src/_assets/img/board/thomas-fürstner.jpg differ diff --git a/_src/_assets/img/logo-dyne-org.svg b/_src/_assets/img/logo-dyne-org.svg deleted file mode 100644 index e50ebb9..0000000 --- a/_src/_assets/img/logo-dyne-org.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/_src/_assets/img/logo-jolocom.svg b/_src/_assets/img/logo-jolocom.svg new file mode 100644 index 0000000..fb9d2d8 --- /dev/null +++ b/_src/_assets/img/logo-jolocom.svg @@ -0,0 +1,3 @@ + + + diff --git a/_src/_assets/img/logo-openmedia.svg b/_src/_assets/img/logo-openmedia.svg deleted file mode 100644 index c808a23..0000000 --- a/_src/_assets/img/logo-openmedia.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/_src/_assets/img/logo-riddle-and-code.svg b/_src/_assets/img/logo-riddle-and-code.svg new file mode 100644 index 0000000..12398f7 --- /dev/null +++ b/_src/_assets/img/logo-riddle-and-code.svg @@ -0,0 +1,3 @@ + + + diff --git a/_src/_assets/scss/_caretakers.scss b/_src/_assets/scss/_caretakers.scss index cf05958..937d053 100644 --- a/_src/_assets/scss/_caretakers.scss +++ b/_src/_assets/scss/_caretakers.scss @@ -52,6 +52,10 @@ transform: scale(1.2); } +.logo-caretaker--riddle-and-code { + transform: scale(1.2); +} + // // The logo fallback // diff --git a/_src/_data/board.yml b/_src/_data/board.yml index aa5bf38..6817b65 100755 --- a/_src/_data/board.yml +++ b/_src/_data/board.yml @@ -13,8 +13,49 @@ # +- name: Joachim Lohkamp + position: Member-at-Large + + bio: | + Joachim Lohkamp is an entrepreneur and tech-enthusiast with a heart for activism. As the founder of Jolocom, he has been working at the forefront of the decentralization movement in Berlin since 2014. With Jolocom, he is providing the identity solution that will enable real world use cases in smart contract based business models. + + To ultimately harvest this potential and inform innovation aimed regulation, he co-founded the German Blockchain Association (Bundesblock) that establishes the dialogue between blockchain businesses and politics. He is further active as an advisor for BlockchainHub, a decentralized Think Tank and as a Connector for OuiShare. Finally, you might find him as the Organizer of events like GetDecentralized, Decentralized Web Summit among others. + + social: + - name: Twitter + link: https://twitter.com/JockelLohkamp + - name: LinkedIn + link: https://www.linkedin.com/in/joachimlohkamp/ + + +- name: Thomas Fürstner + position: General Secretary + bio: | + Tom Fuerstner is a research scientist and university professor with over 30 years of experience in formal logic, social economy theory and digital art. Tom is the founder and CTO of Riddle & Code, a company focused on developing dedicated hardware for the physical internet and public ledger systems. + + These days, he is working on hardened server systems for operating BigchainDB and IPFS. The aim is to enable sustainable and resilient identity services in an emerging world of shared sovereignty between humans, machines, algorithms and protocols. + + social: + - name: LinkedIn + link: https://www.linkedin.com/in/thomas-fuerstner-0797592/ + + +- name: Elfriede Sixt + position: Treasurer + bio: | + Elfriede Sixt believes in the disruptive potential of decentralized peer-to-peer networks and blockchains. She is curious to learn how industries and business models will change along this way. + + Elfriede Sixt is a blogger and book author writing about crowdfunding, blockchains, and regulation. Her background is in Business administration and corporate finance. Besides that she is a founder of fintech.academy as well as ebit4u. + + social: + - name: Twitter + link: https://twitter.com/ebit4u + - name: LinkedIn + link: https://www.linkedin.com/in/elfriede-sixt-05384719/ + + - name: David Holtzman - position: President + position: Member-at-Large bio: | David Holtzman is an information technology security expert, educator and activist. He started his career as a cryptographic analyst, military codebreaker, U.S. Naval Security Group submariner, and Soviet Manned Space Program analyst. Holtzman is an early-stage internet pioneer. @@ -26,31 +67,6 @@ link: https://twitter.com/theglobalpov -- name: Constance Choi - position: Secretary - - bio: | - Constance Choi is the co-founder and Director of [COALA](http://coala.global/), an international multidisciplinary collaborative research and development initiative on blockchain technologies, smart contracts, and decentralized autonomous applications. Choi co-founded and was General Counsel and Chief Compliance Officer of the Kraken digital asset exchange. - - She holds a J.D. from UC Berkeley School of Law, and undergraduate degrees from Brown University and University of Cambridge. She has practiced at several law firms, including the Electronic Frontier Foundation, focusing on internet and technology law, intellectual property, privacy, data security, and constitutional rights. - - social: - - name: Twitter - link: https://twitter.com/sevenadvisory - - -- name: Greg McMullen - position: Treasurer - bio: | - Greg McMullen is a lawyer, internet advocate, and Chief Policy Officer at BigchainDB, where he built the framework for the IPDB Foundation and helped bring together its founding caretakers. He is a leading member of the [COALA IP](https://www.coalaip.org/) working group and co-authored the COALA IP specification and policy paper. - - Before joining BigchainDB and IPDB, he was a litigator at one of Canada’s top class actions law firms, where he worked on class actions involving privacy, copyright, competition law, and price fixing conspiracies. He served on the board of directors the BC Civil Liberties Association, Canada’s largest civil liberties organization, and authored the BCCLA’s guide to privacy and security when crossing borders with electronic devices. - - social: - - name: Twitter - link: https://twitter.com/gmcmullen - - - name: Nina-Luisa Siedler prefix: Dr. position: Member-at-Large @@ -63,14 +79,3 @@ - name: Twitter link: https://twitter.com/ninsie3 - -- name: Kaspar Korjus - position: Member-at-Large - bio: | - Kaspar Korjus is the Managing Director of Estonia’s [e-Residency](https://e-estonia.com/e-residents/about/) program, which offers a fully digital identity for global citizens. e-Residency is built on inclusion, transparency, and legitimacy. It is meant to empower citizens globally and provide world-wide digital and financial inclusion. - - Korjus was chosen by Megan Smith, CTO of the United States, as one of 20 digital leaders for the Global Leaders Digital Exchange (GLDE) program, and is listed in Forbes Estonia’s “30 under 30” as #1 in Technology and Finance. - - social: - - name: Twitter - link: https://twitter.com/kasparkorjus diff --git a/_src/_data/caretakers.yml b/_src/_data/caretakers.yml index 5009b32..550a596 100755 --- a/_src/_data/caretakers.yml +++ b/_src/_data/caretakers.yml @@ -1,3 +1,9 @@ +- name: Jolocom + link: http://jolocom.io + +- name: Riddle And Code + link: https://www.riddleandcode.com + - name: COALA link: http://coala.global @@ -7,9 +13,6 @@ - name: Human Data Commons Foundation link: https://humandatacommons.org -- name: Dyne.org - link: https://www.dyne.org - - name: Monax link: https://monax.io @@ -22,13 +25,6 @@ - name: BigchainDB link: https://www.bigchaindb.com -- name: OpenMedia - link: https://openmedia.org - -- name: SmartContract - link: https://smartcontract.com - logo: false - - name: OuiShare link: http://ouishare.net @@ -44,7 +40,3 @@ - name: KICTANet link: https://www.kictanet.or.ke - -- name: Global Consent - link: http://www.consent.global/ - logo: false diff --git a/_src/_data/contact.yml b/_src/_data/contact.yml index 34de2ac..9af32a1 100755 --- a/_src/_data/contact.yml +++ b/_src/_data/contact.yml @@ -1,8 +1,8 @@ company: "Interplanetary Database Foundation e.V." -registration: "Registration VR 36146 B" +registration: "Amtsgericht: VR 36146 B" address: - street: "Wichertstraße 14a" - zip: "10439" + street: "Köpenicker Strasse 154" + zip: "10997" city: "Berlin" country: "Germany" email: "contact@ipdb.io" @@ -12,10 +12,8 @@ email_caretakers: "caretakers@ipdb.io" social: - name: "Twitter" link: "https://twitter.com/ipdbfoundation" - - name: "Facebook" - link: "https://facebook.com/ipdbfoundation" - name: "LinkedIn" - link: "https://www.linkedin.com/company/7963161" + link: "https://www.linkedin.com/company/interplanetary-database-foundation-ipdb/" - name: "GitHub" link: "https://github.com/ipdb" org: "ipdb" diff --git a/_src/_data/content-foundation.yml b/_src/_data/content-foundation.yml index 6fdf776..72fb9fb 100755 --- a/_src/_data/content-foundation.yml +++ b/_src/_data/content-foundation.yml @@ -28,7 +28,7 @@ vision: description: "The IPDB Foundation advances science and research." text: | The IPDB Foundation promotes science and research on the operation of scalable blockchain databases, the governance of decentralized systems, and the applications of blockchain technology. - - The IPDB Foundation has taken a leading role in the Berlin blockchain community. We co-organized the [9984 Summit](https://2017.9984.io/), a two-day conference in Berlin bringing together top blockchain thinkers from around the world. We co-organize the [IPDB-BigchainDB Meetup](https://www.meetup.com/BigchainDB-IPDB-Meetup/) in Berlin. We have sent speakers to numerous conferences and events in Berlin and across the EU, and have published numerous [blog posts](https://medium.com/ipdb-blog) on blockchain technology. - + + The IPDB Foundation has taken a leading role in the Berlin blockchain community. We co-organized the [9984 Summit](https://2017.9984.io/), a two-day conference in Berlin bringing together top blockchain thinkers from around the world. We co-organize the [IPDB Meetup](https://www.meetup.com/blockchain-and-identity/) in Berlin. We have sent speakers to numerous conferences and events in Berlin and across the EU, and have published numerous [blog posts](https://medium.com/ipdb-blog) on blockchain technology. + In the future we will continue to make our work available in many ways——hosting or presenting at conferences and workshops, publishing research results and technical papers, releasing open source software, and more. Everything we do will be made available online, for the benefit of the public. diff --git a/_src/_data/content-front.yml b/_src/_data/content-front.yml index 311e887..0eeb719 100755 --- a/_src/_data/content-front.yml +++ b/_src/_data/content-front.yml @@ -7,7 +7,7 @@ intro: title: "A planetary-scale blockchain database" description: "The distributed, permanent web is evolving and needs a decentralized database. We are that database." text: | - IPDB is a planetary-scale blockchain database built on [BigchainDB](https://www.bigchaindb.com). It’s a ready-to-use public network with a focus on strong governance. It shares all the features of BigchainDB to make developers’ lives easier. + IPDB is a planetary-scale blockchain database built on BigchainDB. It’s a ready-to-use public network with a focus on strong governance. It shares all the features of BigchainDB to make developers’ lives easier. features: - title: "A single public database" diff --git a/_src/_data/faq.yml b/_src/_data/faq.yml index 56c01cd..f0f38b8 100755 --- a/_src/_data/faq.yml +++ b/_src/_data/faq.yml @@ -28,7 +28,7 @@ - question: How do I use IPDB? answer: | - IPDB is based on [BigchainDB](https://www.bigchaindb.com/). You can learn about using the IPDB client API on the BigchainDB documentation page. + IPDB is based on BigchainDB. You can learn about using the IPDB client API on the BigchainDB documentation page. - question: How much does it cost to use IPDB? answer: | @@ -75,7 +75,7 @@ - question: What technology is IPDB based on? answer: | - IPDB is a public instance of [BigchainDB](https://www.bigchaindb.com/), a scalable blockchain database. + IPDB is a public instance of BigchainDB, a scalable blockchain database. - question: What is the IPDB consensus model? answer: | diff --git a/_src/_includes/caretakers.html b/_src/_includes/caretakers.html index 59cd6d0..a5cff96 100755 --- a/_src/_includes/caretakers.html +++ b/_src/_includes/caretakers.html @@ -1,24 +1,24 @@
- {% assign caretakers = (site.data.caretakers | sort: 'name') %} + {% assign caretakers = (site.data.caretakers | sort: 'name') %} {% for caretaker in caretakers %} - {% assign slug = (caretaker.name | downcase | replace: ' ', '-' | replace: '.', '-') %} + {% assign slug = (caretaker.name | downcase | replace: ' ', '-' | replace: '.', '-') %} -
- - {% if caretaker.logo == false %} - {{ caretaker.name }} - {% else %} - - {{ caretaker.name }} - - - {% endif %} +
+ + {% if caretaker.logo == false %} + {{ caretaker.name }} + {% else %} + + {{ caretaker.name }} + + + {% endif %} - -
+ +
{% endfor %}
diff --git a/_src/privacy.md b/_src/privacy.md index 13bb293..dd22cf5 100755 --- a/_src/privacy.md +++ b/_src/privacy.md @@ -32,8 +32,6 @@ We may use cloud service providers to store information. Information may be stor We will not share or sell the identifiable personal information we collect or generate except as we explain in this section. -We may share personal information with BigchainDB GmbH, the company responsible for the development of the software IPDB runs on. This information will be used in accordance with the [BigchainDB Privacy Policy](https://bigchaindb.com/privacy) and our information sharing agreement with BigchainDB. - We may share non-personal or aggregate information, such as usage statistics for the site. ## Cookies diff --git a/_src/styleguide.md b/_src/styleguide.md index 440233d..7d1bfd8 100644 --- a/_src/styleguide.md +++ b/_src/styleguide.md @@ -25,7 +25,7 @@ narrow: true ## The blockchain database network for the decentralized stack -IPDB is a planetary-scale blockchain database built on [BigchainDB](https://www.bigchaindb.com). It’s a ready-to-use public network with a focus on **strong governance**. It shares _all the features_ of BigchainDB to make developers’ lives easier. +IPDB is a planetary-scale blockchain database built on BigchainDB. It’s a ready-to-use public network with a focus on **strong governance**. It shares _all the features_ of BigchainDB to make developers’ lives easier. ### Maecenas sed diam eget risus