Skip to content

Commit 4aead6a

Browse files
committed
2: Add blog entry about SMW 14
Updated website Task-Url: http://github.com/JavaMoney/javamoney-shelter/issues/issue/2
1 parent b055adf commit 4aead6a

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

feed.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<atom:link href="http://javamoney.org/feed.xml" rel="self" type="application/rss+xml" />
77
<description>Java Money and Currency</description>
88
<language>en-gb</language>
9-
<pubDate>So, 4 May 2014 00:18:19 +0200</pubDate>
10-
<lastBuildDate>So, 4 May 2014 00:18:19 +0200</lastBuildDate>
9+
<pubDate>Sa, 14 Jun 2014 19:50:50 +0200</pubDate>
10+
<lastBuildDate>Sa, 14 Jun 2014 19:50:50 +0200</lastBuildDate>
1111

1212
<item>
1313
<title>Events &amp;amp; History</title>
@@ -52,7 +52,7 @@
5252
<item>
5353
<title>Public Draft</title>
5454
<link>http://javamoney.org\blog\2013\pdr.html</link>
55-
<pubDate>Do, 24 Okt 2013 00:00:00 +0200</pubDate>
55+
<pubDate>Do, 24 Oct 2013 00:00:00 +0200</pubDate>
5656
<guid isPermaLink="false">\blog\2013\pdr.html</guid>
5757
<description>
5858

shelter.html

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,27 @@
7676
<h1>Shelter</h1>
7777
</div>
7878

79-
<p><em>24 November 2013</em></p>
79+
<p><em>20 February 2014</em></p>
8080

8181
<p>
82+
<header>
83+
<h1>Social Media Week </h1>
84+
</header>
85+
86+
<section id="smwslideshare" class="clearfix">
87+
<iframe src="http://www.slideshare.net/slideshow/embed_code/31405626" width="597" height="486" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px 1px 0; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe> <div style="margin-bottom:5px"> <strong> <a href="https://de.slideshare.net/keilw/bitcoin-payment-instrument-or-object-of-speculation-smwhh-2014" title="Bitcoin, Payment Instrument or Object of Speculation? (SMWHH 2014)" target="_blank">Bitcoin, Payment Instrument or Object of Speculation? (SMWHH 2014)</a> </strong> from <strong><a href="http://www.slideshare.net/keilw" target="_blank">Werner Keil</a></strong> </div>
88+
89+
<p>
90+
At <a href="http://socialmediaweek.org/">Social Media Week</a> 2014, <a href="https://github.com/keilw" class="user-mention">Werner Keil</a> hosted expert discussions about Digital Currencies like Bitcoin in <a href="http://socialmediaweek.org/blog/event/bitcoin-payment-instrument-object-speculation-2/">Copenhagen</a> and <a href="http://socialmediaweek.org/blog/event/bitcoin-payment-instrument-object-speculation/">Hamburg</a>.<br>
91+
The Hamburg session was recorded, if you log into <a href="http://socialmediaweek.org/">Social Media Week</a> you can watch the full video.
92+
</p>
93+
</section>
94+
8295
<header>
8396
<h1>Gimme Shelter</h1>
8497
</header>
8598

86-
<section id="downloads" class="clearfix">
99+
<section id="stones" class="clearfix">
87100
<iframe width="420" height="315" src="//www.youtube.com/embed/Jb-JZPmiEOI" frameborder="0" allowfullscreen></iframe>
88101
</section>
89102

@@ -94,7 +107,8 @@ <h3>
94107
<a name="welcome-to-the-javamoney-shelter" class="anchor" href="#welcome-to-the-javamoney-financial-library"><span class="octicon octicon-link"></span></a>Welcome to the JavaMoney Shelter.</h3>
95108

96109
<p><a href="http://github.com/JavaMoney/javamoney-shelter">JavaMoney-shelter</a> is a sandbox or "sanctuary" for new ideas and modules to be adopted, e.g. via <a href="https://java.net/projects/adoptajsr/pages/Home">Adopt-a-JSR</a> or similar programs.<br>
97-
The shelter also acts as incubator module for testing out new features or modules before they may enter the official javamoney library. This allows to gain experience and make components error prone and performant and enables a discussion of new features with a broader community.
110+
The shelter also acts as incubator module for testing out new features or modules before they may enter the official javamoney library.<br>
111+
This allows to gain experience and make components error prone and performant and enables a discussion of new features with a broader community.
98112
</p>
99113

100114
<pre><code>&lt;dependency&gt;
@@ -107,7 +121,7 @@ <h3>
107121
<h3>
108122
<a name="authors-and-contributors" class="anchor" href="#authors-and-contributors"><span class="octicon octicon-link"></span></a>Authors and Contributors</h3>
109123

110-
<p>Everyone is welcome to contribute. <a href="https://github.com/keilw" class="user-mention">@keilw</a> composed this project for you.</p>
124+
<p>Everyone is welcome to contribute. Werner Keil (<a href="https://github.com/keilw" class="user-mention">@keilw</a>) composed this project for you.</p>
111125

112126
<h3>
113127
<a name="support-or-contact" class="anchor" href="#support-or-contact"><span class="octicon octicon-link"></span></a>Support or Contact</h3>

0 commit comments

Comments
 (0)