Patrick Altman
5d8b092319
Just focus on Django 1.7+
2014-12-18 08:19:01 -06:00
Patrick Altman
60e7095cac
Add .egg-info to gitignore
2014-12-18 08:19:01 -06:00
Patrick Altman
94a8a4bbac
Merge pull request #67 from codersquid/newdocs
...
A start at updating the documentation
2014-12-17 12:03:57 -06:00
Sheila Miguez
450bf3f5e4
adds a starting page about the example project
2014-12-16 20:32:09 -06:00
Sheila Miguez
8d415ef1dd
updating docs, add content management section
2014-12-16 20:28:21 -06:00
Patrick Altman
aeb784b3cd
Add tox file and clean up a lint error
2014-12-15 16:25:00 -06:00
Patrick Altman
894e7b1b2e
Upgrade requirements
2014-12-15 16:20:05 -06:00
Patrick Altman
6d0e5bc508
Merge branch 'pyohio-master'
2014-12-15 16:08:12 -06:00
Patrick Altman
f3614fcf52
Merge branch 'master' of https://github.com/pyohio/symposion into pyohio-master
...
Conflicts:
README.md
symposion/boxes/urls.py
symposion/cms/urls.py
symposion/proposals/actions.py
symposion/proposals/urls.py
symposion/proposals/views.py
symposion/reviews/tests.py
symposion/reviews/urls.py
symposion/reviews/views.py
symposion/schedule/forms.py
symposion/schedule/models.py
symposion/schedule/views.py
symposion/speakers/fixture_gen.py
symposion/sponsorship/urls.py
symposion/templates/cms/file_create.html
symposion/templates/cms/file_index.html
symposion/templates/conference/user_list.html
symposion/templates/dashboard.html
symposion/templates/emails/proposal_new_message/message.html
symposion/templates/emails/proposal_updated/message.html
symposion/templates/emails/speaker_addition/message.html
symposion/templates/emails/speaker_invite/message.html
symposion/templates/proposals/_pending_proposal_row.html
symposion/templates/proposals/_proposal_fields.html
symposion/templates/proposals/_proposal_row.html
symposion/templates/proposals/proposal_cancel.html
symposion/templates/proposals/proposal_detail.html
symposion/templates/proposals/proposal_edit.html
symposion/templates/proposals/proposal_speaker_manage.html
symposion/templates/proposals/proposal_submit.html
symposion/templates/reviews/_review_table.html
symposion/templates/reviews/base.html
symposion/templates/reviews/result_notification.html
symposion/templates/reviews/result_notification_prepare.html
symposion/templates/reviews/review_admin.html
symposion/templates/reviews/review_assignment.html
symposion/templates/reviews/review_detail.html
symposion/templates/reviews/review_review.html
symposion/templates/reviews/review_stats.html
symposion/templates/schedule/_edit_grid.html
symposion/templates/schedule/_grid.html
symposion/templates/schedule/_slot_edit.html
symposion/templates/schedule/presentation_detail.html
symposion/templates/schedule/schedule_list.html
symposion/templates/speakers/speaker_create.html
symposion/templates/speakers/speaker_edit.html
symposion/templates/speakers/speaker_profile.html
symposion/templates/sponsorship/add.html
symposion/templates/sponsorship/apply.html
symposion/templates/sponsorship/detail.html
symposion/templates/sponsorship/list.html
symposion/templates/teams/team_detail.html
2014-12-15 16:07:37 -06:00
Patrick Altman
5c57512b04
Merge branch 'KyivPy-master'
2014-12-15 15:29:43 -06:00
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
9721593cc0
Merge branch 'mbrochh-django1.6-compatibility'
2014-12-15 15:16:28 -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
f4c4009c4d
Merge pull request #64 from codersquid/json_placeholders
...
adds placeholder values for future model changes to ProposalBase
2014-09-28 12:55:49 -05:00
Sheila Miguez
2c97ec7106
adds placeholder values for future model changes to ProposalBase"
2014-09-28 12:52:41 -05:00
Sheila Miguez
0fb224cbf6
Merge pull request #62 from codersquid/json_endpoint
...
Adds a schedule_json view
2014-09-28 10:45:35 -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
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
