Sebastian Lohff
485bcd32a6
Merge branch 'morejson' of git.someserver.de:k4ever into morejson
pirms 12 gadiem
Sebastian Lohff
2018fc2396
Merge branch 'morejson' of git.someserver.de:k4ever into morejson
...
Conflicts:
k4ever/main/templates/registration/loginForm.html
pirms 12 gadiem
Sebastian Lohff
5c480e452f
Merge branch 'master' of git.someserver.de:k4ever into morejson
pirms 12 gadiem
Sebastian Lohff
cadeffec3a
Merge branch 'morejson' of git.someserver.de:k4ever into morejson
pirms 12 gadiem
Sebastian Lohff
b06995f893
Added hooks to provide initial data for some Models
pirms 12 gadiem
Sebastian Lohff
d8d40415bd
Merge branch 'master' of git.someserver.de:k4ever into morejson
pirms 12 gadiem
25c562ec16
website: removed "kassensystem ist aktiv"-banner
pirms 12 gadiem
3be9d20a58
remove Freitagsrunden-specific content from template
pirms 12 gadiem
63ac10aad4
added exception templates. fixes #74
pirms 12 gadiem
Sebastian Lohff
7590b82fda
Merge branch 'master' of git.someserver.de:k4ever into morejson
pirms 12 gadiem
Sebastian Lohff
b82053d797
Merge branch 'master' of git.someserver.de:k4ever
pirms 12 gadiem
Sebastian Lohff
b41ebac6e5
Cleaned up settings for release, fixes #9
pirms 12 gadiem
9b18c4508e
update balance when buying items via javascript. fixes #10
pirms 12 gadiem
Sebastian Lohff
1b7aaca19f
getProfile ==> get_profile...
pirms 12 gadiem
Sebastian Lohff
67f5b43c72
API: Added more JSON with success msgs to api
pirms 12 gadiem
Sebastian Lohff
018332e16d
API: Code cleanup
pirms 12 gadiem
Sebastian Lohff
44c1d2c714
OLD API: Removed deprecated api
pirms 12 gadiem
Sebastian Lohff
f69f9bda15
Licensed k4ever under AGPLv3 or later
pirms 12 gadiem
Sebastian Lohff
f351a3f087
API: Added deposit bool to history, fixes #29
pirms 12 gadiem
Sebastian Lohff
90a9c152fa
API: Added name to history purchase-set, fixes #12
pirms 12 gadiem
Sebastian Lohff
b9c815effe
API: Added support for negative transactions, fixes #28
pirms 12 gadiem
8a020a36b5
Virtual Transaction: no more transaction to yourself
pirms 12 gadiem
4269b67c90
Preislister: Fix column label mix-up and alignment
pirms 12 gadiem
f9c823df9c
Remove disabled code leftover
pirms 12 gadiem
e20a8cb48b
Add preislister quickhack
pirms 12 gadiem
Sebastian Lohff
7bf15a1470
Added thumbnailing functions to api, fixes #17
pirms 12 gadiem
b7a96cb390
Merge branch 'master' of git.someserver.de:k4ever
pirms 12 gadiem
35195d69f0
Admin: Added filter for UserProfile: balance < 0
pirms 13 gadiem
Sebastian Lohff
d788878d57
Removed obsolete c-display daemon
pirms 13 gadiem
Sebastian Lohff
738b8cf240
Fix for encoding problems with barcode-display ( fixes #26 )
pirms 13 gadiem
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.
pirms 13 gadiem
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.
pirms 13 gadiem
Sebastian Lohff
9bad46cf2d
Fixed Transaction ,-usage and error for transactiontype
pirms 13 gadiem
Sebastian Lohff
b71b95436f
Fixed: Using default checked value for api transactions
pirms 13 gadiem
Sebastian Lohff
c0e9f81bf0
Added helper for Authblob
pirms 13 gadiem
Sebastian Lohff
e87b8e6ca1
Allows multiple Authblobs ( Fixes #22 )
pirms 13 gadiem
Sebastian Lohff
70766bba44
Order and Purchase now consistend ( Fixes #14 )
pirms 13 gadiem
614b77b6ac
Merge branch 'master' of git.someserver.de:k4ever
pirms 13 gadiem
86a9ecd598
Kontostand auf Konto-seite hinzugefuegt.
pirms 13 gadiem
Sebastian Lohff
9f55a64923
Cleaned up Transaction save/delete
pirms 13 gadiem
Sebastian Lohff
c2d144ea91
Removed transfer (transact-alias) urls from api2
pirms 13 gadiem
Sebastian Lohff
df32875789
API refactoring, introduced getError
pirms 13 gadiem
Sebastian Lohff
5dc8770783
Added API-Support for Virtual Transactions
pirms 13 gadiem
Sebastian Lohff
f97a501f1c
Fixed exception on user-not-found in form
pirms 13 gadiem
f7dc5bda50
Improve admin interface: Transaction list, filters, order list with purchases, buyable list...
pirms 13 gadiem
7da1e4875b
showItem: *fix: BuyDeposit-button where there is no deposiyyy
pirms 13 gadiem
7e608ae6af
virtualtransaction: add listingz
pirms 13 gadiem
d480ea8805
client-barcode: Add workaround for German keyboard layout
pirms 13 gadiem
294425f2b6
client-barcode: Add "neu" highlight to 5 euro charge code on howto sheet
pirms 13 gadiem
621f8017c8
client-barcode: Allow empty commit (bug #17 , broken by introduction of bulkbuy)
pirms 13 gadiem
Sebastian Lohff
tkroenert
MasterofJOKers