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-30 22:28:53 +02:00
commit ceb4e3496e
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -6,7 +6,8 @@ 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.
@ -21,7 +22,10 @@ The stable version, where **all** bugfixes directly go to.
### testing ### 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 ## Concept
@ -39,7 +43,7 @@ The table `entries` stores your diary entries.
## Technical Details ## 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 # Contribution