Commit Graph

197 Commits

Author SHA1 Message Date
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
Konrad Mohrfeldt 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
tkroenert 8a020a36b5 Virtual Transaction: no more transaction to yourself 2012-01-20 20:08:43 +01:00
Sebastian Lohff 7bf15a1470 Added thumbnailing functions to api, fixes #17 2012-01-07 01:37:24 +01:00
Theresa Enghardt 35195d69f0 Admin: Added filter for UserProfile: balance < 0 2011-12-23 02:00:12 +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
tkroenert 614b77b6ac Merge branch 'master' of git.someserver.de:k4ever 2011-10-31 23:24:06 +01:00
tkroenert 86a9ecd598 Kontostand auf Konto-seite hinzugefuegt. 2011-10-31 23:23:38 +01:00
Sebastian Lohff 9f55a64923 Cleaned up Transaction save/delete 2011-10-31 17:22:21 +01:00
Sebastian Lohff c2d144ea91 Removed transfer (transact-alias) urls from api2 2011-10-31 16:29:51 +01:00
Sebastian Lohff df32875789 API refactoring, introduced getError 2011-10-31 15:21:26 +01:00
Sebastian Lohff 5dc8770783 Added API-Support for Virtual Transactions 2011-10-31 14:57:56 +01:00
Sebastian Lohff f97a501f1c Fixed exception on user-not-found in form 2011-10-30 03:18:11 +01:00
Theresa Enghardt f7dc5bda50 Improve admin interface: Transaction list, filters, order list with purchases, buyable list... 2011-10-30 02:21:56 +01:00
tkroenert 7da1e4875b showItem: *fix: BuyDeposit-button where there is no deposiyyy 2011-10-28 22:09:19 +02:00
tkroenert 7e608ae6af virtualtransaction: add listingz 2011-10-28 21:51:28 +02:00
Sebastian Lohff 27962ad107 Cleanup and regex enhancement of CurrencyField 2011-10-26 01:38:28 +02:00
Sebastian Lohff 38068e1ebb transaction: change "minValue('0')" to "notZero" 2011-10-25 20:17:38 +02:00
Sebastian Lohff f432ffc70b Fixed race condition when transacting to own user 2011-10-25 19:41:02 +02:00
Sebastian Lohff 5f0c0c14fc Cleanup of VirtualTransaction 2011-10-25 19:03:51 +02:00
Sebastian Lohff c3100ad09a Implemented first part for VirtualTransactions.
See Ticket #4
2011-10-25 15:47:10 +02:00
Sebastian Lohff 4e93c66b64 Fixed API urls, allowed to use bulkbuy without / 2011-10-24 17:28:11 +02:00
Sebastian Lohff fd46332e65 Fixed transaction checking.
Now the default value for the form is set to the value
given in TransactionType.needsCheck
2011-10-21 18:41:27 +02:00
Sebastian Lohff eaf1551fa1 Added password changing for non-ldap user 2011-10-21 03:05:07 +02:00
Sebastian Lohff b458cfaead Fixed #5 - Wrong API-Doc for Api /buy/ 2011-10-21 01:25:52 +02:00
Konrad Mohrfeldt bc18ed6661 fix: javascript-enabled click&buy didnt recognize deposit or item+deposit buttons 2011-10-21 00:03:55 +02:00
tkroenert 447224b0fe transactions: add filter against 0.00 transactions 2011-10-19 23:34:49 +02:00
seba 939159a1c9 Fixed bug in bulkBuy when not buying deposit 2011-10-18 02:56:29 +02:00
seba 16a0686b03 Fixed wrong function, now wrapping content_type 2011-10-17 20:06:20 +02:00
seba 2d11431e63 Fixed pistons content-type issue.
Pistons utils.Mimer.loader_for_type now get wrapped to remove
everything behind a ; (including the ;).
2011-10-17 19:44:41 +02:00
theresa 5a25b97c59 Kontodaten direkt fuer den user zum aufs Konto ueberweisen 2011-10-17 17:25:15 +02:00
Konrad Mohrfeldt ec463c9efa added animated svg for search and buy progress, added lock svg 2011-10-16 23:25:11 +02:00
Konrad Mohrfeldt 671fcdd42c fix: search results were covered by buybuttons 2011-10-16 21:12:29 +02:00
Konrad Mohrfeldt 4da11a6364 readded message styles (error, notice and success) 2011-10-16 21:09:44 +02:00
Konrad Mohrfeldt ec39438057 changed gritter settings 2011-10-16 20:41:03 +02:00
Konrad Mohrfeldt 265d286dcf added gritter buy notification, buy delay and fixed styles for search and buy 2011-10-16 16:20:59 +02:00
Konrad Mohrfeldt 61c344f936 fixed search and buy functionality failing on items that are not drinks 2011-10-16 15:10:42 +02:00
Konrad Mohrfeldt 8c05fb6b0f stylesheet doc fixes, replaced all paths in stylesheet with variables 2011-10-16 13:37:53 +02:00
Konrad Mohrfeldt 43658f48d3 fixed linkhover fail on images 2011-10-16 13:08:17 +02:00
Konrad Mohrfeldt 4910a387d9 updated account view template and styles 2011-10-16 13:03:11 +02:00
Konrad Mohrfeldt 905b218e4c added textbutton and viewcontrol styles. updated templates 2011-10-16 01:40:57 +02:00
Konrad Mohrfeldt 456465a67e oh hai. i edited all your templates and introduced less stylesheets 2011-10-16 00:39:35 +02:00
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