Commit graph

2062 commits

Author SHA1 Message Date
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
a4c4e6953c Merge pull request #63 from codersquid/flake8scheduleform
flake8 fixes for the schedule edit form.
2014-09-27 12:27:15 -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
David Ray
2f6930ae11 Fixes #12; 500 error when re/un assigning slot presentations 2014-08-11 16:33:23 -04: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
Patrick Altman
745d16df0b Merge pull request #58 from chromano/master
Fix flake8 warnings, this time all of them
2014-07-31 09:55:01 -05: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
Patrick Altman
6d5c24e635 Merge pull request #56 from chromano/master
Fix flake8 warnings
2014-07-30 16:16:03 -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
Patrick Altman
96596dc5dd Update and rename README.md to README.rst 2014-07-16 20:33:55 -04:00
Patrick Altman
47621e54af Create .travis.yml 2014-07-12 21:31:18 -04:00
Patrick Altman
108407f1fd Update year in copyright 2014-07-10 14:18:00 -06:00
Volodymyr Hotsyk
fb26371362 Updated year in licence 2014-07-05 16:49:01 +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
David Ray
5b853f9300 Fixes #11 2014-06-19 23:55:15 -04:00
Martin Brochhaus
bf4b682e8a Bugfix: Cannot unassign presentation on schedule/edit view 2014-05-18 15:50:51 +08:00
David Ray
17256038c7 fix typos 2014-03-14 15:14:40 -04:00
David Ray
18077539a9 add schedule docs 2014-03-14 15:14:40 -04: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
7b35bcae72 adding back in ws 2014-03-14 15:13:03 -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
David Ray
6b9fb3a49d Merge pull request #10 from pyohio/6-schedule-builder
[6] Schedule Builder
2014-03-04 14:23:12 -05:00
David Ray
0e4dcef2a0 fix typos 2014-03-04 08:47:19 -05:00
David Ray
55ad74ab12 add schedule docs 2014-03-03 14:10:28 -05:00
David Ray
0ce5e36c24 add tests for build schedule form 2014-03-03 13:48:24 -05:00
David Ray
62289cad36 make private methods more robust 2014-03-03 13:48:02 -05:00
David Ray
6102c4e5e4 adding back in ws 2014-03-03 08:38:47 -05:00
David Ray
5f27b01452 remove unecessary check 2014-02-28 12:17:48 -05:00
David Ray
4d1e9cf78e work on #6, needs tests 2014-02-28 10:55:54 -05:00
David Ray
2f75033dc5 update dep 2014-02-26 13:56:19 -05:00
David Ray
b80cdfdb29 Merge pull request #9 from pyohio/proposal-submit-messages
User messages on proposal submit page
2014-02-26 11:05:53 -05:00
Rebecca Lovewell
6de322216d Show message when user does not have permission to access proposal submission page 2014-02-25 21:36:32 -05:00
Rebecca
3711ddf24e Merge pull request #8 from pyohio/sponsorship-redirect
Dynamic redirect after applying to be a sponsor.
2014-02-11 11:47:22 -05:00
Rebecca Lovewell
bc3dfd6c4c 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-02-11 11:26:56 -05:00
Rebecca Lovewell
9833a6a27c Loosen django-forms-bootstrap requirement 2014-02-11 09:24:03 -05:00
Rebecca
5024e5e1f4 Merge pull request #7 from pyohio/update-requirements
Update requirements for Django 1.5+
2014-02-03 07:32:09 -08:00
Rebecca Lovewell
8d5461d05d Loosen Django requirement
So that each project may control which version of Django to use. Not all
of the latest requirements are compatible with Django 1.4 anymore.
2014-02-03 10:07:17 -05:00
Rebecca Lovewell
e92dee1e0e Update easy-thumbnails from 1.2 -> 1.4
For Django 1.6 compatibility.
2014-01-31 17:30:32 -05:00
Rebecca Lovewell
8e85290107 Update django-taggit from 0.9.3 -> 0.11.2
For Django 1.6 compatibility.
2014-01-31 17:30:05 -05:00