Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
713 commits 2 branches 0 tags 57 MiB
Commit graph

465 commits

Author SHA1 Message Date
Patrick Altman
2aa805a01d Merge pull request #81 from miurahr/multiple-speakers 
Multiple speakers
 2015-06-18 22:59:36 -05:00
Hiroshi Miura
a41fb8bd35 schedule: add session and session role 
port from pycon development

Luke Hatcher committed 6889d05
2013-01-31
add session volunteer staff

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-18 23:37:11 +09:00
Hiroshi Miura
44deb8a536 i18n for more mesages 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-17 18:15:22 +09:00
Hiroshi Miura
5948aacd93 Internatinalize status label - undecided 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-17 11:43:02 +09:00
Hiroshi Miura
464d85b36a Display proposal result status in proposal admin change lists 
feedback from pycon development

commit 3401cdd8253d86e166d980a1d1eb5ba2de01932d
Author: Dan Poirier <dpoirier@caktusgroup.com>
Date:   Thu Jun 6 15:10:57 2013 -0400

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-17 11:43:02 +09:00
Hiroshi Miura
45706074d6 admin: show review result 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-12 08:07:49 +09:00
Hiroshi Miura
3dd2f14f72 multiple recipients for email 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-12 08:04:22 +09:00
Hiroshi Miura
edb3336aa7 notify to multiple speakers 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-12 01:36:11 +09:00
Hiroshi Miura
039ce4e000 Return unicode from _unicode_ methods 
Import from PyCon improvement.

Author: Dan Poirier <dpoirier@caktusgroup.com>
Date:   Mon Jul 8 15:55:33 2013 -0400

    Return unicode from __unicode__ methods

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-05-25 08:35:55 +09:00
Patrick Altman
7ff4c0b4ef Ignore linting the settings import 2014-12-18 08:19:01 -06:00
Patrick Altman
71e9ca11bd Namespace the apps 2014-12-18 08:19:01 -06:00
Patrick Altman
5f311ca7bd Replace dotted notation FKs with actual objects 2014-12-18 08:19:01 -06:00
Patrick Altman
2ec9449e38 Not necessary 2014-12-18 08:19:01 -06:00
Patrick Altman
d488c1e021 Use timezone.now instead of datetime.now 2014-12-18 08:19:01 -06:00
Patrick Altman
a33e1cfb1f Rename get_query_set to get_queryset 2014-12-18 08:19:01 -06:00
Patrick Altman
b7d1d1a968 Fix the appconf 2014-12-18 08:19:01 -06:00
Patrick Altman
b694901831 Remove migrations 
These migrations were written for South. Now that we have Django 1.7,
we will just use Django migrations once we hit a 1.0 release.
 2014-12-18 08:19:01 -06:00
Patrick Altman
ba1df47d69 Remove templates 
These have all been moved to the starter project,
pinax-project-symposion. The reasoning behind this is they are very
specific to the theme (pinax-theme-bootstrap) that the project uses and
not really all that reusable when packaged with this app.
 2014-12-18 08:19:01 -06:00
Patrick Altman
aeb784b3cd Add tox file and clean up a lint error 2014-12-15 16:25:00 -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
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
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
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
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
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
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
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 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
David Ray
cf09df2204 Merge branch 'pyflakes' 2014-01-16 10:49:06 -05:00
David Ray
c654c5aabb restore settings import as django-appconf relies on it being there 2014-01-16 10:48:39 -05:00
David Ray
f369e1d8ad Merge pull request #4 from pyohio/future-django 
Changes for Django 1.5+
 2014-01-16 05:17:42 -08:00
David Ray
5d4b81ae86 Merge pull request #5 from pyohio/update-requirements 
Update requirements
 2014-01-16 05:14:04 -08:00
David Ray
132ce087e5 Merge pull request #2 from pyohio/1-south-support 
Adding South Support; Work on #1
 2014-01-15 12:43:22 -08:00
Rebecca Lovewell
2413421324 Remove old tests file 2014-01-15 09:58:20 -05:00
Rebecca Lovewell
e799ead094 Remove outdated fixture_gen files 
http://github.com/alex/fixture_generator has not been updated since
Django 1.2.
 2014-01-15 09:58:20 -05:00
Rebecca Lovewell
dff5c4b1bb Use hashlib rather than django.utils.hashcompat 2014-01-15 09:36:49 -05:00
Rebecca Lovewell
e9c97a9586 mimetype -> content_type 
mimetype is deprecated and to be removed in Django 1.7.
 2014-01-15 09:36:49 -05:00
Rebecca Lovewell
280a2c2d20 Use {% load url from future %} in dashboard template 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:49 -05:00
Rebecca Lovewell
b2f41b81f4 Use {% load url from future %} in team templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
41aab58d7b Use {% load url from future %} in sponsorship templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
9e2ceec7c4 Use {% load url from future %} in speakers templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
76a5e08e2f Use {% load url from future %} in schedule templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
4c912da4ac Use {% load url from future %} in reviews templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
ed7278e926 Use {% load url from future %} in proposals templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
935ec48032 Use {% load url from future %} in emails templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
55d37c13bd Use {% load url from future %} in conference templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
8857e7b760 Use {% load url from future %} in cms templates 
Using https://github.com/django-future-url
 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
b495eddc61 direct_to_template -> TemplateView 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
84bd8f8971 Update urls import format 2014-01-15 09:35:36 -05:00
David Ray
cca9ad0793 add dependencies for proper migration order 2014-01-14 11:06:41 -05:00
David Ray
8e75bb77fb Remove project specific models 2014-01-14 10:37:05 -05:00
David Ray
ef66c7ed12 Adding South Support; Work on #1 2014-01-14 09:47:49 -05:00
Rebecca Lovewell
70b0906bc5 Remove unused managers 2014-01-13 16:50:01 -05:00
Rebecca Lovewell
5e5de6c6ea Pyflakes clean across the entire project 2014-01-13 16:49:40 -05: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