Sebastian Lohff
551c8641d3
Merge branch 'morejson'
2012-02-01 23:01:20 +01:00
c7a140843d
Fix preislister config
2012-02-01 22:39:11 +01:00
00d4c81b28
Merge branch 'morejson-barcode' into morejson
2012-01-31 02:36:04 +01:00
098ff4786a
Add sample config
2012-01-31 02:34:07 +01:00
692284f41d
Extract constant for config file section
...
.. and improve config error reporting
2012-01-31 02:34:07 +01:00
62f0f02fa7
Migrate to JSON response
2012-01-31 02:34:07 +01:00
135fc1044c
Make configurable: server URL, user, password, debugging
2012-01-31 02:34:07 +01:00
e26563b946
Remove obsolete function buy_item()
2012-01-31 02:34:07 +01:00
Sebastian Lohff
485bcd32a6
Merge branch 'morejson' of git.someserver.de:k4ever into morejson
2012-01-30 22:48:39 +01:00
Sebastian Lohff
2018fc2396
Merge branch 'morejson' of git.someserver.de:k4ever into morejson
...
Conflicts:
k4ever/main/templates/registration/loginForm.html
2012-01-30 22:47:57 +01:00
Sebastian Lohff
d6bcb172fb
Docs: Install documentation for k4ever and barcode-plugin
2012-01-29 04:39:06 +01:00
Sebastian Lohff
ff7ef54e7e
Client-Barcode: Added install script to add db entries
2012-01-29 04:38:16 +01:00
Sebastian Lohff
bef462a86d
K4ever install documentation
2012-01-28 20:31:09 +01:00
Sebastian Lohff
5c480e452f
Merge branch 'master' of git.someserver.de:k4ever into morejson
2012-01-27 20:20:41 +01:00
Sebastian Lohff
cadeffec3a
Merge branch 'morejson' of git.someserver.de:k4ever into morejson
2012-01-27 17:39:11 +01:00
Sebastian Lohff
b06995f893
Added hooks to provide initial data for some Models
2012-01-27 17:38:14 +01:00
Sebastian Lohff
d8d40415bd
Merge branch 'master' of git.someserver.de:k4ever into morejson
2012-01-26 23:46:55 +01:00
25c562ec16
website: removed "kassensystem ist aktiv"-banner
2012-01-23 10:25:30 +01:00
3be9d20a58
remove Freitagsrunden-specific content from template
2012-01-23 00:50:35 +01:00
63ac10aad4
added exception templates. fixes #74
2012-01-23 00:49:53 +01:00
Sebastian Lohff
7590b82fda
Merge branch 'master' of git.someserver.de:k4ever into morejson
2012-01-23 00:46:26 +01:00
Sebastian Lohff
b82053d797
Merge branch 'master' of git.someserver.de:k4ever
2012-01-23 00:35:44 +01:00
Sebastian Lohff
b41ebac6e5
Cleaned up settings for release, fixes #9
2012-01-23 00:34:25 +01:00
9b18c4508e
update balance when buying items via javascript. fixes #10
2012-01-23 00:10:32 +01:00
Sebastian Lohff
1b7aaca19f
getProfile ==> get_profile...
2012-01-21 22:07:13 +01:00
Sebastian Lohff
67f5b43c72
API: Added more JSON with success msgs to api
2012-01-21 22:01:31 +01:00
Sebastian Lohff
018332e16d
API: Code cleanup
2012-01-21 16:49:55 +01:00
Sebastian Lohff
44c1d2c714
OLD API: Removed deprecated api
2012-01-21 15:31:31 +01:00
Sebastian Lohff
f69f9bda15
Licensed k4ever under AGPLv3 or later
2012-01-21 00:21:29 +01:00
Sebastian Lohff
f351a3f087
API: Added deposit bool to history, fixes #29
2012-01-20 22:22:59 +01:00
Sebastian Lohff
90a9c152fa
API: Added name to history purchase-set, fixes #12
2012-01-20 22:16:28 +01:00
Sebastian Lohff
b9c815effe
API: Added support for negative transactions, fixes #28
2012-01-20 22:04:18 +01:00
8a020a36b5
Virtual Transaction: no more transaction to yourself
2012-01-20 20:08:43 +01:00
4269b67c90
Preislister: Fix column label mix-up and alignment
2012-01-19 16:26:16 +01:00
f9c823df9c
Remove disabled code leftover
2012-01-19 16:22:17 +01:00
e20a8cb48b
Add preislister quickhack
2012-01-19 16:17:43 +01:00
Sebastian Lohff
7bf15a1470
Added thumbnailing functions to api, fixes #17
2012-01-07 01:37:24 +01:00
b7a96cb390
Merge branch 'master' of git.someserver.de:k4ever
2012-01-07 00:02:55 +01:00
35195d69f0
Admin: Added filter for UserProfile: balance < 0
2011-12-23 02:00:12 +01:00
Sebastian Lohff
d788878d57
Removed obsolete c-display daemon
2011-12-06 19:04:05 +01:00
Sebastian Lohff
738b8cf240
Fix for encoding problems with barcode-display ( fixes #26 )
2011-11-30 22:39:56 +01:00
MasterofJOKers
9e2b0574ee
make some buyable urls accessible by name
...
Gives the advantage of only having to change the urls.py instead
of every link that has been set somewhere. This also verifies that
all parameters needed by the URL are given.
2011-11-24 02:32:25 +01:00
MasterofJOKers
602c6585f8
Rebuild main view
...
Mostly for testing purposes, but also to unify the usage of
buyable in templates.
This also fixes the problem of having to make the retrieved lists
for usersLast* unique manually.
2011-11-24 02:32:18 +01:00
Sebastian Lohff
9bad46cf2d
Fixed Transaction ,-usage and error for transactiontype
2011-11-10 17:06:39 +01:00
Sebastian Lohff
b71b95436f
Fixed: Using default checked value for api transactions
2011-11-09 20:58:20 +01:00
Sebastian Lohff
c0e9f81bf0
Added helper for Authblob
2011-11-04 17:34:13 +01:00
Sebastian Lohff
e87b8e6ca1
Allows multiple Authblobs ( Fixes #22 )
2011-11-04 17:30:11 +01:00
Sebastian Lohff
70766bba44
Order and Purchase now consistend ( Fixes #14 )
2011-11-03 19:01:07 +01:00
614b77b6ac
Merge branch 'master' of git.someserver.de:k4ever
2011-10-31 23:24:06 +01:00
86a9ecd598
Kontostand auf Konto-seite hinzugefuegt.
2011-10-31 23:23:38 +01:00
Sebastian Lohff
Sebastian Pipping
MasterofJOKers