sigmasternchen/Diary
1
0
Fork 0
mirror of https://github.com/sigmasternchen/Diary synced 2025-03-15 15:18:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into testing

Browse source
This commit is contained in:
benaryorg 2014-05-22 16:35:21 +02:00
commit d3884a781d
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -1,12 +1,14 @@
# Description # Description
Diary is a little python program, written by me (**@benaryorg**). Diary is a little python program, written by me (**@benaryorg**).
It is a web-application, to store your personal diary in an easy way! It is a web-application, to store your personal diary in an easy way!
## Development ## 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. Please report bugs or tell me what features you would like to see soon.
## Branches ## Branches
@ -24,9 +26,15 @@ The branch I will use for developing (because I have more than just one computer
## Concept ## Concept
It's concept is easy. You have a database where everything is stored. It's concept is easy. You have a database where everything is stored.
There you have a table `users` with all your users and passwords (hashed). There you have a table `users` with all your users and passwords (hashed).
The table `diaries` is to store your different diaries, for example you could have one diary for writing about school, one for writing about yourself, one for your boy/girlfriend and so on.
Here is also stored, if the diary is public (blog-like), private (for yourself) or protected (only chosen poeple have access). The table `diaries` is to store your different diaries,
for example you could have one diary for writing about school,
one for writing about yourself, one for your boy/girlfriend and so on.
Here is also stored, if the diary is **public** (blog-like), **private**
(for yourself) or **protected** (only chosen poeple have access).
The table `entries` stores your diary entries. The table `entries` stores your diary entries.
## Technical Details ## Technical Details
@ -37,10 +45,12 @@ Diary is written in _python2.7_ and is using _flask_ and _sqlalchemy_!
This project is on **GitHub**! This project is on **GitHub**!
Just send a pull request! Just send a pull request!
# License # License
This program uses the **WTFPL** (Do What The Fuck You Want To Public License)! This program uses the **WTFPL** (Do What The Fuck You Want To Public License)!
I would appreciate it, if you would leave my name somewhere in the HTML-templates. I would appreciate it, if you would leave my name somewhere in the HTML-templates.