Patrick Altman
5e4a6e4407
Use sha1 instead of sha256 for compatibility
2014-12-15 15:29:17 -06:00
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
Sheila Miguez
2c97ec7106
adds placeholder values for future model changes to ProposalBase"
2014-09-28 12:52:41 -05:00
Sheila Miguez
40a55c24c7
flake8 fix
2014-09-27 12:29:01 -05:00
Sheila Miguez
2b91a7296c
added cancelled element to json, used taavis start/end props
2014-09-27 12:29:00 -05:00
Sheila Miguez
0ebcc2f124
flake8 fixes
2014-09-27 12:29:00 -05:00
Sheila Miguez
51709c6eaf
adds a schedule json endpoint. based on @taavi's PR #45 with some changes from the @pyohio/pyohio repo
2014-09-27 12:29:00 -05:00
Taavi Burns
c4db94b7e5
Adds a schedule_json view which provides a /schedule/conference.json endpoint, of the kind that Carl uses for producing conference videos.
...
Also useful to feed into mobile schedule apps!
It is expected that someone might have to customize this for their own installation (PyCon Canada definitely did, with modifications to some of the models).
2014-09-27 12:29:00 -05:00
Sheila Miguez
ee1f4d92a5
flake8 fixes for the schedule edit form. imports were missing. added a TODO for the atomic call, which is not supported in django 1.4
2014-09-27 12:10:24 -05:00
Patrick Altman
c17a4cbda1
Merge pull request #49 from pyohio/pyohio-sponsorship-redirect
...
Redirect to dashboard if there are no benefits to edit.
2014-07-31 23:37:34 -05:00
Patrick Altman
3029878925
Merge pull request #51 from pyohio/pyohio-schedule-builder
...
Schedule Builder
2014-07-31 23:37:01 -05: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
Brian Rosner
a6cd048f43
added source English PO
2014-07-31 14:54:10 -06:00
Carlos Henrique Romano
f557337433
Increase code complexity in travis configuration
...
Also mark the view reported as too complex with a FIXME, so we can refactor it
when possible.
2014-07-31 08:57:45 -03:00
Carlos Henrique Romano
08939f1f3e
Remove unused code
2014-07-31 08:56:51 -03:00
Carlos Henrique Romano
36ab6d599f
Fix flake8 warnings
2014-07-30 15:19:26 -03:00
Volodymyr Hotsyk
fc4b1c4542
Updated urls to 1.6
2014-07-05 16:46:01 +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
Martin Brochhaus
bf4b682e8a
Bugfix: Cannot unassign presentation on schedule/edit view
2014-05-18 15:50:51 +08:00
David Ray
b7ecf8984c
add tests for build schedule form
2014-03-14 15:14:40 -04:00
David Ray
650ddd2bcc
resolve merge conf
2014-03-14 15:14:34 -04:00
David Ray
64a39b8706
resolve merge conflict
2014-03-14 15:12:16 -04: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
Rebecca Lovewell
1861ad2926
Redirect to dashboard if there are no benefits to edit.
...
The sponsor object has been created, and we only need to collect details
about the potential-sponsor's benefits. If there are no benefits, the user
should be redirected to the dashboard rather than forced to submit what
appears to be the same form twice.
2014-03-14 14:59:51 -04:00
Martin Brochhaus
5c07d3e945
Django 1.6 compatibility
2014-01-11 14:50:04 +08:00
James Tauber
7c3d4f2912
Merge pull request #35 from taavi/better-word-limit-error-message
...
Provides a better error message when a sponsor benefit text field is lon...
2013-07-03 16:52:45 -07:00
James Tauber
349422fae8
Merge pull request #38 from taavi/review-assignments-script
...
Adds a manage.py script to assign reviewers to talks.
2013-07-03 16:51:47 -07:00
Luke Hatcher
d93bd38758
don't assume category on presentations
2013-07-03 16:08:33 -04:00
Taavi Burns
e180c7f00b
Adds a manage.py script to assign reviewers to talks.
...
Requires that a 'reviewers' group exist, and that there are people assigned to it (otherwise it won't find any reviewers to add!).
It will assign up to 3 reviewers, where those reviewers are NOT one of the speakers, and that reviewer has not opted out of reviewing that talk. It will choose random reviewers from those with the fewest existing not-opted-out assignments.
2013-06-25 22:53:18 -04:00
Brian Rosner
6c1cfd1a53
cleaned up code style
2013-06-11 11:10:29 -06:00
Taavi Burns
0a597d38bf
Provides a better error message when a sponsor benefit text field is longer than the allowed limit.
...
It tells you how many words you've written!
2013-05-17 09:31:55 -04:00
florapdx
306dc683b8
removed proposalbase import from previous version
2013-04-29 14:14:47 -07:00
florapdx
22b7265649
removed user_reviews template tag; now being handled by review_section view
2013-04-29 14:13:10 -07:00
florapdx
9911a68a7a
removed block for template tag user_reviewed
2013-04-29 14:11:55 -07:00
florapdx
c3404459e1
added markup to render new all, user reviewed, and user not-reviewed pages
2013-04-29 14:06:25 -07:00
florapdx
f136a7c13b
added code in review_section iterator to add links to all, user reviewed, and user not-reviewed
2013-04-29 14:05:27 -07:00
florapdx
c2b429bacf
added urls for reviewed and not-reviewed by section
2013-04-29 14:03:37 -07:00
florapdx
0ad89365e9
added code to review_section view to sort by all, reviewed, and not reviewed
2013-04-29 14:02:39 -07:00
florapdx
40b04240d4
added Meta class ordering by name to order speaker lists and dropdowns
2013-04-29 14:00:58 -07:00
florapdx
f1b37c9833
add markup for listing proposals user has yet to review
2013-04-25 15:39:15 -07:00
florapdx
db7f8fac5d
added user_not_reviewed to templatetags
2013-04-25 15:37:38 -07:00
florapdx
9ab34b8ea5
deleted my inline comment
2013-04-24 16:08:31 -07:00
florapdx
8f0e4cf6a1
change behavior so that admin can add sponsor logos/text in-dashboard
2013-04-24 13:47:42 -07:00
Luke Hatcher
8f0fa92983
bump version for dev
2013-03-14 04:56:04 -04:00
Luke Hatcher
133f190b8e
dev2 release
2013-03-14 04:54:43 -04:00
Luke Hatcher
fbf5258bf1
bump version for beta 2
2013-03-14 04:53:48 -04:00
Brian Rosner
29c95fc967
added create_slot schedule helper
2013-02-21 11:32:12 -07:00
Luke Hatcher
15403668ed
bump version to dev55
2013-02-20 01:21:22 -05:00
