Scott Bragg
								
							 
						 | 
						
							
							
							
							
								
							
							
								56cad69f8f
								
							
						 | 
						
							
							
								
								Git Ignore local_settings so we don't accidentally publish the secret!
							
							
							
							
							
						 | 
						
							2016-06-10 13:47:51 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Scott Bragg
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b7618cc54
								
							
						 | 
						
							
							
								
								Able to load local_settings for production environment.
							
							
							
							
							
						 | 
						
							2016-06-10 13:38:24 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Scott Bragg
								
							 
						 | 
						
							
							
							
							
								
							
							
								bfcfb54d1b
								
							
						 | 
						
							
							
								
								Update requirements on lca2017 branch so pip doesn't get confused with
							
							
							
							
							
							
							
							different Django and Symposion versions 
							
						 | 
						
							2016-06-10 11:25:46 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								1ae9aba44e
								
							
						 | 
						
							
							
								
								Merge pull request #55 from parisba/patch-1
							
							
							
							
							
							
							
							Fixed a typo 
							
						 | 
						
							2016-05-12 09:43:31 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paris Buttfield-Addison
								
							 
						 | 
						
							
							
							
							
								
							
							
								9056d5d303
								
							
						 | 
						
							
							
								
								Fixed a typo
							
							
							
							
							
						 | 
						
							2016-05-12 11:31:19 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec882bdbdd
								
							
						 | 
						
							
							
								
								Update requirements.txt
							
							
							
							
							
							
							
							To point at registrasion 0.1.1 (which has a working Wheel file) 
							
						 | 
						
							2016-05-10 11:41:44 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d4f0a4acd
								
							
						 | 
						
							
							
								
								Update readme.rst
							
							
							
							
							
						 | 
						
							2016-05-10 11:40:56 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								998ae6e6be
								
							
						 | 
						
							
							
								
								Points requirements.txt at the lca2017 fork of symposion
							
							
							
							
							
						 | 
						
							2016-05-10 11:00:13 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								de83015776
								
							
						 | 
						
							
							
								
								Fixes ordering error in error display
							
							
							
							
							
						 | 
						
							2016-05-02 10:55:29 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								ded5114073
								
							
						 | 
						
							
							
								
								Merge branch 'batch_cache'
							
							
							
							
							
						 | 
						
							2016-05-01 19:12:53 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								abe8c12b05
								
							
						 | 
						
							
							
								
								Simplifies flag and discount filter functions
							
							
							
							
							
						 | 
						
							2016-05-01 19:12:40 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9b50c6846
								
							
						 | 
						
							
							
								
								Bug fixes and query optimisations in flag.py and discount.py
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:51 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ca25e5986
								
							
						 | 
						
							
							
								
								Makes sure that the cache is not disturbed by calling end_batch
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:51 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ab5ac32ca
								
							
						 | 
						
							
							
								
								Part of CartController->BatchController memoisation
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:51 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								efb73e7a68
								
							
						 | 
						
							
							
								
								Memoises everything else that needs to be memoised.
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:51 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d635521eb
								
							
						 | 
						
							
							
								
								CartController now uses BatchController memoisation
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:51 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								3717adb262
								
							
						 | 
						
							
							
								
								Squash this and last two
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:46 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad2de6e9d4
								
							
						 | 
						
							
							
								
								Breaks cart batching tests into multiple tests
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:46 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								94ceaa3bb1
								
							
						 | 
						
							
							
								
								Adds test case for CartController batching
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:46 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								5929c0af3c
								
							
						 | 
						
							
							
								
								Adds end_batch functionality
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:45 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								3db1256895
								
							
						 | 
						
							
							
								
								Adds test for end_batch functionality
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:45 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								a267b60eb9
								
							
						 | 
						
							
							
								
								Makes memoise work properly
							
							
							
							
							
						 | 
						
							2016-05-01 14:56:45 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								27ab44ec44
								
							
						 | 
						
							
							
								
								test cases for memoisation
							
							
							
							
							
						 | 
						
							2016-05-01 10:47:15 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								ddedf54c42
								
							
						 | 
						
							
							
								
								Adds batch context manager behaviour
							
							
							
							
							
						 | 
						
							2016-05-01 10:47:06 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								eb29e7cd09
								
							
						 | 
						
							
							
								
								Adds test cases for basic batch cacheing behaviour
							
							
							
							
							
						 | 
						
							2016-05-01 10:47:06 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								78a41970ea
								
							
						 | 
						
							
							
								
								Adds design for BatchController
							
							
							
							
							
						 | 
						
							2016-05-01 10:47:06 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								162a1f23dd
								
							
						 | 
						
							
							
								
								_filtered_discounts is now called _filtered_clauses, and it no longer cares about specific products or categories
							
							
							
							
							
						 | 
						
							2016-05-01 09:43:32 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3491cab8e
								
							
						 | 
						
							
							
								
								_filtered_flags now no longer cares about products for filtering. It just does everything.
							
							
							
							
							
						 | 
						
							2016-04-30 20:42:41 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6fdfa496e
								
							
						 | 
						
							
							
								
								Replaces CategoryController.attach_user_remainders with user_remainders
							
							
							
							
							
						 | 
						
							2016-04-30 20:30:44 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								941caa30d9
								
							
						 | 
						
							
							
								
								Replaces ProductController.attach_user_remainders with ProductController.user_remainders
							
							
							
							
							
						 | 
						
							2016-04-30 20:30:21 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								6956c78b0d
								
							
						 | 
						
							
							
								
								Merge branch 'query-optimisation'
							
							
							
							
							
						 | 
						
							2016-04-29 11:23:17 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								b40505117f
								
							
						 | 
						
							
							
								
								Fixes flake8 errors arising from rebase
							
							
							
							
							
						 | 
						
							2016-04-29 11:22:56 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								135f2fb47b
								
							
						 | 
						
							
							
								
								Refactors discounts validation in terms of available_discounts
							
							
							
							
							
						 | 
						
							2016-04-29 11:16:40 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								4eff8194f9
								
							
						 | 
						
							
							
								
								Reduces CartController re-loading when batching operations
							
							
							
							
							
						 | 
						
							2016-04-29 11:16:40 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								02fe88a4e4
								
							
						 | 
						
							
							
								
								Tests and fixes for a bug where discount quantities did not respect per-line item quantities.
							
							
							
							
							
						 | 
						
							2016-04-29 11:11:59 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d52a4c18f
								
							
						 | 
						
							
							
								
								More low-hanging query optimisations
							
							
							
							
							
						 | 
						
							2016-04-29 11:11:26 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								4fb569d935
								
							
						 | 
						
							
							
								
								Does more select_related and bulk_create calls
							
							
							
							
							
						 | 
						
							2016-04-29 11:10:20 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd5cf50fab
								
							
						 | 
						
							
							
								
								Makes items_purchased do more database work
							
							
							
							
							
						 | 
						
							2016-04-29 11:09:36 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								a79ad3520e
								
							
						 | 
						
							
							
								
								Puts attach_remainders on ProductController and CategoryController, eliminating the need to query each product and category separately.
							
							
							
							
							
						 | 
						
							2016-04-29 11:09:34 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b5b958b78
								
							
						 | 
						
							
							
								
								Makes the discounts section from _handle_products evaluate lazily, just in case it’s never displayed in a template (those are some very very expensive queries there).
							
							
							
							
							
						 | 
						
							2016-04-29 11:09:08 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								76e6206d09
								
							
						 | 
						
							
							
								
								Wraps the guided registration handler in views.py in a batch marker
							
							
							
							
							
						 | 
						
							2016-04-29 11:08:45 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								587e6e20b2
								
							
						 | 
						
							
							
								
								Adds an operations_batch context manager that allows batches of modifying operations to be nested. Closes #44.
							
							
							
							
							
						 | 
						
							2016-04-29 11:08:45 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								162db24817
								
							
						 | 
						
							
							
								
								Flake8 fixes
							
							
							
							
							
						 | 
						
							2016-04-29 11:08:45 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								71de0df5dc
								
							
						 | 
						
							
							
								
								Makes DiscountController a class and puts available_discounts inside it
							
							
							
							
							
						 | 
						
							2016-04-29 11:08:42 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								145fd057ac
								
							
						 | 
						
							
							
								
								Breaks out flag-handling code into flag.py and FlagController
							
							
							
							
							
						 | 
						
							2016-04-29 11:07:52 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f1be0e14e
								
							
						 | 
						
							
							
								
								Rearchitected condition processing such that multiple conditions are processed by the database, in bulk. Closes #42.
							
							
							
							
							
						 | 
						
							2016-04-29 11:06:58 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								05269c93cd
								
							
						 | 
						
							
							
								
								Marks 0.2.0-dev
							
							
							
							
							
						 | 
						
							2016-04-27 11:36:31 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8e20dd6d3
								
							
						 | 
						
							
							
								
								Coverage, Migrations.
							
							
							
							
							
						 | 
						
							2016-04-27 10:33:44 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christopher Neugebauer
								
							 
						 | 
						
							
							
							
							
								
							
							
								7116eeb294
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pinaxcon/master'
							
							
							
							
							
						 | 
						
							2016-04-26 19:19:54 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								c33c15d314
								
							
						 | 
						
							
							
								
								added MIT license
							
							
							
							
							
						 | 
						
							2016-04-26 17:18:28 +08:00 | 
						
						
							
							
							
								
							
							
						 |