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
Luke Hatcher
8f0fa92983
bump version for dev
2013-03-14 04:56:04 -04:00
Luke Hatcher
133f190b8e
dev2 release
2013-03-14 04:54:43 -04:00
Luke Hatcher
fbf5258bf1
bump version for beta 2
2013-03-14 04:53:48 -04:00
Brian Rosner
29c95fc967
added create_slot schedule helper
2013-02-21 11:32:12 -07:00
Luke Hatcher
15403668ed
bump version to dev55
2013-02-20 01:21:22 -05: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
40a8253a19
bump version
2013-02-20 00:06:06 -05:00
Luke Hatcher
b21bd83451
match proposal kind slugs with hyphens
2013-02-20 00:04:14 -05:00
Luke Hatcher
c582b2b3e2
include keynote in presentation slots, release, bump dev version
2013-02-01 00:54:04 -05:00
Luke Hatcher
9e2d42f972
bump version to dev52
2013-01-29 06:28:21 -05:00
Luke Hatcher
9c68e4c326
use section name instead of section for box slugs
2013-01-29 06:11:34 -05:00
Luke Hatcher
8017226382
bump to dev51
2013-01-29 06:05:06 -05:00
Luke Hatcher
adc01c3e0b
add schedule specific boxes
2013-01-29 06:03:49 -05:00
Luke Hatcher
fc37e171ed
bump dev version
2013-01-29 03:17:01 -05:00
Luke Hatcher
148ac18c26
bump dev version
2013-01-29 03:14:56 -05:00
Luke Hatcher
c7592bc33e
add published and hidden attributes to schedules
2013-01-29 03:14:56 -05:00
Luke Hatcher
a4d94594af
bump dev version
2013-01-29 03:14:56 -05:00
Luke Hatcher
daf145f987
include section name in schedule view
2013-01-29 03:14:56 -05:00
Luke Hatcher
1b57961061
orderings on schedules
2013-01-29 03:14:56 -05:00
Steve Holden
8afa17b1c1
Update symposion/templates/sponsorship/_sponsor_link.html
...
Improved reference format and used pk rather than id
- thanks to trbs for the suggestion
2013-01-21 09:20:11 -08:00
Steve Holden
2e7f8259d8
Add ids to sponsor images to allow linking to each sponsor's entry.
2013-01-21 00:08:05 -08:00
trbs
17f9e53ef4
allow dashes in slugs of schedule names
2013-01-15 18:27:22 +01:00
Luke Hatcher
292bf16a3e
bump version
2013-01-03 03:45:18 -05:00
Luke Hatcher
97e1086b1d
only include schedule if presentation has a slot
2013-01-03 03:44:49 -05:00
Luke Hatcher
729e20af94
bump dev version to 46
2013-01-02 20:58:02 -05:00
Luke Hatcher
a8e33f14ea
Merge pull request #16 from mattsenate/master
...
FF AdBlocker Bug Fix and README Update
2012-12-19 23:01:45 -08:00
Luke Hatcher
582597b7b8
only yield actual users
2012-12-20 01:55:14 -05:00
Luke Hatcher
ca462422ba
include presentation in the context for breadcrumbs
2012-12-20 01:55:00 -05:00
Luke Hatcher
4461c2f510
redirect to specific schedule url instead of general
2012-12-20 01:54:38 -05:00
Luke Hatcher
96541b968f
tweak email
2012-12-20 01:53:56 -05:00
Luke Hatcher
da4848f307
add link to delete reviews
2012-12-20 01:53:44 -05:00
Luke Hatcher
d98f9b82a8
add default ordering to schedule models
2012-12-20 01:53:22 -05:00
Luke Hatcher
8cc9603814
add caching to schedule templates
2012-12-20 01:52:45 -05:00
Luke Hatcher
c1ff1546fe
show all speakers of a presentation
2012-12-20 01:51:52 -05:00
Luke Hatcher
6f172da50a
allow scheduling of tutorial types
2012-12-20 01:50:26 -05:00
Luke Hatcher
14d127a122
bulk accept fix
2012-12-20 01:50:07 -05:00
Luke Hatcher
2a68242a54
add overall conference schedule
2012-12-20 01:49:32 -05:00
Luke Hatcher
4c194ed94c
add community pages
2012-12-20 01:48:19 -05:00
Luke Hatcher
50fa632127
update schedule templates
2012-12-19 23:59:48 -05:00
Luke Hatcher
9d3db5b216
bump version
2012-12-14 04:56:11 -05:00
Luke Hatcher
bff5fb4656
bump version
2012-12-14 04:27:58 -05:00
Luke Hatcher
d708b5539e
fix rowspan in schedule templates
2012-12-14 04:26:28 -05:00
Luke Hatcher
5a5c30e701
bump dev version
2012-11-25 19:20:22 -05:00
Luke Hatcher
8139e43285
bump to dev42
2012-11-25 19:13:34 -05:00
Luke Hatcher
9977393d88
content override is optional
2012-11-25 19:12:36 -05:00
Luke Hatcher
a8e34b362b
bump version
2012-11-25 15:10:37 -05:00
Luke Hatcher
479579f350
add some columns to schedule admin lists
2012-11-25 15:10:30 -05:00
Luke Hatcher
3b46ba3012
provide string representations for schedule models
2012-11-25 13:26:25 -05:00
James Tauber
e26b9c2678
bumped version number
2012-11-11 09:13:11 -05:00
James Tauber
73179635ef
fixed typo in speaker manage template
2012-11-11 09:11:54 -05:00
James Tauber
ac6a05ee49
bumped version
2012-11-06 13:14:37 -05:00
James Tauber
72f2c06010
added external URL field to sponsor application form
2012-11-06 13:13:51 -05:00
Brian Rosner
3d843534fc
Bumped version for next release
2012-10-26 16:04:46 -06:00
Brian Rosner
0627f5c3ea
fixed content_override on public schedule
2012-10-26 16:03:50 -06:00
Brian Rosner
c0638b9762
Bumped version for next release
2012-10-26 16:03:18 -06:00
Brian Rosner
c09f887e72
added markitup on Slot content override
2012-10-26 16:01:01 -06:00
Brian Rosner
19d826ad00
added ability to edit non-talk slots
2012-10-26 15:32:03 -06:00
James Tauber
c38eb7de96
Merge pull request #14 from NelleV/trans
...
translation on proposal templates
2012-10-26 08:14:03 -07:00
Brian Rosner
5a3aec47cf
Bumped version for next release
2012-10-24 23:28:59 -06:00
Brian Rosner
d7ac510555
Added Slot.content_override
...
Slots can now be controlled through content_override if custom content is
needed in non-talk slots.
2012-10-24 23:21:20 -06:00
Luke Hatcher
06ea84331c
bump version
2012-10-25 00:00:30 -04:00
Luke Hatcher
4c385bafd5
switch to using pk for profile creation
2012-10-24 23:59:30 -04:00
mattsenate
c6d0e06c94
changes body class sponsors --> sponsorship to handle addblocker firefox bug
2012-10-20 16:59:10 -07:00
James Tauber
36f99a8afa
bumped up version
2012-10-18 13:55:46 -04:00
James Tauber
26f7503257
updated dashboard to allow sponsor details to be edited before approval
2012-10-18 13:54:26 -04:00
James Tauber
daff4020ea
redirect to sponsor edit after submission; allow sponsor details to be filled out before approval
2012-10-18 13:24:08 -04:00
James Tauber
6bb23205de
bumped up version
2012-10-18 12:50:20 -04:00
James Tauber
0f32fdcb74
allow staff to add sponsors directly via interface
2012-10-18 12:38:03 -04:00
James Tauber
1f98a6a754
bumped up version
2012-10-18 02:44:04 -04:00
James Tauber
89fb12f72f
implemented general file upload
2012-10-18 02:43:00 -04:00
James Tauber
f87015cc91
bumped up version
2012-10-12 00:52:45 -04:00
James Tauber
347617ead3
added user list and ability for staff to create speaker profiles
2012-10-12 00:48:48 -04:00
James Tauber
9e794bd66a
implemented speaker profiles
2012-10-11 23:55:49 -04:00
James Tauber
5944bb5577
fix speaker editing so staff can edit rather than rely on group
2012-10-11 22:41:45 -04:00
James Tauber
af04f9e763
bumped up version
2012-10-09 15:13:03 -04:00
James Tauber
b48d66fd9d
csv schedule export
2012-10-09 15:07:55 -04:00
Luke Hatcher
7a8c560a1b
remove track from review title
2012-10-06 21:30:56 -04:00
Luke Hatcher
a7537e1f08
bump version
2012-10-03 21:29:48 -04:00
Luke Hatcher
cc032da288
include user rating in reviews
2012-10-03 18:41:35 -04:00
Luke Hatcher
1abf1ca230
only use body outer so we can reliably wrap all pages in an outside container
2012-10-03 18:41:35 -04:00
Brian Rosner
2c46e56b35
Fixed bug in review deletion
...
When a review was not the latest it would cause a bug on deletion of the
latest. We changed the logic to work with the latest vote versus the previous
to fix this issue. Now all review deletion ensure a consistent latest vote
state.
2012-10-03 12:18:05 -06:00
Luke Hatcher
e5f87cce90
convert form to bootstrap
2012-10-01 13:27:41 -04:00
Luke Hatcher
07b12875a5
remove reference to uniform
2012-10-01 13:27:41 -04:00
Luke Hatcher
20c27638f3
removed unused template
2012-10-01 13:27:41 -04:00
Brian Rosner
71ad5e90a3
Bumped version for next release
2012-10-01 10:59:18 -06:00
Brian Rosner
7c6970fc3d
Removed default values of one from ProposalResult denormalized fields
...
The original default value of one assumed ProposalResult was being created
when a Review was created which meant a comment and a vote was made. This is
no longer the case from changes after the original change and has caused off
by one errors in the denormalized count.
2012-10-01 10:48:06 -06:00
Brian Rosner
f9f218ec94
bumped version for next release
2012-09-28 17:37:23 -06:00
Brian Rosner
7c54c8d40b
added box to schedule detail
2012-09-28 17:36:42 -06:00
Nelle Varoquaux
245debcbf2
translation on proposal templates
2012-09-24 12:54:41 +02:00
Brian Rosner
30e8f1dab5
bumped version for next release
2012-09-20 21:01:45 -06:00
Brian Rosner
f4344f4cbb
prevent default behavior of anchor when editing slot
2012-09-20 20:59:18 -06:00
Brian Rosner
d354e2b017
removed slugless URL names
2012-09-20 20:59:18 -06:00
James Tauber
fad4c7d4dd
initial presentation detail page and a couple of other tweaks
2012-09-20 22:54:17 -04:00
Brian Rosner
1b3ef8d424
added schedule_presentation_detail
2012-09-20 20:39:34 -06:00
James Tauber
8dc8f5f34a
moved _grid to _edit_grid and implemented read-only grid version
2012-09-20 22:02:02 -04:00
Brian Rosner
6a1e59812a
added day timetables to schedule_detail
2012-09-20 19:42:03 -06:00
Brian Rosner
b14b20aaa0
bumped version for next release
2012-09-20 19:27:13 -06:00
James Tauber
72620244ea
removed debugging prints and updated Presentation field name
2012-09-20 21:11:49 -04:00
James Tauber
d02e7f83c6
reverted incorrect guarding which removed the whole point of promote_proposal and ensured it was never called
2012-09-20 21:07:08 -04:00
Brian Rosner
842686bb8e
bumped version for next release
2012-09-19 20:56:01 -06:00
Brian Rosner
7db8ab8068
reverted debug output
2012-09-19 20:55:28 -06:00
Brian Rosner
49f23fc549
bumped version for next release
2012-09-19 20:51:30 -06:00
Brian Rosner
b7e8e7da8c
fixed schedule slot room ordering
2012-09-19 20:48:54 -06:00
James Tauber
796a8c98ba
show time and location in schedule list
2012-09-19 22:19:45 -04:00
Brian Rosner
f698d00fc8
added Room.__unicode__
2012-09-19 20:17:48 -06:00
Brian Rosner
f30dce6a61
added SLot.rooms property
2012-09-19 20:16:07 -06:00
Brian Rosner
17869c7c7c
improved ordering of URLs
2012-09-19 20:06:42 -06:00
James Tauber
c47907b29e
pass in schedule to schedule_list and show section name on section list
2012-09-19 22:06:22 -04:00
Brian Rosner
f1072eb4d9
fixed schedule URLs
2012-09-19 20:05:05 -06:00
Brian Rosner
1b2cdeffb0
fixed URLs and views to use section slug correctly
2012-09-19 20:03:30 -06:00
Brian Rosner
e3c18a4554
removed unused form in schedule_edit
2012-09-19 19:26:25 -06:00
Brian Rosner
51c35434f8
exclude cancelled presentations from being slotted
2012-09-19 19:22:05 -06:00
James Tauber
4b6684b611
don't show cancelled presentations on schedule list
2012-09-19 21:21:22 -04:00
Brian Rosner
453a443b5f
added ordering to presentations
2012-09-19 19:18:29 -06:00
Brian Rosner
f98a3f2f9a
added ability to remove content from slots
2012-09-19 19:18:29 -06:00
James Tauber
7e81853772
improved styling of schedule list
2012-09-19 21:17:36 -04:00
James Tauber
4bf5a3c7c4
cleaned up styling of schedule edit table including centering room names
2012-09-19 21:02:32 -04:00
James Tauber
968e9f4ee6
make slot edit just a link on existing presentation title
2012-09-19 21:01:40 -04:00
Luke Hatcher
0539a10921
bump version
2012-09-19 01:40:47 -04:00
Luke Hatcher
1202997a0d
guard against no schedule app installed
2012-09-19 01:36:35 -04:00
Brian Rosner
aad54984c5
avoid the extra SELECT
2012-09-15 17:47:59 -06:00
Brian Rosner
bb2ffd2df0
fixed team membership views to work non-POST
2012-09-15 17:32:43 -06:00
Brian Rosner
7c102aefa3
fixed a few larger bugs with schedule edit
2012-09-13 23:17:54 -06:00
Luke Hatcher
8bab8b486f
bump version
2012-09-13 17:41:32 -04:00
Luke Hatcher
1ad87798ad
add management command to reset sponsor benefits
2012-09-13 17:28:41 -04:00
Brian Rosner
429b47ac09
increased slot edit modal height
2012-09-13 14:54:11 -06:00
Brian Rosner
4fc3eb4a10
removed empty_label=None on SlotEditForm.presentation
2012-09-13 14:51:21 -06:00
Brian Rosner
db66749046
improved Proposal.proposal
...
* renamed the field to avoid nasty underscore
* fixed code to avoid extra query
2012-09-13 14:39:58 -06:00
Brian Rosner
a2b72499e0
bumped version to dev20
2012-09-08 19:58:10 -06:00
James Tauber
a224a70303
made email help a template snippet
2012-09-08 21:48:50 -04:00
Brian Rosner
bd2fd5338d
added DTL handling of email body
2012-09-08 19:38:57 -06:00
Brian Rosner
ecfabd5b70
added from_address to NotificationTemplate and prepare form
2012-09-08 19:10:06 -06:00
Brian Rosner
23b31b7973
bumped to dev19 for next release
2012-09-08 17:32:10 -06:00
Brian Rosner
c87225674f
added admin for NotificationTemplate
2012-09-08 17:29:18 -06:00
James Tauber
81710fc301
Merge branch 'result-notification' of github.com:pinax/symposion into result-notification
2012-09-08 19:21:20 -04:00
James Tauber
e37b395b85
nav for result notification
2012-09-08 19:21:16 -04:00
James Tauber
4c38b66d63
csrf token
2012-09-08 19:21:08 -04:00
Brian Rosner
aafc4e003e
protected views from being used by wrong people
2012-09-08 17:17:26 -06:00
James Tauber
e7c6055b3f
added cancel and disable next
2012-09-08 19:07:34 -04:00
Brian Rosner
7b25f58087
fixed syntax error
2012-09-08 17:04:28 -06:00
Brian Rosner
733c4adc53
create ResultNotification objects and send mail
2012-09-08 17:03:03 -06:00
James Tauber
ce3009d573
help text on {{ proposal }} and more explicit send button
2012-09-08 18:56:38 -04:00
James Tauber
3d362300bb
improved styling on email form
2012-09-08 18:49:19 -04:00
Brian Rosner
b754bb9add
fixed proposal pks and added notification template to send
2012-09-08 16:40:00 -06:00
James Tauber
8cb9a41f41
first pass at result notification prepare template
2012-09-08 18:39:38 -04:00
Brian Rosner
1f9ceed0e1
added notification template handling in result_notification_prepare
2012-09-08 16:35:56 -06:00
James Tauber
5f8e8f195c
get template select sending proper name/value
2012-09-08 18:32:06 -04:00
Brian Rosner
2b0b986530
fixed pk joining
2012-09-08 16:30:35 -06:00
Brian Rosner
df0ea0655c
implemented more result notification behavior
2012-09-08 16:29:17 -06:00
James Tauber
6186a913df
initial template selection tweaks to result notification
2012-09-08 18:19:06 -04:00
Brian Rosner
1c727a989b
added missing NotificationTemplate import
2012-09-08 16:14:27 -06:00
Brian Rosner
aa8db3c919
added notification_templates to result_notification context
2012-09-08 16:13:20 -06:00
Brian Rosner
5fefff0a3d
added result_notification_prepare view and stubbed out result_notification_send
2012-09-07 18:11:43 -06:00
Luke Hatcher
3c2a0de89d
change attr to prop
2012-09-06 23:51:54 -04:00
James Tauber
4435d957fc
more tweaks to selection javascript but still has select all bug
2012-09-06 22:54:52 -04:00
James Tauber
3dd7468365
first pass at models and view for table with selection
2012-09-06 22:36:40 -04:00
Luke Hatcher
85336dfed4
bump version
2012-09-02 15:33:39 -04:00
James Tauber
39769a5556
cleaned up review status buttons
2012-09-02 15:13:23 -04:00
James Tauber
8f5291b539
switched from reserve to standby and added support in UI review detail
2012-09-02 15:04:17 -04:00
James Tauber
0422855582
switched from using nullboolean accepted on proposal result to a more flexible status choice
2012-09-02 14:45:41 -04:00
Luke Hatcher
82eef6f2d1
bump version
2012-08-31 03:06:43 -04:00
Luke Hatcher
b1d2ff22dd
whitespace nit
2012-08-31 03:06:01 -04:00
Luke Hatcher
402a02097f
use proposal number
2012-08-31 03:05:52 -04:00
Luke Hatcher
a70c2bdd4b
bump to dev16
2012-08-31 02:55:05 -04:00
Luke Hatcher
5b0354be90
add id and speaker to presentation
2012-08-31 02:52:12 -04:00
Luke Hatcher
5e6085fd6d
bump version to dev 15
2012-08-31 02:44:43 -04:00
Luke Hatcher
c642a32b1a
bump version
2012-08-31 02:34:27 -04:00
Luke Hatcher
63e922a87d
Merge branch 'new-schedule'
2012-08-31 02:32:52 -04:00
Luke Hatcher
240eb42df4
add chosen
2012-08-31 02:32:30 -04:00
Luke Hatcher
1871be41e9
empty label
2012-08-31 02:31:31 -04:00
Luke Hatcher
8ce14b799c
add chosen
2012-08-31 02:31:31 -04:00
James Tauber
14870dd5b0
removed old facebox reference
2012-08-31 01:54:30 -04:00
Luke Hatcher
79e94d6f54
fix edit
2012-08-31 01:52:45 -04:00
Luke Hatcher
36ceef63ed
no animation
2012-08-31 01:52:45 -04:00
Luke Hatcher
13bc9ffacb
add schedule list
2012-08-31 01:52:45 -04:00
James Tauber
9bcfcb62e4
improved styling of schedule edit
2012-08-31 01:52:04 -04:00
James Tauber
d6a59f2e4f
protect schedule edit views
2012-08-31 01:16:30 -04:00
James Tauber
06ff53e73c
remove unused import
2012-08-31 01:12:15 -04:00
Luke Hatcher
c9be115166
fix redirect
2012-08-31 01:07:38 -04:00
Luke Hatcher
3039880b76
fix form error
2012-08-31 01:07:30 -04:00
