From e1339550f40584d518e10c9a9e9c33258dae868d Mon Sep 17 00:00:00 2001
From: benaryorg <brenner@benary.org>
Date: Fri, 30 May 2014 21:12:05 +0200
Subject: [PATCH 1/9] New Lines are now supported!

---
 static/style.css     | 4 ++++
 templates/diary.html | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/static/style.css b/static/style.css
index eb56593..b9d397c 100644
--- a/static/style.css
+++ b/static/style.css
@@ -85,6 +85,10 @@ a, a:active, a:visited {
 	padding: 0px 0px 0px 0px;
 }
 
+#listing p {
+    white-space:pre-wrap;
+}
+
 .error {
 	padding: 5px;
 	color: red;
diff --git a/templates/diary.html b/templates/diary.html
index 73e0d7f..c50cc10 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -26,9 +26,7 @@
 					{% for e in entries %}
 						<div>
 							<div>{{ e.date }}</div>
-							<p>
-								{{ e.text }}
-							</p>
+							<p>{{ e.text }}</p>
 						</div>
 					{% endfor %}
 				</div>

From ff09f1c54cf7d5a0c4b10aa91c569a4540117b6d Mon Sep 17 00:00:00 2001
From: benaryorg <brenner@benary.org>
Date: Fri, 30 May 2014 21:18:16 +0200
Subject: [PATCH 2/9] Resized the textarea for adding entries

---
 templates/diary.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/diary.html b/templates/diary.html
index c50cc10..2207500 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -19,7 +19,7 @@
 			<div id="contentContainer">
 				<form action="{{ url_for('addentry',name=diary.name) }}" method="POST">
 					Add new entry:<br />
-					<textarea name="text"></textarea><br />
+					<textarea name="text" style="width:99%;height:150px;"></textarea><br/>
 					<input type="submit">
 				</form>
 				<div id="listing">

From 5a0cfb05cedcefbe5d9f9f757939c8e8f113f071 Mon Sep 17 00:00:00 2001
From: benaryorg <brenner@benary.org>
Date: Fri, 30 May 2014 21:56:53 +0200
Subject: [PATCH 3/9] Removed logout from login site

---
 templates/login.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/templates/login.html b/templates/login.html
index 53fd846..148b15b 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -11,9 +11,6 @@
 		<div id="mainContainer">
 			<div id="header">
 				<h1>Diary</h1>
-				<div id="logout">
-					<a href="{{ url_for('logout') }}">Logout</a>
-				</div>
 			</div>
 			<div id="contentContainer">
 				<form method="POST">

From 96d949a1c226a2aa2c83e5664379f548705fdda4 Mon Sep 17 00:00:00 2001
From: benaryorg <brenner@benary.org>
Date: Fri, 30 May 2014 21:58:42 +0200
Subject: [PATCH 4/9] Added Links to the GitHub Project!

---
 templates/diary.html | 2 +-
 templates/index.html | 2 +-
 templates/login.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/diary.html b/templates/diary.html
index 2207500..d392c2d 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -10,7 +10,7 @@
 	<div class="dot centered">
 		<div id="mainContainer">
 			<div id="header">
-				<h1>Diary {{ diary.name }}</h1>
+				<h1><a href="http://git.benary.org/Diary">Diary {{ diary.name }}</a></h1>
 				<div id="logout">
 					<a href="{{ url_for('logout') }}">Logout</a><br />
 					<a href="{{ url_for('index') }}">Diary-List</a>
diff --git a/templates/index.html b/templates/index.html
index 77fb015..1fa0b40 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,7 +10,7 @@
 	<div class="dot centered">
 		<div id="mainContainer">
 			<div id="header">
-				<h1>Diarys</h1>
+				<h1><a href="http://git.benary.org/Diary">Diary</a></h1>
 				<div id="logout">
 					<a href="{{ url_for('logout') }}">Logout</a>
 				</div>
diff --git a/templates/login.html b/templates/login.html
index 148b15b..8a6d46e 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -10,7 +10,7 @@
 	<div class="dot centered">
 		<div id="mainContainer">
 			<div id="header">
-				<h1>Diary</h1>
+				<h1><a href="http://git.benary.org/Diary">Diary</a></h1>
 			</div>
 			<div id="contentContainer">
 				<form method="POST">

From c65f2305868501dada019da50394a4254063f8ef Mon Sep 17 00:00:00 2001
From: benaryorg <brenner@benary.org>
Date: Fri, 30 May 2014 22:11:55 +0200
Subject: [PATCH 5/9] Added "required" to some form fields

---
 templates/diary.html | 2 +-
 templates/index.html | 2 +-
 templates/login.html | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/diary.html b/templates/diary.html
index d392c2d..f3462e4 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -19,7 +19,7 @@
 			<div id="contentContainer">
 				<form action="{{ url_for('addentry',name=diary.name) }}" method="POST">
 					Add new entry:<br />
-					<textarea name="text" style="width:99%;height:150px;"></textarea><br/>
+					<textarea name="text" style="width:99%;height:150px;" required></textarea><br/>
 					<input type="submit">
 				</form>
 				<div id="listing">
diff --git a/templates/index.html b/templates/index.html
index 1fa0b40..e124c6b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -29,7 +29,7 @@
 					{% endfor %}
 				</div>
 				<form method="post" action="{{ url_for('newdiary')}}">
-					You can add a new diary, if you want: <input type="text" name="name" placeholder="name of diary"><input type="submit">
+					You can add a new diary, if you want: <input type="text" name="name" placeholder="name of diary" required><input type="submit">
 				</form>
 			</div>
 		<div>
diff --git a/templates/login.html b/templates/login.html
index 8a6d46e..70bd46b 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -14,8 +14,8 @@
 			</div>
 			<div id="contentContainer">
 				<form method="POST">
-					<input type="text" name="user" placeholder="Username"/><br/>
-					<input type="password" name="pass" placeholder="Password"/><br/>
+					<input type="text" name="user" placeholder="Username" required/><br/>
+					<input type="password" name="pass" placeholder="Password" required/><br/>
 					<input type="submit" value="Login">
 				</form>
 			</div>

From f0130d5eff931d6409ac6745dfe47c1a56016c5d Mon Sep 17 00:00:00 2001
From: benaryorg <brenner@benary.org>
Date: Fri, 30 May 2014 22:28:35 +0200
Subject: [PATCH 6/9] Changed README

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4bd25ad..cd73fe8 100755
--- a/README.md
+++ b/README.md
@@ -6,7 +6,8 @@ It is a web-application, to store your personal diary in an easy way!
 
 ## Development
 
-I currently do not have much time to develop this program, but I would like to use it by myself, so I will put most of my time in it.
+I currently do not have much time to develop this program, but I would
+like to use it by myself, so I will put most of my time in it.
 
 
 Please report bugs or tell me what features you would like to see soon.
@@ -21,7 +22,10 @@ The stable version, where **all** bugfixes directly go to.
 
 ### testing
 
-The branch I will use for developing (because I have more than just one computer).
+The branch used for development. It will be mostly stable, but there will be
+some things like a logout button on the login page.
+
+You should use this one, if you want functionality! Use it with `git checkout testing`!
 
 ## Concept
 
@@ -39,7 +43,7 @@ The table `entries` stores your diary entries.
 
 ## Technical Details
 
-Diary is written in _python2.7_ and is using _flask_ and _sqlalchemy_!
+Diary is written in _python2.7_ and is using _flask_, _bcrypt_ and _sqlalchemy_!
 
 # Contribution
 

From 4a481f6debd00b72aa1deb9b806198c125c2da8c Mon Sep 17 00:00:00 2001
From: benaryorg <brenner@benary.org>
Date: Sat, 31 May 2014 00:14:37 +0200
Subject: [PATCH 7/9] Added autofocus to login form username field

---
 templates/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/login.html b/templates/login.html
index 70bd46b..c5c8627 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -14,7 +14,7 @@
 			</div>
 			<div id="contentContainer">
 				<form method="POST">
-					<input type="text" name="user" placeholder="Username" required/><br/>
+					<input type="text" name="user" placeholder="Username" required autofocus/><br/>
 					<input type="password" name="pass" placeholder="Password" required/><br/>
 					<input type="submit" value="Login">
 				</form>

From 2351f0bfc1bb787ede282c8320ebd7117346a9bb Mon Sep 17 00:00:00 2001
From: benaryorg <brenner@benary.org>
Date: Sat, 31 May 2014 00:15:45 +0200
Subject: [PATCH 8/9] Added autofocus to textarea in diary.html

---
 templates/diary.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/diary.html b/templates/diary.html
index f3462e4..91118e2 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -19,7 +19,7 @@
 			<div id="contentContainer">
 				<form action="{{ url_for('addentry',name=diary.name) }}" method="POST">
 					Add new entry:<br />
-					<textarea name="text" style="width:99%;height:150px;" required></textarea><br/>
+					<textarea name="text" style="width:99%;height:150px;" required autofocus></textarea><br/>
 					<input type="submit">
 				</form>
 				<div id="listing">

From 7a20351a69491ff938daf3eba7abb9690177042d Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Tue, 10 Jun 2014 11:18:02 +0200
Subject: [PATCH 9/9] Changed the links from git.benary.org to
 github.com/benaryorg

---
 templates/diary.html | 2 +-
 templates/index.html | 2 +-
 templates/login.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/diary.html b/templates/diary.html
index 91118e2..2b40dff 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -10,7 +10,7 @@
 	<div class="dot centered">
 		<div id="mainContainer">
 			<div id="header">
-				<h1><a href="http://git.benary.org/Diary">Diary {{ diary.name }}</a></h1>
+				<h1><a href="//github.com/benaryorg/Diary">Diary {{ diary.name }}</a></h1>
 				<div id="logout">
 					<a href="{{ url_for('logout') }}">Logout</a><br />
 					<a href="{{ url_for('index') }}">Diary-List</a>
diff --git a/templates/index.html b/templates/index.html
index e124c6b..3ac8680 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,7 +10,7 @@
 	<div class="dot centered">
 		<div id="mainContainer">
 			<div id="header">
-				<h1><a href="http://git.benary.org/Diary">Diary</a></h1>
+				<h1><a href="//github.com/benaryorg/Diary">Diary</a></h1>
 				<div id="logout">
 					<a href="{{ url_for('logout') }}">Logout</a>
 				</div>
diff --git a/templates/login.html b/templates/login.html
index c5c8627..dc28609 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -10,7 +10,7 @@
 	<div class="dot centered">
 		<div id="mainContainer">
 			<div id="header">
-				<h1><a href="http://git.benary.org/Diary">Diary</a></h1>
+				<h1><a href="//github.com/benaryorg/Diary">Diary</a></h1>
 			</div>
 			<div id="contentContainer">
 				<form method="POST">