Patrick Altman
67433cacb4
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
2015-09-08 15:07:24 -05:00
Patrick Altman
ff07405ff0
Merge pull request #114 from uranusjr/timezone-field
...
Replace django-timezones w/ django-timezone-field
2015-09-08 14:56:38 -05:00
Tzu-ping Chung
1b51ef2ad8
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".
2015-08-04 13:47:35 +08:00
Hiroshi Miura
3207621058
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>
2015-08-03 23:37:33 +09:00
Hiroshi Miura
a95825ede8
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>
2015-08-03 23:32:25 +09:00
Hiroshi Miura
55814a57b3
admin: inline edit section
...
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-08-01 13:00:22 +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
71e9ca11bd
Namespace the apps
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
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
Carlos Henrique Romano
36ab6d599f
Fix flake8 warnings
2014-07-30 15:19:26 -03:00
Volodymyr Hotsyk
7596729ec1
Update to Django=1.6
2014-07-05 16:11:43 +03: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
84bd8f8971
Update urls import format
2014-01-15 09:35:36 -05:00
David Ray
ef66c7ed12
Adding South Support; Work on #1
2014-01-14 09:47:49 -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
Luke Hatcher
1b57961061
orderings on schedules
2013-01-29 03:14:56 -05:00
James Tauber
347617ead3
added user list and ability for staff to create speaker profiles
2012-10-12 00:48:48 -04:00
Luke Hatcher
76c4a7b79c
update conferences app
2012-07-12 00:38:01 -04:00
James Tauber
4b87c51251
updated imports to reflect new layout
2012-05-29 15:12:03 -04:00
James Tauber
09aa60777f
updated project layout for 1.4 (without content changes)
2012-05-29 14:53:04 -04:00
