theresa
28ade73b47
Fix text rotation on start page
2011-10-15 19:10:26 +02:00
seba
f1bbfbb20c
Fixed some api bugs
...
- Disallowed buying more than 30 items at once
- Disallowed transacting 0 euros to account
2011-10-15 04:06:01 +02:00
seba
23b2164e23
moved map, added docs link
2011-10-15 03:49:43 +02:00
seba
17e9321eed
added thumbnail support (kudoes to tannek)
2011-10-15 03:43:33 +02:00
theresa
b62b6543e4
Show prices on start page, fix background color
2011-10-15 01:39:06 +02:00
theresa
f7476ebf68
Fix right column on start page and table width on buyable list
2011-10-14 20:23:29 +02:00
Konrad Mohrfeldt
ff74f9305e
meh, dont mess with the buybutton ^^
2011-10-14 17:58:05 +02:00
seba
5ddd2c71a1
Merge branch 'master' of git.someserver.de:k4ever
...
Conflicts:
k4ever/buyable/templates/buyables/showItems.html
k4ever/media/css/style.css
2011-10-14 14:58:52 +02:00
theresa
b059611d4a
Fix stylesheet (links, fonts, margins)
2011-10-14 13:42:06 +02:00
Konrad Mohrfeldt
adb8233120
updated buyButton and table.showitem styles
...
updated templates for product listings
2011-10-14 09:21:13 +02:00
theresa
86b25703be
Merge branch 'master' of git.someserver.de:k4ever
2011-10-14 00:07:29 +02:00
theresa
e7253465d7
Beautify settings page and buying history, order items in store
2011-10-13 23:55:43 +02:00
theresa
60b16bd532
Added multi-authblob submission error msg
2011-10-13 23:53:44 +02:00
Konrad Mohrfeldt
b3e4988547
updated start page view
2011-10-13 01:37:28 +02:00
Konrad Mohrfeldt
8eedb855cb
only populate search field when logged in
2011-10-13 00:58:17 +02:00
Konrad Mohrfeldt
def4cebcdf
removed unused css bg
2011-10-13 00:57:41 +02:00
Konrad Mohrfeldt
bb960dcba3
added deposit, payment and payment+deposit images
2011-10-13 00:55:36 +02:00
Konrad Mohrfeldt
5849239f5e
updated styles for top bar
2011-10-12 21:13:43 +02:00
Konrad Mohrfeldt
9729e675ff
migrated to api2
2011-10-12 21:13:21 +02:00
theresa
08e9d4590c
List of previous transactions: Make items align
2011-10-12 02:10:58 +02:00
theresa
77a8dd73ed
Buying history: Show pictures side-by-side instead of names
2011-10-12 01:43:30 +02:00
theresa
bed84eed06
Reordered the welcome page, added images and buying option
2011-10-12 01:21:06 +02:00
seba
7f484ffc52
Fix: Bulkbuying requires now items to be bought.
2011-10-11 01:34:07 +02:00
seba
f6f0a0f114
Added bulk buying to api2
2011-10-10 23:59:45 +02:00
theresa
828a31ec67
Fixed some typos and rewrote some of the doku.
2011-10-10 22:15:14 +02:00
seba
4f6ae55ba4
Some Api2-Handler fixes done with sping
2011-10-10 21:14:07 +02:00
Sebastian Pipping
16f24cb4a3
Server: Add missing negation
2011-10-10 07:54:27 +02:00
seba
252010544d
added check for admin plugin user group membership
2011-10-08 18:11:45 +02:00
seba
0bd4f3b4e0
added aspect ratio checking for admin (+note)
2011-10-08 05:05:27 +02:00
seba
34af3d73dd
markup errors
2011-10-07 02:38:23 +02:00
seba
b5616789cc
Doc: Added examples
2011-10-07 00:48:22 +02:00
seba
4fbd3c6651
Added a *lot* of documentation
2011-10-06 18:09:35 +02:00
seba
7850b322c5
more documentation to come
2011-10-06 15:30:02 +02:00
seba
6ee2e91338
added barcodesupport, docs and removed old apidoc
2011-10-06 02:10:16 +02:00
seba
b2438f2981
started apidoc
2011-10-04 19:36:16 +02:00
seba
793162c060
added sphinx-docs scaffold
2011-10-04 00:43:11 +02:00
theresa
89518255fa
New admin layout and pagination on buying history
2011-10-03 22:55:13 +02:00
seba
5f166e471d
new admin layout (but still broken)
2011-10-03 02:25:39 +02:00
seba
171bc9827d
Added current devcat status to git
2011-10-02 17:58:54 +02:00
seba
0f6c60020c
Api2 with multiple auth handlers (for ajax reqs)
2011-10-01 18:48:40 +02:00
seba
97ea6a6d31
whuppie, works (mostly), minor api probs
2011-09-30 22:55:31 +02:00
seba
d6a3b21d51
auth blob handling (UI) works
2011-09-30 22:29:02 +02:00
seba
a1052df608
Plugin + API + Changing user works
2011-09-30 17:22:26 +02:00
seba
8e0ad87341
started user plugin settings
2011-09-30 02:15:53 +02:00
seba
8d39ac2a3f
Started Plugin infrastructure
2011-09-30 01:24:41 +02:00
seba
9d674f82ca
api functional! (except for authblobbusiness)
2011-09-29 23:41:48 +02:00
seba
cf83f8def2
transaction GET/POST now possible
2011-09-29 23:38:25 +02:00
seba
1e825d96c4
fixed Decimal issues, buying per api possible
2011-09-29 19:17:11 +02:00
seba
ddf72146de
Buying will work... soon...
2011-09-29 14:14:29 +02:00
seba
85c37459c1
api needs account balance
2011-09-29 02:37:46 +02:00
seba
b3ec6090d9
FloatField to Decimal + further API
2011-09-29 00:26:39 +02:00
seba
f7980de01f
Piston debugging + further handler development
2011-09-28 14:31:21 +02:00
seba
c7ad4be6e4
api2 beginning, minor changes
2011-09-28 10:51:32 +02:00
seba
262cacdd72
Administration interface stuff
2011-09-13 20:47:15 +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
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
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
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
ee7a93858a
Alles kaputt, zeigt transactionhistory an
2010-10-13 06:59:30 +02:00
seba
5acc7b8d29
k4ever django project - db online!
2010-10-13 02:57:59 +02:00