Patrick Altman
|
2f89311d42
|
Merge branch 'master' of https://github.com/KyivPy/symposion into KyivPy-master
Conflicts:
symposion/cms/urls.py
symposion/proposals/urls.py
symposion/proposals/views.py
symposion/reviews/urls.py
symposion/schedule/urls.py
symposion/sponsorship/urls.py
|
2014-12-15 15:26:57 -06:00 |
|
Patrick Altman
|
cb4b0fac38
|
Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility
Conflicts:
symposion/boxes/urls.py
symposion/cms/urls.py
symposion/conference/urls.py
symposion/proposals/models.py
symposion/proposals/urls.py
symposion/reviews/urls.py
symposion/schedule/models.py
symposion/schedule/urls.py
symposion/speakers/urls.py
symposion/sponsorship/urls.py
symposion/teams/urls.py
|
2014-12-15 15:15:46 -06:00 |
|
Patrick Altman
|
819616ce0c
|
Merge pull request #50 from pyohio/pyohio-messages-proposal-submit
User messages on proposal submit page
|
2014-07-31 23:34:54 -05:00 |
|
Carlos Henrique Romano
|
0486af4bba
|
Remove unused code
|
2014-07-30 15:57:45 -03:00 |
|
Carlos Henrique Romano
|
36ab6d599f
|
Fix flake8 warnings
|
2014-07-30 15:19:26 -03:00 |
|
Volodymyr Hotsyk
|
3ad6d4cfef
|
Update sha_constructor to hashlib.sha256
|
2014-07-05 16:21:49 +03:00 |
|
Volodymyr Hotsyk
|
7596729ec1
|
Update to Django=1.6
|
2014-07-05 16:11:43 +03:00 |
|
Rebecca Lovewell
|
c5aad692ff
|
Show message when user does not have permission to access proposal submission page
|
2014-03-14 15:02:38 -04:00 |
|
Martin Brochhaus
|
5c07d3e945
|
Django 1.6 compatibility
|
2014-01-11 14:50:04 +08:00 |
|
Brian Rosner
|
6c1cfd1a53
|
cleaned up code style
|
2013-06-11 11:10:29 -06:00 |
|
James Tauber
|
96830f3c21
|
more tweaks to field label and help text to be more generic for different types of proposal
|
2013-02-20 01:04:20 -05:00 |
|
James Tauber
|
826b8e960a
|
made the help text a little more generic
|
2013-02-20 00:55:41 -05:00 |
|
Luke Hatcher
|
b21bd83451
|
match proposal kind slugs with hyphens
|
2013-02-20 00:04:14 -05:00 |
|
Brian Rosner
|
bd2fd5338d
|
added DTL handling of email body
|
2012-09-08 19:38:57 -06:00 |
|
Luke Hatcher
|
b1d2ff22dd
|
whitespace nit
|
2012-08-31 03:06:01 -04:00 |
|
Luke Hatcher
|
63e922a87d
|
Merge branch 'new-schedule'
|
2012-08-31 02:32:52 -04:00 |
|
Luke Hatcher
|
7e7d85c7e7
|
add section property to proposalbase
|
2012-08-30 22:55:20 -04:00 |
|
Luke Hatcher
|
11502f4804
|
expand emails to all reviewers and commenters
|
2012-08-30 14:10:32 -04:00 |
|
Luke Hatcher
|
6bfd617e99
|
add message to reviewers when proposal is updated
|
2012-08-27 14:12:19 -04:00 |
|
Luke Hatcher
|
69663679cc
|
fix dashboard issue
|
2012-08-14 17:22:54 -04:00 |
|
Luke Hatcher
|
7b4c5cd205
|
add review message form
|
2012-08-14 17:22:54 -04:00 |
|
James Tauber
|
e00b646f20
|
added method for determining if section is open for proposals and redirect away from form if not
|
2012-08-14 17:09:51 -04:00 |
|
Luke Hatcher
|
4be04a3800
|
don't allow adding documents to cancelled proposals
|
2012-07-18 19:22:29 -04:00 |
|
Luke Hatcher
|
07e98036b7
|
handle cases where USE_X_ACCEL_REDIRECT is not defined
|
2012-07-18 19:21:50 -04:00 |
|
Luke Hatcher
|
63d07f8db3
|
mark strings for i18n
|
2012-07-18 19:21:21 -04:00 |
|
Luke Hatcher
|
6cf7a62da1
|
track revisions for proposals, boxes and add reversion admin to all
|
2012-07-18 19:19:59 -04:00 |
|
James Tauber
|
dc11411a4a
|
added first pass of documentation about proposals
|
2012-07-12 16:38:42 -04:00 |
|
Luke Hatcher
|
7596922f4d
|
add proposals app from pycon
|
2012-07-12 00:38:39 -04:00 |
|