Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit graph

  • 8080d7851b Invoices now automatically void themselves if their cart is out of date Christopher Neugebauer 2016-03-27 14:04:47 +1100
  • 77ab00bc67 Merge branch 'category_user_limits' Christopher Neugebauer 2016-03-27 13:13:09 +1100
  • 0d458bea06 Allows Product.limit_per_user to be blank and null. Adds Category.limit_per_user. Adds functionality and tests to verify that this is legal. Christopher Neugebauer 2016-03-27 12:24:48 +1100
  • 7c99750f3a Simplifies creation of test data in test_cart, adds an extra product category and two new products Christopher Neugebauer 2016-03-27 12:08:17 +1100
  • db332da958 flake8 Christopher Neugebauer 2016-03-27 11:48:17 +1100
  • 3562772c13 Adds RadioBoxProductsForm Christopher Neugebauer 2016-03-27 11:18:26 +1100
  • 0ae005a5f5 Factors _QuantityBoxForm out of _ProductsForm Christopher Neugebauer 2016-03-27 10:23:59 +1100
  • 834233cd72 Factors ProductsForm handling into its own function Christopher Neugebauer 2016-03-26 20:43:20 +1100
  • 464684f13e Refactors the product_category view to be much simpler Christopher Neugebauer 2016-03-26 20:21:54 +1100
  • b13e6f7ce2 Factors out voucher form handling into its own function Christopher Neugebauer 2016-03-26 20:01:46 +1100
  • 2d5cd622c5 Makes it invalid for a user to re-enter a voucher code they already have. Christopher Neugebauer 2016-03-26 19:47:01 +1100
  • 940bf803b6 Merge branch 'show_available_discounts' Christopher Neugebauer 2016-03-26 15:16:04 +1100
  • 36ecf7fd54 Adds more tags for the dashboard. Christopher Neugebauer 2016-03-26 15:14:28 +1100
  • 941b057865 Shows the available discounts on the registration form Christopher Neugebauer 2016-03-26 14:03:25 +1100
  • fc279b1922 Replaces CategoryForm with ProductsForm (makes the form slightly dumber) Christopher Neugebauer 2016-03-26 13:30:46 +1100
  • 45aa83f854 Adds available_products as a method on ProductController Christopher Neugebauer 2016-03-26 13:22:47 +1100
  • c41a9cadff recalculate_discounts now uses the available_discounts function from controllers.discount. Christopher Neugebauer 2016-03-25 18:59:19 +1100
  • fb3878ce2e Adds available_discounts, which allows enumeration of the discounts that are available for a given set of products and categories Christopher Neugebauer 2016-03-25 18:09:24 +1100
  • 8d66ed5715 Fix flake8 warnings Christopher Neugebauer 2016-03-25 14:51:39 +1100
  • 4069d4bb32 Merge branch 'guided_registration' Christopher Neugebauer 2016-03-25 14:34:36 +1100
  • c192fef491 Adds basic template tag for available categories. Currently does not check enabling conditions. Christopher Neugebauer 2016-03-25 14:16:30 +1100
  • 478b328e41 Uses the completed_registration flag on the Attendee model Christopher Neugebauer 2016-03-25 12:50:59 +1100
  • 8e6364d02a Fixes bug where discount quantity applied to all users rather than specific user. Adds test case. Christopher Neugebauer 2016-03-25 12:50:34 +1100
  • 83b11cd722 Fixes invoicing payment logic Christopher Neugebauer 2016-03-24 14:20:29 +1100
  • eff5686dcf Adds logic for required categories Christopher Neugebauer 2016-03-24 14:19:33 +1100
  • dcad2d5f7c Second pass at guided registration, including profile page Christopher Neugebauer 2016-03-24 13:43:06 +1100
  • 05923a9a8f Profile form view now edits the relevant form Christopher Neugebauer 2016-03-24 12:58:23 +1100
  • 236c61eefa Fleshes out badge model, and adds first pass at display of the badge form Christopher Neugebauer 2016-03-24 11:33:11 +1100
  • eb530bd485 Adds the first pass at a “guided” registration form Christopher Neugebauer 2016-03-23 19:39:07 +1100
  • d50d6bac48 Fixes voucher handling form to not be compulsory Christopher Neugebauer 2016-03-23 19:36:54 +1100
  • 7086ea8729 Moves product disabling code into the form class Christopher Neugebauer 2016-03-23 19:36:22 +1100
  • 2f4ebc22af Merge branch 'category_form' Christopher Neugebauer 2016-03-23 15:05:44 +1100
  • e118a4e74c Adds dumb process for paying invoices. Christopher Neugebauer 2016-03-23 14:51:04 +1100
  • 4dc150d734 Fills in quantity boxes from the quantities in the current cart, not overall Christopher Neugebauer 2016-03-23 14:50:52 +1100
  • 2d6b28c5a6 Adds mechanism for entering a voucher code Christopher Neugebauer 2016-03-23 13:33:33 +1100
  • cc42490832 Applying a voucher to a cart now uses the voucher code rather than the voucher object. Adds tests for constraints on vouchers. Christopher Neugebauer 2016-03-23 13:29:18 +1100
  • 745f6db444 Adds “CategoryForm” to forms.py. It’s about to replace the existing ProductItem form Christopher Neugebauer 2016-03-04 18:01:16 -0800
  • 770e2ca88d Clean up some of the voting status UI Patrick Altman 2016-03-17 13:59:46 -0500
  • 430d3dad99 Fix up review nav Patrick Altman 2016-03-17 13:45:40 -0500
  • ad8181091a Merge pull request #130 from pydata/unpublished-conference-schedule Patrick Altman 2016-03-15 19:48:07 -0500
  • 6789b25e69 Update README.md Anna Ossowski 2016-03-15 17:37:18 +0100
  • 251f9ea280 Show unpublished conference schedule to staff. Martey Dodoo 2016-03-15 12:08:58 -0400
  • d10d313f64 Merge pull request #128 from jefftriplett/speaker-twitter-username Patrick Altman 2016-03-15 08:54:58 -0500
  • 0a487cb269 Merge pull request #129 from pydata/slot-admin-content Patrick Altman 2016-03-15 08:54:14 -0500
  • 88fc54994b Update README.rst Anna Ossowski 2016-03-15 13:22:29 +0100
  • f5558d5f0c Update README.rst Anna Ossowski 2016-03-15 13:21:19 +0100
  • 6fb529aad2 Display content_override in slot admin list view. Martey Dodoo 2016-03-15 05:47:25 -0400
  • c7ce7fe020 Adds twitter_username to Speaker Jeff Triplett 2016-03-14 22:24:14 -0500
  • 2717e4c819 Merge pull request #127 from pydata/not-reviewed-error Patrick Altman 2016-03-10 21:07:25 -0600
  • 78d13a9ffa Fix queryset used in "Not Reviewed" view. Martey Dodoo 2016-03-10 20:35:41 -0500
  • 68e7e4e594 Checks enabling conditions before adding items to the list Christopher Neugebauer 2016-03-04 14:35:09 -0800
  • 8400da17da Fixes error in EnablingConditionBase, adds admins for Product and Category enabling conditions Christopher Neugebauer 2016-03-04 14:28:58 -0800
  • 0182a32f03 Fixes various errors in discount calculation, and adds tests for these Christopher Neugebauer 2016-03-04 13:07:45 -0800
  • 99f4b8dfe0 Fixes validation error in models.py for adding discounts Christopher Neugebauer 2016-03-04 13:07:18 -0800
  • a4de15830c Adds checkout view, which generates an invoice, and then redirects to the invoice itself. Christopher Neugebauer 2016-03-04 12:22:01 -0800
  • 1b7d8a60c1 Adds product_category form, which allows users to add products from a specific category to their cart. Christopher Neugebauer 2016-03-03 13:40:44 -0800
  • c51be4d30a Adds set_quantity as a method on CartController. Christopher Neugebauer 2016-03-03 18:18:58 -0800
  • 4d8832bb40 Update with actual url Patrick Altman 2016-02-27 19:07:32 -0600
  • 170f5f189f Update deploy config Patrick Altman 2016-02-27 18:54:26 -0600
  • 7dc167f7df Update copyright year Patrick Altman 2016-02-27 18:34:46 -0600
  • 60810af13a Fix pinax-boxes modal editors Patrick Altman 2016-02-27 18:32:03 -0600
  • b2468f54bf Remove build artifacts Patrick Altman 2016-02-27 18:31:43 -0600
  • dd8f0ba9c5 Update to latest build system Patrick Altman 2016-02-27 17:23:35 -0600
  • 0b1da0e85e Upgrades Patrick Altman 2016-02-27 16:55:59 -0600
  • 7b77b9aa29 Drop deprecated url patterns format Patrick Altman 2016-02-27 16:54:42 -0600
  • 1ab7a30435 Update for BI changes in django-reversion Patrick Altman 2016-02-27 16:38:27 -0600
  • efe413a837 Bump requirements Patrick Altman 2016-02-27 16:35:06 -0600
  • c27be5e4c7 Update README.md Anna Ossowski 2016-02-27 00:14:55 +0100
  • 8a744925b9 Update README.rst Anna Ossowski 2016-02-26 23:34:34 +0100
  • 90768e786f Update README.rst Anna Ossowski 2016-02-26 23:33:32 +0100
  • 3b635d9cb7 Merge pull request #120 from appropriatetech/master Patrick Altman 2016-02-20 17:06:57 -0600
  • 27cb1cf776 Merge pull request #118 from pydata/loosen-django-requirement Patrick Altman 2016-02-20 17:06:27 -0600
  • a1cbcdddd5 Add back in parsing the content override into html Patrick Altman 2016-02-20 17:06:09 -0600
  • 6e83588f31 Merge pull request #119 from pydata/fix-duplicate-slot-save-method Patrick Altman 2016-02-20 17:05:29 -0600
  • 6bee00dff7 Merge pull request #122 from pydata/sponsor-listing-text-is-none Patrick Altman 2016-02-20 17:04:32 -0600
  • 73a087c801 Merge pull request #123 from pydata/unpublished-schedule Patrick Altman 2016-02-20 17:03:26 -0600
  • 6b41b5c477 Don't show unpublished schedule info to non-staff. Martey Dodoo 2016-02-20 08:20:09 -0500
  • 277ec03278 Update README.md Anna Ossowski 2016-02-02 18:24:13 +0100
  • 47b65ac330 Update README.rst Anna Ossowski 2016-02-01 20:45:16 +0100
  • a487f78f7e Make sponsor description default empty string. Martey Dodoo 2016-01-25 15:13:26 -0500
  • c13a986f2d Updates migration Christopher Neugebauer 2016-01-22 22:07:59 +1100
  • 2e89bc4887 Adds validation code to make sure that only one discount condition is applicable per product Christopher Neugebauer 2016-01-22 21:53:30 +1100
  • 3f3db53232 Notes that things are tested. Christopher Neugebauer 2016-01-22 18:16:15 +1100
  • 5302bca18d Amends LICENCE to refer to chrisjrn Christopher Neugebauer 2016-01-22 18:04:34 +1100
  • 95038d8b85 Commits goals.md Christopher Neugebauer 2016-01-22 18:02:39 +1100
  • 224878a10c Fixes flake8 errors Christopher Neugebauer 2016-01-22 17:02:07 +1100
  • c2400c4695 Moves the controller modules into their own subpackage. There's going to be a lot of stuff in there. Christopher Neugebauer 2016-01-22 16:21:23 +1100
  • d9e433659d Imports code from old Symposion repo Christopher Neugebauer 2016-01-22 16:01:30 +1100
  • ecd5e08263 Update gitignore Christopher Neugebauer 2016-01-22 16:00:58 +1100
  • 647e3fd10b Initial commit Christopher Neugebauer 2016-01-22 15:53:23 +1100
  • 4f59d7a9a1 Update README.rst Anna Ossowski 2016-01-21 01:16:12 +0100
  • 47c28439d9 Python3 compatibility Mjumbe Wawatu Ukweli 2016-01-12 20:39:55 -0500
  • ddc3553656 Remove duplicate Slot.save method. Martey Dodoo 2015-12-31 12:35:22 -0500
  • 46a10b9e3a Merge pull request #107 from miurahr/gen_str_name_when_save Patrick Altman 2015-12-28 10:50:32 -0600
  • de23056b51 Merge pull request #115 from miurahr/pip8 Patrick Altman 2015-12-28 10:50:06 -0600
  • 5b9f4fb71e Loosen Django package requirement. Martey Dodoo 2015-12-12 15:34:58 -0500
  • 4e891156b9 Update README.md Anna Ossowski 2015-10-27 20:25:34 +0100
  • 75f9739c5c Update README.rst Anna Ossowski 2015-10-27 20:16:28 +0100
  • f997e0761a Merge pull request #116 from hivernales/fix-sponsorbenefit-str Patrick Altman 2015-10-26 08:02:57 -0500
  • b50a42f243 Fix SponsorBenefit __str__ by using self.benefit.type instead of self.benefit_type Didier Raboud 2015-10-26 12:40:22 +0100