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

279 commits

Author SHA1 Message Date
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
Luke Hatcher
224b9c8d57 remove slot pk from form 2012-08-31 01:00:56 -04:00
Luke Hatcher
d873283667 add class to form button 2012-08-31 01:00:43 -04:00
Luke Hatcher
09bce70aed edit schedule templates 2012-08-31 00:57:53 -04:00
Luke Hatcher
bea34fa689 slots not required 2012-08-31 00:57:53 -04:00
Luke Hatcher
db908372ff add view for editing slots 2012-08-31 00:57:53 -04:00