Scott Bragg
7ae022d2c4
Added track name to room, added day option to conference schedule view
2016-12-24 15:24:31 +11:00
Scott Bragg
d6ac7edc5d
Added timezone to start/end datetimes
2016-12-23 20:12:38 +11:00
Scott Bragg
a37d620afb
Adds an ical feed
2016-12-22 12:00:23 +11:00
Scott Bragg
cdec6e2258
Slot name needs to be looooooonger
2016-12-10 17:37:01 +11:00
Scott Bragg
de38ffac9e
Needs an additional migration to merge two 0003 migrations in schedule.
2016-12-10 17:07:38 +11:00
Christopher Neugebauer
5e372be5f6
Fixes issue with conference.json view
2016-12-10 14:48:30 +11:00
Christopher Neugebauer
4838adf775
Adds “exclusive” field to slots, so that you don’t need to add every single room to exclusive events (like keynotes)
2016-12-10 08:30:51 +11:00
Scott Bragg
02d7066c44
Increase slot name since it's made up of room names and our room names are long.
2016-11-13 15:31:08 +11:00
Christopher Neugebauer
f42766beef
Respects unpublishing in lists.
2016-09-18 15:52:45 +10:00
Christopher Neugebauer
970e002157
Do not show a presentation if it is unpublished
2016-09-18 15:52:45 +10:00
Christopher Neugebauer
3b4a51e6d4
Adds “unpublish” option to presentations (to temporarily hide from the schedule and from view by non-staff)
2016-09-18 15:52:45 +10:00
Scott Bragg
433a99a402
All the migrations seem fixed now
2016-09-17 15:53:47 +10:00
Scott Bragg
420d8ec870
Remove description from Presentation, add fields to proposal for notification template.
2016-09-03 12:48:31 +10:00
Martey Dodoo
251f9ea280
Show unpublished conference schedule to staff.
...
This is an addendum to #123 to allow the `schedule_conference` view to
show unpublished conference schedules to staff members.
2016-03-15 12:17:46 -04:00
Martey Dodoo
6fb529aad2
Display content_override in slot admin list view.
...
Fix typo and use `content_override` field (instead of `content`) for a
Slot's `list_display`.
2016-03-15 05:47:25 -04:00
Patrick Altman
7b77b9aa29
Drop deprecated url patterns format
2016-02-27 16:54:42 -06:00
Patrick Altman
a1cbcdddd5
Add back in parsing the content override into html
2016-02-20 17:06:09 -06:00
Patrick Altman
6e83588f31
Merge pull request #119 from pydata/fix-duplicate-slot-save-method
...
Remove duplicate Slot.save method.
2016-02-20 17:05:29 -06:00
Martey Dodoo
6b41b5c477
Don't show unpublished schedule info to non-staff.
...
Add checks to schedule_list, schedule_list_csv, and
schedule_presentation_detail views to verify that either schedule is
published or that current user is staff before displaying information.
See c7592bc33e
.
2016-02-20 08:39:12 -05:00
Martey Dodoo
ddc3553656
Remove duplicate Slot.save method.
...
Remove "save" method in Slot model since #107 added another "save"
method. This fixes the automated test failures in Travis CI.
2015-12-31 12:35:22 -05:00
Patrick Altman
46a10b9e3a
Merge pull request #107 from miurahr/gen_str_name_when_save
...
slot: generate __unicode__ name when save()
2015-12-28 10:50:32 -06:00
Patrick Altman
11f697d137
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
2015-10-16 12:37:35 -05:00
Hiroshi Miura
c040257547
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>
2015-10-01 16:57:26 +09:00
Patrick Altman
6dd80f9ddb
Fix some flake8 issues
2015-09-13 21:34:40 -05:00
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
ffd428d497
Merge pull request #100 from miurahr/python3_compatibility
...
python3 compatibility
2015-09-08 14:55:49 -05:00
Patrick Altman
8a95b0861c
Merge branch 'master' into schedule-admin
...
Conflicts:
symposion/schedule/admin.py
2015-09-08 14:51:49 -05: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
Patrick Altman
135a79a97b
Merge pull request #110 from miurahr/slot_name_with_rooms
...
slot name includes rooms
2015-08-03 07:44:57 -05:00
Hiroshi Miura
acd5e9595a
slot name includes rooms
...
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-08-01 13:06:43 +09:00
Hiroshi Miura
32e8c27df9
admin: inline edit day and slotroom
...
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-08-01 13:03:55 +09:00
Sheila Miguez
7cff2d8b1d
add to schedule admin
2015-07-15 16:43:44 -05:00
Patrick Altman
702ddf9a2d
Merge pull request #78 from miurahr/unicode
...
Return unicode from _unicode_ methods
2015-06-18 23:00:50 -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
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
5f311ca7bd
Replace dotted notation FKs with actual objects
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
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