Patrick Altman
0b1da0e85e
Upgrades
2016-02-27 16:55:59 -06:00
Patrick Altman
7b77b9aa29
Drop deprecated url patterns format
2016-02-27 16:54:42 -06:00
Patrick Altman
1ab7a30435
Update for BI changes in django-reversion
2016-02-27 16:38:27 -06:00
Patrick Altman
efe413a837
Bump requirements
2016-02-27 16:35:06 -06:00
Anna Ossowski
c27be5e4c7
Update README.md
2016-02-27 00:14:55 +01:00
Anna Ossowski
8a744925b9
Update README.rst
2016-02-26 23:34:34 +01:00
Anna Ossowski
90768e786f
Update README.rst
2016-02-26 23:33:32 +01:00
Patrick Altman
3b635d9cb7
Merge pull request #120 from appropriatetech/master
...
Python3 compatibility
2016-02-20 17:06:57 -06:00
Patrick Altman
27cb1cf776
Merge pull request #118 from pydata/loosen-django-requirement
...
Loosen Django package requirement.
2016-02-20 17:06:27 -06:00
Patrick Altman
a1cbcdddd5
Add back in parsing the content override into html
2016-02-20 17:06:09 -06:00
Patrick Altman
6e83588f31
Merge pull request #119 from pydata/fix-duplicate-slot-save-method
...
Remove duplicate Slot.save method.
2016-02-20 17:05:29 -06:00
Patrick Altman
6bee00dff7
Merge pull request #122 from pydata/sponsor-listing-text-is-none
...
Make sponsor description default empty string.
2016-02-20 17:04:32 -06:00
Patrick Altman
73a087c801
Merge pull request #123 from pydata/unpublished-schedule
...
Don't show unpublished schedule info to non-staff.
2016-02-20 17:03:26 -06:00
Martey Dodoo
6b41b5c477
Don't show unpublished schedule info to non-staff.
...
Add checks to schedule_list, schedule_list_csv, and
schedule_presentation_detail views to verify that either schedule is
published or that current user is staff before displaying information.
See c7592bc33e
2016-02-20 08:39:12 -05:00
Anna Ossowski
277ec03278
Update README.md
2016-02-02 18:24:13 +01:00
Anna Ossowski
47b65ac330
Update README.rst
2016-02-01 20:45:16 +01:00
Martey Dodoo
a487f78f7e
Make sponsor description default empty string.
...
Set sponsor listing text to an empty string instead of None. If a
sponsor doesn't have a benefit named "Sponsor Description", this will
prevent the text "None" from displaying in the Django template.
2016-01-25 15:17:23 -05:00
Christopher Neugebauer
c13a986f2d
Updates migration
2016-01-22 22:07:59 +11:00
Christopher Neugebauer
2e89bc4887
Adds validation code to make sure that only one discount condition is applicable per product
2016-01-22 21:53:30 +11:00
Christopher Neugebauer
3f3db53232
Notes that things are tested.
2016-01-22 18:16:15 +11:00
Christopher Neugebauer
5302bca18d
Amends LICENCE to refer to chrisjrn
2016-01-22 18:04:34 +11:00
Christopher Neugebauer
95038d8b85
Commits goals.md
2016-01-22 18:02:39 +11:00
Christopher Neugebauer
224878a10c
Fixes flake8 errors
2016-01-22 17:21:29 +11:00
Christopher Neugebauer
c2400c4695
Moves the controller modules into their own subpackage. There's going to be a lot of stuff in there.
2016-01-22 16:29:41 +11:00
Christopher Neugebauer
d9e433659d
Imports code from old Symposion repo
2016-01-22 16:19:11 +11:00
Christopher Neugebauer
ecd5e08263
Update gitignore
2016-01-22 16:00:58 +11:00
Christopher Neugebauer
647e3fd10b
Initial commit
2016-01-22 15:53:23 +11:00
Anna Ossowski
4f59d7a9a1
Update README.rst
2016-01-21 01:16:12 +01:00
Mjumbe Wawatu Ukweli
47c28439d9
Python3 compatibility
...
Update the StringIO import in symposion.sponsorship.views
2016-01-12 20:39:55 -05:00
Martey Dodoo
ddc3553656
Remove duplicate Slot.save method.
...
Remove "save" method in Slot model since #107 added another "save"
method. This fixes the automated test failures in Travis CI.
2015-12-31 12:35:22 -05:00
Patrick Altman
46a10b9e3a
Merge pull request #107 from miurahr/gen_str_name_when_save
...
slot: generate __unicode__ name when save()
2015-12-28 10:50:32 -06:00
Patrick Altman
de23056b51
Merge pull request #115 from miurahr/pip8
...
fix pip8 warnings
2015-12-28 10:50:06 -06:00
Martey Dodoo
5b9f4fb71e
Loosen Django package requirement.
...
Loosen Django requirement to allow versions greater or equal to 1.8.5,
instead of mandating 1.8.5. This makes it easier to use newer releases
of Django (e.g. the bugfix and security releases 1.8.6 or 1.8.7) with
symposion.
2015-12-12 15:34:58 -05:00
Anna Ossowski
4e891156b9
Update README.md
2015-10-27 20:25:34 +01:00
Anna Ossowski
75f9739c5c
Update README.rst
2015-10-27 20:16:28 +01:00
Patrick Altman
f997e0761a
Merge pull request #116 from hivernales/fix-sponsorbenefit-str
...
Fix SponsorBenefit __str__
2015-10-26 08:02:57 -05:00
Didier Raboud
b50a42f243
Fix SponsorBenefit __str__ by using self.benefit.type instead of self.benefit_type
2015-10-26 12:40:22 +01:00
Anna Ossowski
23f6d15268
Update README.md
2015-10-19 15:24:07 +02:00
Hiroshi Miura
d68e310089
fix pip8 warnings
...
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-10-17 10:57:18 +09:00
Patrick Altman
ad9e5484f3
Add ace editor
2015-10-16 20:09:06 -05:00
Patrick Altman
031ee3807e
Fix typo
2015-10-16 19:54:11 -05:00
Patrick Altman
6d3d2de2b3
Add admin user: u: pinax, p: django
2015-10-16 19:15:20 -05:00
Patrick Altman
4c28fbe140
Typo fix
2015-10-16 18:08:51 -05:00
Patrick Altman
04f246d850
Initial commit of the PinaxCon demo site
2015-10-16 12:53:02 -05:00
Patrick Altman
11f697d137
Massively upgrade symposion
...
* Remove markitup (to be replaced with Ace editor)
* Use DUA decorators
* Removed custom signup bits
* Upgraded dependencies
* Added migrations
* Namespaced template locations
* Removed html5parser/sanitizer (for now) - parsing functionality
should be moved out entirely to a hooks
* Replaced ProposalScoreExpression object with a function that returns
F() expressions
2015-10-16 12:37:35 -05:00
Anna Ossowski
8b4282a48e
Update README.rst
2015-10-07 12:17:36 +02:00
Hiroshi Miura
c040257547
Slot: gen name retrun by __str__() when save()
...
This name also used for itemize slots on admin screen
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-10-01 16:57:26 +09:00
Patrick Altman
a3c89ece12
Use pinax-pages instead
2015-09-13 21:43:02 -05:00
Patrick Altman
ba0bb84ad7
Use django-boxes instead
2015-09-13 21:40:28 -05:00
Patrick Altman
6dd80f9ddb
Fix some flake8 issues
2015-09-13 21:34:40 -05:00
