nutrino/nutriweb - e6efeffce427eb4ab84a98dbf8f3658ed4

	Commit message (Expand)	Author	Age	Files	Lines
*	Added log-function to log date and time of eating-, sparetime- or database-ac...HEAD master	Stefanie Nobel	2011-10-05	6	-407/+599

*	merge databasesolutions	Stefanie Nobel	2011-08-28	7	-92/+276
\|\
\| *	make it work but still have 2 windows open at start??	florent	2011-08-28	2	-12/+42

\| *	update toolbar shortcuts	florent	2011-08-28	1	-8/+9

\| *	enhance url management	florent	2011-08-28	1	-2/+6

\| *	fix bad path management	florent	2011-08-27	1	-0/+3

\| *	fix programming error	florent	2011-08-27	1	-2/+2

\| *	do some refactoring and file movement for nicer file path management	florent	2011-08-26	3	-108/+186

* \|	.json instead of .txt for status	Stefanie Nobel	2011-08-28	14	-173/+111
\|\ \ \| \|/
\| *	move data file to sample folder or should be managed in a data folder + add s...	florent	2011-08-25	7	-93/+0

\| *	remove mac DS_Store unuseful files and update ignore file	florent	2011-08-25	2	-0/+0

* \|	commit for merging my version with the changes from florent	Stefanie Nobel	2011-08-27	5	-16/+35
\|/
*	fixed merge-errors	Stefanie Nobel	2011-08-25	1	-1/+1

*	my first commit of the first version of nutrinoweb includes the choice of ing...	Stefanie Nobel	2011-08-25	21	-0/+1120