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  
						
					 
				
					
						
							
							
								 
								tkroenert
							
						 
						
							 
							
							
							
							
								
							
							
								25c562ec16 
								
							 
						 
						
							
							
								
								website: removed "kassensystem ist aktiv"-banner  
							
							 
							
							
							
						 
						
							2012-01-23 10:25:30 +01:00  
						
					 
				
					
						
							
							
								 
								Konrad Mohrfeldt
							
						 
						
							 
							
							
							
							
								
							
							
								3be9d20a58 
								
							 
						 
						
							
							
								
								remove Freitagsrunden-specific content from template  
							
							 
							
							
							
						 
						
							2012-01-23 00:50:35 +01:00  
						
					 
				
					
						
							
							
								 
								Konrad Mohrfeldt
							
						 
						
							 
							
							
							
							
								
							
							
								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 
							
						 
						
							 
							
							
							
							
								
							
							
								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 Pipping
							
						 
						
							 
							
							
							
							
								
							
							
								4269b67c90 
								
							 
						 
						
							
							
								
								Preislister: Fix column label mix-up and alignment  
							
							 
							
							
							
						 
						
							2012-01-19 16:26:16 +01:00  
						
					 
				
					
						
							
							
								 
								Sebastian Pipping
							
						 
						
							 
							
							
							
							
								
							
							
								f9c823df9c 
								
							 
						 
						
							
							
								
								Remove disabled code leftover  
							
							 
							
							
							
						 
						
							2012-01-19 16:22:17 +01:00  
						
					 
				
					
						
							
							
								 
								Sebastian Pipping
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Theresa Enghardt
							
						 
						
							 
							
							
							
							
								
							
							
								b7a96cb390 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git.someserver.de:k4ever  
							
							 
							
							
							
						 
						
							2012-01-07 00:02:55 +01:00  
						
					 
				
					
						
							
							
								 
								Theresa Enghardt
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								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 Pipping
							
						 
						
							 
							
							
							
							
								
							
							
								d480ea8805 
								
							 
						 
						
							
							
								
								client-barcode: Add workaround for German keyboard layout  
							
							 
							
							
							
						 
						
							2011-10-27 23:38:03 +02:00  
						
					 
				
					
						
							
							
								 
								Sebastian Pipping
							
						 
						
							 
							
							
							
							
								
							
							
								294425f2b6 
								
							 
						 
						
							
							
								
								client-barcode: Add "neu" highlight to 5 euro charge code on howto sheet  
							
							 
							
							
							
						 
						
							2011-10-27 23:38:03 +02:00  
						
					 
				
					
						
							
							
								 
								Sebastian Pipping
							
						 
						
							 
							
							
							
							
								
							
							
								621f8017c8 
								
							 
						 
						
							
							
								
								client-barcode: Allow empty commit (bug  #17 , broken by introduction of bulkbuy)  
							
							 
							
							
							
						 
						
							2011-10-26 17:52:14 +02:00  
						
					 
				
					
						
							
							
								 
								Sebastian Pipping
							
						 
						
							 
							
							
							
							
								
							
							
								64ce18cb74 
								
							 
						 
						
							
							
								
								client-barcode: Save empty bulkbuy going over the line  
							
							 
							
							
							
						 
						
							2011-10-26 17:51:38 +02:00  
						
					 
				
					
						
							
							
								 
								Sebastian Pipping
							
						 
						
							 
							
							
							
							
								
							
							
								156a0df88d 
								
							 
						 
						
							
							
								
								client-barcode: Split Status.commit() up into sub-functions  
							
							 
							
							
							
						 
						
							2011-10-26 17:50:57 +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 
							
						 
						
							 
							
							
							
							
								
							
							
								16cfd63e4a 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git.someserver.de:k4ever  
							
							 
							
							
							
						 
						
							2011-10-25 19:04:11 +02:00