Updated Readme from master

This commit is contained in:
Manuel Ebert 2013-03-04 15:56:16 -08:00
parent 5e14f4fdb9
commit dcd3268c60
3 changed files with 55 additions and 35 deletions

View file

@ -3,9 +3,10 @@ git checkout master README.md
git checkout master CHANGELOG.md
markdown2 README.md > tmp_readme
markdown2 CHANGELOG.md > tmp_log
sed -i 's/<li>\[/<li class="badge">\[/g' tmp_log
sed -i 's/\[Fixed\]/<span class="change-fixed">Fixed<\/span>/g' tmp_log
sed -i 's/\[Improved\]/<span class="change-improved">Improved<\/span>/g' tmp_log
sed -i.bak 's/<li>\[/<li class="badge">\[/g' tmp_log
sed -i.bak 's/\[Fixed\]/<span class="change-fixed">Fixed<\/span>/g' tmp_log
sed -i.bak 's/\[Improved\]/<span class="change-improved">Improved<\/span>/g' tmp_log
sed -i.bak 's/\[New\]/<span class="change-new">New<\/span>/g' tmp_log
cat templates/header.html tmp_readme tmp_log templates/footer.html > index.html
rm tmp_readme tmp_log
git add index.html

View file

@ -17,7 +17,7 @@ li.badge {
-webkit-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
background-color: #97B931;
background-color: #a81b51;
box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
-webkit-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
-moz-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
@ -40,7 +40,26 @@ li.badge {
box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
-webkit-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
-moz-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
-o-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
-o-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
padding: 2px 5px;
color: white;
text-shadow: 0px 1px 0px rgba(0,0,0,.3);
font-weight: bold;
font-family: "Maven Pro", "Junction", "Helvetica Neue", Helvetica, Sans;
font-size: 10pt;
margin-right: 5px;
}
.change-new {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
background-color: #8ac237;
box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
-webkit-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
-moz-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
-o-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5);
padding: 2px 5px;
color: white;
text-shadow: 0px 1px 0px rgba(0,0,0,.3);
@ -172,4 +191,4 @@ blockquote p{
.nav li:hover a, .nav a:hover {
background: #3c3c3c;
box-shadow: inset 0px 3px 3px 0px rgba(0,0,0,.1);
}
}

View file

@ -305,91 +305,91 @@ with open("my_journal.txt") as f:
<h3>1.0.0 (March 4, 2013)</h3>
<ul>
<li>[New] Integrates seamlessly with DayOne</li>
<li>[Improved] Each journal can have individual settings</li>
<li>[Fixed] A bug where jrnl would not go into compose mode</li>
<li>[Fixed] A bug where jrnl would not add entries without timestamp</li>
<li>[Fixed] Support for parsedatetime 1.x</li>
<li class="badge"><span class="change-new">New</span> Integrates seamlessly with DayOne</li>
<li class="badge"><span class="change-improved">Improved</span> Each journal can have individual settings</li>
<li class="badge"><span class="change-fixed">Fixed</span> A bug where jrnl would not go into compose mode</li>
<li class="badge"><span class="change-fixed">Fixed</span> A bug where jrnl would not add entries without timestamp</li>
<li class="badge"><span class="change-fixed">Fixed</span> Support for parsedatetime 1.x</li>
</ul>
<h3>0.3.2 (July 5, 2012)</h3>
<ul>
<li>[Improved] Converts <code>\n</code> to new lines (if using directly on a command line, make sure to wrap your entry with quotes).</li>
<li class="badge"><span class="change-improved">Improved</span> Converts <code>\n</code> to new lines (if using directly on a command line, make sure to wrap your entry with quotes).</li>
</ul>
<h3>0.3.1 (June 16, 2012)</h3>
<ul>
<li>[Improved] Supports deleting of last entry.</li>
<li>[Fixed] Fixes a bug where --encrypt or --decrypt without a target file would not work.</li>
<li>[Improved] Supports a config option for setting word wrap.</li>
<li>[Improved] Supports multiple journal files.</li>
<li class="badge"><span class="change-improved">Improved</span> Supports deleting of last entry.</li>
<li class="badge"><span class="change-fixed">Fixed</span> Fixes a bug where --encrypt or --decrypt without a target file would not work.</li>
<li class="badge"><span class="change-improved">Improved</span> Supports a config option for setting word wrap.</li>
<li class="badge"><span class="change-improved">Improved</span> Supports multiple journal files.</li>
</ul>
<h3>0.3.0 (May 24, 2012)</h3>
<ul>
<li>[Fixed] Dates such as "May 3" will now be interpreted as being in the past if the current day is at least 28 days in the future</li>
<li>[Fixed] Bug where composed entry is lost when the journal file fails to load</li>
<li class="badge"><span class="change-fixed">Fixed</span> Dates such as "May 3" will now be interpreted as being in the past if the current day is at least 28 days in the future</li>
<li class="badge"><span class="change-fixed">Fixed</span> Bug where composed entry is lost when the journal file fails to load</li>
<li>Changed directory structure and install scripts (removing the necessity to make an alias from <code>jrnl</code> to <code>jrnl.py</code>)</li>
</ul>
<h4>0.2.4 (May 21, 2012)</h4>
<ul>
<li>[Fixed] Parsing of new lines in journal files and entries</li>
<li>[Improved] Adds support for encrypting and decrypting into new files</li>
<li class="badge"><span class="change-fixed">Fixed</span> Parsing of new lines in journal files and entries</li>
<li class="badge"><span class="change-improved">Improved</span> Adds support for encrypting and decrypting into new files</li>
</ul>
<h4>0.2.3 (May 3, 2012)</h4>
<ul>
<li>[Improved] Adds a <code>-short</code> option that will only display the titles of entries (or, when filtering by tags, the context of the tag)</li>
<li>[Improved] Adds tag export</li>
<li>[Improved] Adds coloured highlight of tags (by default, highlights all tags - when filtering by tags, only highlights search tags)</li>
<li>[Improved] <code>.jrnl_config</code> will get automatically updated when updating jrnl to a new version</li>
<li class="badge"><span class="change-improved">Improved</span> Adds a <code>-short</code> option that will only display the titles of entries (or, when filtering by tags, the context of the tag)</li>
<li class="badge"><span class="change-improved">Improved</span> Adds tag export</li>
<li class="badge"><span class="change-improved">Improved</span> Adds coloured highlight of tags (by default, highlights all tags - when filtering by tags, only highlights search tags)</li>
<li class="badge"><span class="change-improved">Improved</span> <code>.jrnl_config</code> will get automatically updated when updating jrnl to a new version</li>
</ul>
<h4>0.2.2 (April 17, 2012)</h4>
<ul>
<li>[Improved] Adds --encrypt and --decrypt to encrypt / decrypt existing journal files</li>
<li>[Improved] Adds markdown export (kudos to dedan)</li>
<li class="badge"><span class="change-improved">Improved</span> Adds --encrypt and --decrypt to encrypt / decrypt existing journal files</li>
<li class="badge"><span class="change-improved">Improved</span> Adds markdown export (kudos to dedan)</li>
</ul>
<h4>0.2.1 (April 17, 2012)</h4>
<ul>
<li>[Improved] Submitted to <a href="http://pypi.python.org/pypi/jrnl/0.2.1">PyPi</a>.</li>
<li class="badge"><span class="change-improved">Improved</span> Submitted to <a href="http://pypi.python.org/pypi/jrnl/0.2.1">PyPi</a>.</li>
</ul>
<h3>0.2.0 (April 16, 2012)</h3>
<ul>
<li>[Improved] Encrypts using CBC</li>
<li>[Fixed] <code>key</code> has been renamed to <code>password</code> in config to avoid confusion. (The key use to encrypt and decrypt a journal is the SHA256-hash of the password.)</li>
<li class="badge"><span class="change-improved">Improved</span> Encrypts using CBC</li>
<li class="badge"><span class="change-fixed">Fixed</span> <code>key</code> has been renamed to <code>password</code> in config to avoid confusion. (The key use to encrypt and decrypt a journal is the SHA256-hash of the password.)</li>
</ul>
<h4>0.1.1 (April 15, 2012)</h4>
<ul>
<li>[Fixed] Removed unnecessary print commands</li>
<li>[Improved] Created the documentation</li>
<li class="badge"><span class="change-fixed">Fixed</span> Removed unnecessary print commands</li>
<li class="badge"><span class="change-improved">Improved</span> Created the documentation</li>
</ul>
<h3>0.1.0 (April 13, 2012)</h3>
<ul>
<li>[Improved] Supports encrypted journals using AES encryption</li>
<li>[Improved] Support external editors for composing entries</li>
<li class="badge"><span class="change-improved">Improved</span> Supports encrypted journals using AES encryption</li>
<li class="badge"><span class="change-improved">Improved</span> Support external editors for composing entries</li>
</ul>
<h4>0.0.2 (April 5, 2012)</h4>
<ul>
<li>[Improved] Filtering by tags and dates</li>
<li>[Fixed] Now using dedicated classes for Journals and entries</li>
<li class="badge"><span class="change-improved">Improved</span> Filtering by tags and dates</li>
<li class="badge"><span class="change-fixed">Fixed</span> Now using dedicated classes for Journals and entries</li>
</ul>
<h4>0.0.1 (March 29, 2012)</h4>