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

230 commits

Author SHA1 Message Date
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
James Tauber
39d0faac7c added schedule admin 2012-08-31 00:44:59 -04:00
James Tauber
d4b5326395 unpromote a proposal if undecided or rejected 2012-08-31 00:41:12 -04:00
James Tauber
69877075c7 use button dropdown to convey accept/reject state as well as actions 2012-08-31 00:31:10 -04:00
James Tauber
37c976c2f7 hooked up presentation promotion 2012-08-31 00:30:53 -04:00
Luke Hatcher
6d2cc584cf form for slot scheduling 2012-08-30 23:24:08 -04:00
Luke Hatcher
fe29c708b9 no models in markupfield land 2012-08-30 22:57:58 -04:00
Luke Hatcher
40aede0839 add foreign key to presentation 2012-08-30 22:55:44 -04:00
Luke Hatcher
7e7d85c7e7 add section property to proposalbase 2012-08-30 22:55:20 -04:00
Luke Hatcher
4ecb2272df change to onetoone 2012-08-30 22:46:23 -04:00
Luke Hatcher
5b7087f478 add proposal base to presentation 2012-08-30 22:43:43 -04:00
Luke Hatcher
82754d2342 enable proposal acceptance 2012-08-30 22:37:01 -04:00
Luke Hatcher
7324d03031 add presentation model 2012-08-30 22:37:01 -04:00
James Tauber
5c1916352c include class indicating slot kind 2012-08-30 22:31:59 -04:00
James Tauber
b4ec8dc29b only show add if the slot is for a talk 2012-08-30 22:26:37 -04:00
James Tauber
358b466d17 Merge branch 'master' into new-schedule 2012-08-30 21:10:46 -04:00
Luke Hatcher
11502f4804 expand emails to all reviewers and commenters 2012-08-30 14:10:32 -04:00
Luke Hatcher
34a9d07bb7 remove old css 2012-08-30 14:07:15 -04:00
Brian Rosner
2c954c3a05 Fixed slot rooms by using database more natively 2012-08-30 11:52:11 -06:00
James Tauber
38e2124c64 work in progress improvements to schedule edit styling 2012-08-30 12:26:41 -04:00
James Tauber
95d182e528 use full span12 on schedule edit 2012-08-30 12:17:10 -04:00
James Tauber
746e34cf3c work in progress on schedule edit template 2012-08-30 03:14:46 -04:00
Brian Rosner
3ade1c5516 Fixed typo in method name 2012-08-30 01:04:08 -06:00
Brian Rosner
44d0ea6f2b Moved colspan to slot in TimeTable 2012-08-30 01:02:49 -06:00
Brian Rosner
d7b3696c6e Fixed room lookup bug 2012-08-30 00:58:16 -06:00
Brian Rosner
69097d86c9 Fixed rooms queryset to be ordered 2012-08-30 00:57:02 -06:00
Brian Rosner
14f43da962 Corrected naming 2012-08-30 00:53:31 -06:00
Brian Rosner
7601791e8c Fixed tons of little bugs 2012-08-30 00:52:50 -06:00
Brian Rosner
f3e9cc9a5d Added TimeTable 2012-08-30 00:51:07 -06:00
Brian Rosner
bec6903ca1 Fixed slug bug 2012-08-30 00:23:49 -06:00
Brian Rosner
0a4e626dfe Started detail and edit views with slug field to Schedule 2012-08-30 00:21:48 -06:00
Brian Rosner
77dc781e0d Improved schedule models and behavior 
This allows for full slot creation now.
 2012-08-29 23:58:03 -06:00
Brian Rosner
143dbbce28 added schedule models (not fully complete) 2012-08-29 19:53:15 -06:00
Luke Hatcher
53923c5a7a add tabletools 2012-08-27 14:33:41 -04:00
Luke Hatcher
17e9016981 add datatables and tabletools 2012-08-27 14:32:59 -04:00
Luke Hatcher
6bfd617e99 add message to reviewers when proposal is updated 2012-08-27 14:12:19 -04:00
Luke Hatcher
2da59c13bf bump version 2012-08-25 20:01:48 -04:00
Luke Hatcher
54991cd4d1 only run generator on proposals with a selected status 2012-08-25 20:00:13 -04:00
Luke Hatcher
6ee3ff5d45 use generator to ensure proposals are filtered by speaker 2012-08-25 19:54:17 -04:00
Luke Hatcher
d427ef2941 proposal_count is unused 2012-08-25 19:52:58 -04:00
Luke Hatcher
1cb22cea95 restrict status view to reviewers 2012-08-25 19:52:07 -04:00
Luke Hatcher
86b698a228 bump version 2012-08-25 19:04:32 -04:00
Luke Hatcher
8bd7998034 add proposal leave template 2012-08-24 11:46:17 -04:00
Brian Rosner
32155ff1ea added Speaker Bio to proposal display fields 2012-08-22 16:32:47 -06:00
Brian Rosner
be877c19d6 spelt out Additional 2012-08-22 16:29:12 -06:00
Brian Rosner
70351b3714 moved Audience Level to a more logical spot in _proposal_fields 2012-08-22 16:28:42 -06:00
Brian Rosner
a9aff9d637 bumped version to 1.0b1.dev11 2012-08-22 16:01:24 -06:00
Brian Rosner
cee36ad983 modified copy for invite form on team to read more clearly 2012-08-22 15:56:22 -06:00
Luke Hatcher
4aab28c8ef always use user_display for comments 2012-08-17 15:38:23 -04:00
Luke Hatcher
6ded9f0b14 fix user display issue with proposal comments 2012-08-17 15:19:01 -04:00