symposion_app Changelog · Conservancy Kallithea

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

Patrick Altman

5c57512b04ee

9 years ago

Merge branch 'KyivPy-master'

Patrick Altman

2f89311d4225

9 years ago

Merge branch 'master' of https://github.com/KyivPy/symposion into KyivPy-master

Patrick Altman

9721593cc0e4

9 years ago

Merge branch 'mbrochh-django1.6-compatibility'

Patrick Altman

cb4b0fac3871

9 years ago

Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility

Sheila Miguez

f4c4009c4db3

10 years ago

Merge pull request #64 from codersquid/json_placeholders

Sheila Miguez

0fb224cbf6e2

10 years ago

Merge pull request #62 from codersquid/json_endpoint

Sheila Miguez

a4c4e6953c3d

10 years ago

Merge pull request #63 from codersquid/flake8scheduleform

Patrick Altman	04f246d85071	9 years ago	Initial commit of the PinaxCon demo site
Patrick Altman	11f697d13757	9 years ago	Massively upgrade symposion Massively upgrade symposion * Remove markitup (to be replaced with Ace editor) * Use DUA decorators * Removed custom signup bits * Upgraded dependencies * Added migrations * Namespaced template locations * Removed html5parser/sanitizer (for now) - parsing functionality should be moved out entirely to a hooks * Replaced ProposalScoreExpression object with a function that returns F() expressions
Anna Ossowski	8b4282a48e88	9 years ago	Update README.rst
Hiroshi Miura	c0402575475e	9 years ago	Slot: gen name retrun by __str__() when save() Slot: gen name retrun by __str__() when save() This name also used for itemize slots on admin screen Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Patrick Altman	a3c89ece12fa	9 years ago	Use pinax-pages instead
Patrick Altman	ba0bb84ad70b	9 years ago	Use django-boxes instead
Patrick Altman	6dd80f9ddb6f	9 years ago	Fix some flake8 issues
Patrick Altman	d23363621b01	9 years ago	Merge branch 'miurahr-i18n-all'
Patrick Altman	67433cacb46f	9 years ago	Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all Conflicts: symposion/boxes/models.py symposion/conference/models.py symposion/schedule/models.py symposion/speakers/models.py symposion/sponsorship/admin.py symposion/sponsorship/models.py symposion/teams/models.py
Patrick Altman	eff643e1bbfe	9 years ago	Merge branch 'miurahr-admin_sponsor_benefit'
Patrick Altman	509e275706f0	9 years ago	Merge branch 'admin_sponsor_benefit' of https://github.com/miurahr/symposion into miurahr-admin_sponsor_benefit Merge branch 'admin_sponsor_benefit' of https://github.com/miurahr/symposion into miurahr-admin_sponsor_benefit Conflicts: symposion/sponsorship/admin.py symposion/sponsorship/models.py
Patrick Altman	ff07405ff0e5	9 years ago	Merge pull request #114 from uranusjr/timezone-field Merge pull request #114 from uranusjr/timezone-field Replace django-timezones w/ django-timezone-field
Patrick Altman	ffd428d49720	9 years ago	Merge pull request #100 from miurahr/python3_compatibility Merge pull request #100 from miurahr/python3_compatibility python3 compatibility
Patrick Altman	5a71fc59225d	9 years ago	Merge pull request #97 from pinax/schedule-admin Merge pull request #97 from pinax/schedule-admin add to schedule admin
Patrick Altman	8a95b0861c5c	9 years ago	Merge branch 'master' into schedule-admin Merge branch 'master' into schedule-admin Conflicts: symposion/schedule/admin.py
Anna Ossowski	b5cf9f1541f2	9 years ago	Update README.rst
Anna Ossowski	5c4b92cf5ab7	9 years ago	Update README.rst
Anna Ossowski	e0482190be34	9 years ago	Update README.rst
Tzu-ping Chung	1b51ef2ad8bd	9 years ago	Replace django-timezones w/ django-timezone-field Replace django-timezones w/ django-timezone-field django-timezones does not support Python 3. django-timezone-field is a revived fork that does. For some unknown reason django-timezone-field's TimeZoneField does not like positional arguments, so I changed to first argument to a kwarg "verbose_name".
Hiroshi Miura	3207621058b8	9 years ago	i18n all part i18n all part - forms for labels and helps - views for success or warning messages - apps and models verbose_names for admin Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Hiroshi Miura	a95825ede8d4	9 years ago	python3 compatibility python3 compatibility - Things are suggested in python3 porting guide. https://docs.djangoproject.com/en/1.8/topics/python3/ 1. adding ```from django.utils.encoding import python_2_unicode_compatible``` 2. ``` __str__``` instead of ```__unicode__``` https://docs.djangoproject.com/en/1.8/topics/python3/#str-and-unicode-methods 3. Adding ```from __future__ import unicode_literals``` at the top of your Python modules https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals 4. Removing the `u` prefix before unicode strings; https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals - also closed #66 Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Patrick Altman	f7caf1435737	9 years ago	Merge pull request #85 from miurahr/export_sponsor_zip Merge pull request #85 from miurahr/export_sponsor_zip Enhanced sponsorship: export files
Patrick Altman	cf4168ca6aec	9 years ago	Merge pull request #87 from miurahr/sponsorship-display-url Merge pull request #87 from miurahr/sponsorship-display-url display_url
Patrick Altman	41dc93198d55	9 years ago	Merge pull request #88 from miurahr/sponsorship-admin-contacts Merge pull request #88 from miurahr/sponsorship-admin-contacts admin contact
Patrick Altman	356bc7f7f4a7	9 years ago	Merge pull request #95 from miurahr/dist-locale-file Merge pull request #95 from miurahr/dist-locale-file distribute locale files in source and binary package
Patrick Altman	c161f55c433c	9 years ago	Merge pull request #89 from miurahr/sponsorship-i18n-benefit Merge pull request #89 from miurahr/sponsorship-i18n-benefit i18n sponsor fields
Patrick Altman	2fcd7732384f	9 years ago	Merge pull request #96 from miurahr/l10n-japanese Merge pull request #96 from miurahr/l10n-japanese add japanese translation
Patrick Altman	20dc0ca73798	9 years ago	Merge pull request #103 from miurahr/signup-form-fields-order Merge pull request #103 from miurahr/signup-form-fields-order reorder signup fields
Patrick Altman	e632d84d2215	9 years ago	Merge pull request #105 from miurahr/drop-chosen Merge pull request #105 from miurahr/drop-chosen drop old unused chosen
Patrick Altman	249eae067b51	9 years ago	Merge pull request #109 from miurahr/fix_additional_speakers_constraint Merge pull request #109 from miurahr/fix_additional_speakers_constraint add more addtitional speakers constraints
Patrick Altman	135a79a97b91	9 years ago	Merge pull request #110 from miurahr/slot_name_with_rooms Merge pull request #110 from miurahr/slot_name_with_rooms slot name includes rooms
Patrick Altman	dbe90742122d	9 years ago	Merge pull request #111 from miurahr/admin_inline_schedules Merge pull request #111 from miurahr/admin_inline_schedules Inline schedule edit for admin
Hiroshi Miura	acd5e9595a78	9 years ago	slot name includes rooms slot name includes rooms Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Hiroshi Miura	32e8c27df99f	9 years ago	admin: inline edit day and slotroom admin: inline edit day and slotroom Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Hiroshi Miura	55814a57b3f0	9 years ago	admin: inline edit section admin: inline edit section Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Hiroshi Miura	b3e7b1be8c2c	9 years ago	add more addtitional speakers constraints add more addtitional speakers constraints Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Hiroshi Miura	c22bcf9cf464	9 years ago	fix OrderedDict import error in Py2.6 fix OrderedDict import error in Py2.6 Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Hiroshi Miura	fa66316f8aca	9 years ago	form key ordering: detect django version form key ordering: detect django version - Django 1.6 and before use SortedDict instead of OrderedDict It detect version and return proper dict for key ordering. - field deletion is done by reorder funcion. Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Hiroshi Miura	6f3115aee8a9	9 years ago	reorder signup fields reorder signup fields current implementation is not work on Django 1.7+ anymore. This modification activate feature in Django 1.7+ and drop support for Django 1.6 and before. Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Sheila Miguez	7cff2d8b1dcf	9 years ago	add to schedule admin