Commit graph

  • c51be4d30a Adds set_quantity as a method on CartController. Christopher Neugebauer 2016-03-03 18:18:58 -08:00
  • 4d8832bb40 Update with actual url Patrick Altman 2016-02-27 19:07:32 -06:00
  • 170f5f189f Update deploy config Patrick Altman 2016-02-27 18:54:26 -06:00
  • 7dc167f7df Update copyright year Patrick Altman 2016-02-27 18:34:46 -06:00
  • 60810af13a Fix pinax-boxes modal editors Patrick Altman 2016-02-27 18:32:03 -06:00
  • b2468f54bf Remove build artifacts Patrick Altman 2016-02-27 18:31:43 -06:00
  • dd8f0ba9c5 Update to latest build system Patrick Altman 2016-02-27 17:23:35 -06:00
  • 0b1da0e85e Upgrades Patrick Altman 2016-02-27 16:55:59 -06:00
  • 7b77b9aa29 Drop deprecated url patterns format Patrick Altman 2016-02-27 16:54:42 -06:00
  • 1ab7a30435 Update for BI changes in django-reversion Patrick Altman 2016-02-27 16:38:27 -06:00
  • efe413a837 Bump requirements Patrick Altman 2016-02-27 16:35:06 -06:00
  • c27be5e4c7 Update README.md Anna Ossowski 2016-02-27 00:14:55 +01:00
  • 8a744925b9 Update README.rst Anna Ossowski 2016-02-26 23:34:34 +01:00
  • 90768e786f Update README.rst Anna Ossowski 2016-02-26 23:33:32 +01:00
  • 3b635d9cb7 Merge pull request #120 from appropriatetech/master Patrick Altman 2016-02-20 17:06:57 -06:00
  • 27cb1cf776 Merge pull request #118 from pydata/loosen-django-requirement Patrick Altman 2016-02-20 17:06:27 -06:00
  • a1cbcdddd5 Add back in parsing the content override into html Patrick Altman 2016-02-20 17:06:09 -06:00
  • 6e83588f31 Merge pull request #119 from pydata/fix-duplicate-slot-save-method Patrick Altman 2016-02-20 17:05:29 -06:00
  • 6bee00dff7 Merge pull request #122 from pydata/sponsor-listing-text-is-none Patrick Altman 2016-02-20 17:04:32 -06:00
  • 73a087c801 Merge pull request #123 from pydata/unpublished-schedule Patrick Altman 2016-02-20 17:03:26 -06:00
  • 6b41b5c477 Don't show unpublished schedule info to non-staff. Martey Dodoo 2016-02-20 08:20:09 -05:00
  • 277ec03278 Update README.md Anna Ossowski 2016-02-02 18:24:13 +01:00
  • 47b65ac330 Update README.rst Anna Ossowski 2016-02-01 20:45:16 +01:00
  • a487f78f7e Make sponsor description default empty string. Martey Dodoo 2016-01-25 15:13:26 -05:00
  • c13a986f2d Updates migration Christopher Neugebauer 2016-01-22 22:07:59 +11:00
  • 2e89bc4887 Adds validation code to make sure that only one discount condition is applicable per product Christopher Neugebauer 2016-01-22 21:53:30 +11:00
  • 3f3db53232 Notes that things are tested. Christopher Neugebauer 2016-01-22 18:16:15 +11:00
  • 5302bca18d Amends LICENCE to refer to chrisjrn Christopher Neugebauer 2016-01-22 18:04:34 +11:00
  • 95038d8b85 Commits goals.md Christopher Neugebauer 2016-01-22 18:02:39 +11:00
  • 224878a10c Fixes flake8 errors Christopher Neugebauer 2016-01-22 17:02:07 +11:00
  • 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 +11:00
  • d9e433659d Imports code from old Symposion repo Christopher Neugebauer 2016-01-22 16:01:30 +11:00
  • ecd5e08263 Update gitignore Christopher Neugebauer 2016-01-22 16:00:58 +11:00
  • 647e3fd10b Initial commit Christopher Neugebauer 2016-01-22 15:53:23 +11:00
  • 4f59d7a9a1 Update README.rst Anna Ossowski 2016-01-21 01:16:12 +01:00
  • 47c28439d9 Python3 compatibility Mjumbe Wawatu Ukweli 2016-01-12 20:39:55 -05:00
  • ddc3553656 Remove duplicate Slot.save method. Martey Dodoo 2015-12-31 12:35:22 -05:00
  • 46a10b9e3a Merge pull request #107 from miurahr/gen_str_name_when_save Patrick Altman 2015-12-28 10:50:32 -06:00
  • de23056b51 Merge pull request #115 from miurahr/pip8 Patrick Altman 2015-12-28 10:50:06 -06:00
  • 5b9f4fb71e Loosen Django package requirement. Martey Dodoo 2015-12-12 15:34:58 -05:00
  • 4e891156b9 Update README.md Anna Ossowski 2015-10-27 20:25:34 +01:00
  • 75f9739c5c Update README.rst Anna Ossowski 2015-10-27 20:16:28 +01:00
  • f997e0761a Merge pull request #116 from hivernales/fix-sponsorbenefit-str Patrick Altman 2015-10-26 08:02:57 -05:00
  • b50a42f243 Fix SponsorBenefit __str__ by using self.benefit.type instead of self.benefit_type Didier Raboud 2015-10-26 12:40:22 +01:00
  • 23f6d15268 Update README.md Anna Ossowski 2015-10-19 15:24:07 +02:00
  • d68e310089 fix pip8 warnings Hiroshi Miura 2015-10-17 10:57:18 +09:00
  • ad9e5484f3 Add ace editor Patrick Altman 2015-10-16 20:09:06 -05:00
  • 031ee3807e Fix typo Patrick Altman 2015-10-16 19:54:11 -05:00
  • 6d3d2de2b3 Add admin user: u: pinax, p: django Patrick Altman 2015-10-16 19:15:20 -05:00
  • 4c28fbe140 Typo fix Patrick Altman 2015-10-16 18:08:51 -05:00
  • 04f246d850 Initial commit of the PinaxCon demo site Patrick Altman 2015-10-16 12:53:02 -05:00
  • 11f697d137 Massively upgrade symposion Patrick Altman 2015-10-16 12:36:58 -05:00
  • 8b4282a48e Update README.rst Anna Ossowski 2015-10-07 12:17:36 +02:00
  • c040257547 Slot: gen name retrun by __str__() when save() Hiroshi Miura 2015-07-25 15:28:09 +09:00
  • a3c89ece12 Use pinax-pages instead Patrick Altman 2015-09-13 21:43:02 -05:00
  • ba0bb84ad7 Use django-boxes instead Patrick Altman 2015-09-13 21:40:28 -05:00
  • 6dd80f9ddb Fix some flake8 issues Patrick Altman 2015-09-13 21:34:40 -05:00
  • d23363621b Merge branch 'miurahr-i18n-all' Patrick Altman 2015-09-08 15:07:36 -05:00
  • 67433cacb4 Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all Patrick Altman 2015-09-08 15:07:24 -05:00
  • eff643e1bb Merge branch 'miurahr-admin_sponsor_benefit' Patrick Altman 2015-09-08 15:03:15 -05:00
  • 509e275706 Merge branch 'admin_sponsor_benefit' of https://github.com/miurahr/symposion into miurahr-admin_sponsor_benefit Patrick Altman 2015-09-08 15:03:06 -05:00
  • ff07405ff0 Merge pull request #114 from uranusjr/timezone-field Patrick Altman 2015-09-08 14:56:38 -05:00
  • ffd428d497 Merge pull request #100 from miurahr/python3_compatibility Patrick Altman 2015-09-08 14:55:49 -05:00
  • 5a71fc5922 Merge pull request #97 from pinax/schedule-admin Patrick Altman 2015-09-08 14:54:02 -05:00
  • 8a95b0861c Merge branch 'master' into schedule-admin Patrick Altman 2015-09-08 14:51:49 -05:00
  • b5cf9f1541 Update README.rst Anna Ossowski 2015-08-28 14:41:11 +02:00
  • 5c4b92cf5a Update README.rst Anna Ossowski 2015-08-19 17:42:58 +02:00
  • e0482190be Update README.rst Anna Ossowski 2015-08-06 18:20:46 +02:00
  • 1b51ef2ad8 Replace django-timezones w/ django-timezone-field Tzu-ping Chung 2015-08-04 13:34:44 +08:00
  • 3207621058 i18n all part Hiroshi Miura 2015-06-26 12:46:09 +09:00
  • a95825ede8 python3 compatibility Hiroshi Miura 2015-07-18 16:09:17 +09:00
  • f7caf14357 Merge pull request #85 from miurahr/export_sponsor_zip Patrick Altman 2015-08-03 08:01:44 -05:00
  • cf4168ca6a Merge pull request #87 from miurahr/sponsorship-display-url Patrick Altman 2015-08-03 08:00:14 -05:00
  • 41dc93198d Merge pull request #88 from miurahr/sponsorship-admin-contacts Patrick Altman 2015-08-03 07:59:44 -05:00
  • 356bc7f7f4 Merge pull request #95 from miurahr/dist-locale-file Patrick Altman 2015-08-03 07:59:25 -05:00
  • c161f55c43 Merge pull request #89 from miurahr/sponsorship-i18n-benefit Patrick Altman 2015-08-03 07:59:09 -05:00
  • 2fcd773238 Merge pull request #96 from miurahr/l10n-japanese Patrick Altman 2015-08-03 07:58:53 -05:00
  • 20dc0ca737 Merge pull request #103 from miurahr/signup-form-fields-order Patrick Altman 2015-08-03 07:56:52 -05:00
  • e632d84d22 Merge pull request #105 from miurahr/drop-chosen Patrick Altman 2015-08-03 07:54:19 -05:00
  • 249eae067b Merge pull request #109 from miurahr/fix_additional_speakers_constraint Patrick Altman 2015-08-03 07:48:34 -05:00
  • 135a79a97b Merge pull request #110 from miurahr/slot_name_with_rooms Patrick Altman 2015-08-03 07:44:57 -05:00
  • dbe9074212 Merge pull request #111 from miurahr/admin_inline_schedules Patrick Altman 2015-08-03 07:44:17 -05:00
  • acd5e9595a slot name includes rooms Hiroshi Miura 2015-08-01 12:42:00 +09:00
  • 32e8c27df9 admin: inline edit day and slotroom Hiroshi Miura 2015-08-01 12:37:58 +09:00
  • 55814a57b3 admin: inline edit section Hiroshi Miura 2015-08-01 12:51:47 +09:00
  • b3e7b1be8c add more addtitional speakers constraints Hiroshi Miura 2015-07-26 14:21:02 +09:00
  • c22bcf9cf4 fix OrderedDict import error in Py2.6 Hiroshi Miura 2015-07-20 12:03:54 +09:00
  • fa66316f8a form key ordering: detect django version Hiroshi Miura 2015-07-20 09:39:11 +09:00
  • 6f3115aee8 reorder signup fields Hiroshi Miura 2015-07-19 14:33:03 +09:00
  • 7cff2d8b1d add to schedule admin Sheila Miguez 2015-07-15 16:43:44 -05:00
  • 0fa4801941 drop old unused chosen Hiroshi Miura 2015-07-11 16:02:35 +09:00
  • d174008149 sponsor benefit type richitext, simple and option Hiroshi Miura 2015-07-11 11:22:15 +09:00
  • 0d7df4db00 sponsor benfit is complete? Hiroshi Miura 2015-07-11 11:27:30 +09:00
  • 8bc696a2dc sponsorship benefit relation administration Hiroshi Miura 2015-07-11 11:27:12 +09:00
  • a9efef01d0 distribute locale files Hiroshi Miura 2015-06-26 09:22:36 +09:00
  • b50974263c i18n sponsor fields Hiroshi Miura 2015-06-21 14:48:17 +09:00
  • 3653cf3c69 admin contact Hiroshi Miura 2015-06-21 14:50:26 +09:00
  • c43b84fe94 display_url Hiroshi Miura 2015-06-21 14:55:46 +09:00
  • 999c458c1b add test Hiroshi Miura 2015-06-21 13:57:05 +09:00
  • fbf356b335 add export sponsor data zip command Hiroshi Miura 2015-06-21 13:40:49 +09:00