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

51 commits

Author SHA1 Message Date
Patrick Altman
91ae3de6df Merge pull request #75 from miurahr/proposal_status 
Display proposal result status in proposal admin change lists
 2015-06-18 23:04:29 -05:00
Patrick Altman
c97711d9b7 Merge pull request #77 from miurahr/i18n-more 
internationalize some messages
 2015-06-18 23:01:20 -05: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
edb3336aa7 notify to multiple speakers 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-12 01:36:11 +09: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
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
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
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
Rebecca Lovewell
6de322216d Show message when user does not have permission to access proposal submission page 2014-02-25 21:36:32 -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
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
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
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
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