Commit Graph

351 Commits

Author SHA1 Message Date
seba 262cacdd72 Administration interface stuff 2011-09-13 20:47:15 +02:00
Sebastian Pipping 7922d3254c Add current demo code of Freitagskasse Barcode Client and related HOWTO paper 2011-08-03 23:58:17 +02:00
Konrad Mohrfeldt 6003472f33 removed db from git, updated settings and gitignore, fixes
* FIX: wrong timezone in settings.py
* FIX: removed console.log calls from js (exceptions in fx)
* UPDATE: git will ignore kdev4 files and k4ever.db
* UPDATE: removed database from git
2011-06-03 18:29:20 +02:00
Konrad Mohrfeldt 5b3401ffdd änderungen an suchfeld und design
suchfeld:
* kann jetzt kaufen
* wie gehts: pfeiltastenwahl, alt + rechte pfeiltaste

kleine oder große änderungen am design und an templates. zu lange her um alle im kopf zu haben :)
2011-05-25 18:33:48 +02:00
Konrad Mohrfeldt 19ae56b1e0 changed response mimetype for api from application/javascript to application/json (rfc 4627) 2011-05-25 15:53:31 +02:00
seba dec55d9561 Merge branch 'master' of someserver.de:k4ever 2011-03-08 19:14:26 +01:00
seba 519169e49e ldap working + automatic userprofile creation
whuppie :)
2011-03-08 19:13:22 +01:00
seba 2b2db9109a broke it, fixed it, broken again 2011-03-08 03:54:56 +01:00
TKroenert c2b2bf5655 *fix: json will umbedingt eine liste,damit es die serialized 2011-03-05 05:01:03 +01:00
TKroenert 886dc7eb45 API fuer den store 2011-03-05 04:55:16 +01:00
TKroenert dddb18cd87 home ohne Pfand 2011-03-05 04:25:46 +01:00
TKroenert 47267b8213 noch mehr stats fuer die HOME seite.. 2011-03-05 04:09:04 +01:00
TKroenert 50429f4f78 neues usersettings, weiteres item 2011-03-05 03:45:03 +01:00
TKroenert 7e5474ff16 Homeseite mit sortierung was am liebsten getrunken wurde 2011-03-05 02:29:16 +01:00
seba 769619310e konto double send bug 2011-03-05 01:46:24 +01:00
TKroenert 2348a8496c Merge branch 'master' of someserver.de:k4ever 2011-03-05 01:37:43 +01:00
TKroenert 46549fd3b2 TODO 2011-03-05 01:37:31 +01:00
seba 9bb7b8f9bc Merge branch 'master' of someserver.de:k4ever 2011-03-05 01:17:27 +01:00
seba 1f5f82d08d deposit purchase fix 2011-03-05 01:17:12 +01:00
TKroenert ab07d595f8 *fix needChecked wir vor dem meckern, ob es ueberprueft ist auch abgeprueft 2011-03-05 01:01:09 +01:00
seba aa64229f72 logout works 2011-03-05 00:59:47 +01:00
seba fe3502d775 kaufen zieht nun geld ab 2011-03-05 00:41:37 +01:00
seba c87580f861 history template 2011-03-04 23:35:28 +01:00
TKroenert 3c722f4ea0 todos 2011-03-04 22:32:08 +01:00
TKroenert e0f83cc795 add user tannek 2011-03-04 21:56:22 +01:00
Konrad Mohrfeldt 28739b95d0 olol 2011-03-04 21:47:16 +01:00
seba d8838dbefb history 2010-12-02 13:44:10 +01:00
seba c05fe944c0 everything is much better now! 2010-12-02 13:31:52 +01:00
seba 35301915be well, this is more like it 2010-12-02 12:54:34 +01:00
seba 70a0536de1 its working now but i dont like the relationship
order shouldn't have to know about his purchases
purchases should know their order!
purchases would be accessible by calling
       order.purchase_set()
2010-12-02 10:35:02 +01:00
seba 4f37807ef1 more broken than before 2010-12-02 02:39:15 +01:00
seba a3254919a3 strange broken merge 2010-12-02 00:11:27 +01:00
seba 6206ef90b5 Merge branch 'master' of someserver.de:k4ever
Conflicts:
	k4ever/k4ever.db
2010-12-01 23:57:01 +01:00
seba 60fe5ca2d2 ich schreib mal alles up. das is nu kaputt
purchase, order, foo
2010-12-01 23:30:35 +01:00
Konrad Mohrfeldt 3bfcd4ead7 where did all the rounding go?! 2010-11-10 00:29:10 +01:00
Konrad Mohrfeldt b43c1df865 i heard you like css, so i put some css in your project
* login dialog
* notifications
* main nav
2010-11-09 05:30:07 +01:00
seba 37c8beae9e ER nach Diskussion 2010-10-29 18:45:41 +02:00
seba e8a8969662 Komische skizze 2010-10-19 19:04:51 +02:00
seba f4ceecf205 Kaufen funktioniert 2010-10-19 01:03:38 +02:00
seba 9450f3326b Transactions funtzen, kaufen fast 2010-10-16 17:33:18 +02:00
seba 4615033732 Merge branch 'master' of someserver.de:k4ever 2010-10-13 16:21:22 +02:00
seba ee7a93858a Alles kaputt, zeigt transactionhistory an 2010-10-13 06:59:30 +02:00
TKroenert e27a2a7b13 kleine Umbennungen und weitere Idee 2010-10-13 06:13:59 +02:00
seba 5acc7b8d29 k4ever django project - db online! 2010-10-13 02:57:59 +02:00
TKroenert 2212058420 gedanken zum projekt und zur projektplanung die nur per tablet festgehalten werden konnten 2010-10-10 00:10:14 +02:00
seba cdd4609f8e updated er 2010-10-10 00:09:40 +02:00
seba 856086fa92 Bissl am ER rumgeschraubt 2010-09-29 20:41:45 +02:00
TKroenert 9b8bb6c317 Merge branch 'master' of someserver.de:k4ever 2010-09-29 20:29:03 +02:00
TKroenert 52a2873bf0 add: Wildes_rumgekritzel von Freitag + wilde gedanken an dich 2010-09-29 20:28:12 +02:00
seba 8e1d5e9534 Added official song 2010-09-29 19:58:12 +02:00