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

136 commits

Author SHA1 Message Date
David Ray
2f6930ae11 Fixes #12; 500 error when re/un assigning slot presentations 2014-08-11 16:33:23 -04:00
Patrick Altman
3029878925 Merge pull request #51 from pyohio/pyohio-schedule-builder 
Schedule Builder
 2014-07-31 23:37:01 -05: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
Martin Brochhaus
bf4b682e8a Bugfix: Cannot unassign presentation on schedule/edit view 2014-05-18 15:50:51 +08:00
David Ray
b7ecf8984c add tests for build schedule form 2014-03-14 15:14:40 -04:00
David Ray
650ddd2bcc resolve merge conf 2014-03-14 15:14:34 -04:00
David Ray
0ce5e36c24 add tests for build schedule form 2014-03-03 13:48:24 -05:00
David Ray
62289cad36 make private methods more robust 2014-03-03 13:48:02 -05:00
David Ray
6102c4e5e4 adding back in ws 2014-03-03 08:38:47 -05:00
David Ray
4d1e9cf78e work on #6, needs tests 2014-02-28 10:55:54 -05: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
e9c97a9586 mimetype -> content_type 
mimetype is deprecated and to be removed in Django 1.7.
 2014-01-15 09:36:49 -05: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
Brian Rosner
29c95fc967 added create_slot schedule helper 2013-02-21 11:32:12 -07:00
Luke Hatcher
c582b2b3e2 include keynote in presentation slots, release, bump dev version 2013-02-01 00:54:04 -05:00
Luke Hatcher
c7592bc33e add published and hidden attributes to schedules 2013-01-29 03:14:56 -05:00
Luke Hatcher
1b57961061 orderings on schedules 2013-01-29 03:14:56 -05:00
trbs
17f9e53ef4 allow dashes in slugs of schedule names 2013-01-15 18:27:22 +01:00
Luke Hatcher
97e1086b1d only include schedule if presentation has a slot 2013-01-03 03:44:49 -05: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
d98f9b82a8 add default ordering to schedule models 2012-12-20 01:53:22 -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
2a68242a54 add overall conference schedule 2012-12-20 01:49:32 -05:00
Luke Hatcher
9977393d88 content override is optional 2012-11-25 19:12:36 -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
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
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
James Tauber
b48d66fd9d csv schedule export 2012-10-09 15:07:55 -04:00
Brian Rosner
d354e2b017 removed slugless URL names 2012-09-20 20:59:18 -06:00
Brian Rosner
1b3ef8d424 added schedule_presentation_detail 2012-09-20 20:39:34 -06:00
Brian Rosner
6a1e59812a added day timetables to schedule_detail 2012-09-20 19:42:03 -06:00
Brian Rosner
b7e8e7da8c fixed schedule slot room ordering 2012-09-19 20:48:54 -06: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
Brian Rosner
7c102aefa3 fixed a few larger bugs with schedule edit 2012-09-13 23:17:54 -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
Luke Hatcher
402a02097f use proposal number 2012-08-31 03:05:52 -04:00
Luke Hatcher
5b0354be90 add id and speaker to presentation 2012-08-31 02:52:12 -04:00
Luke Hatcher
1871be41e9 empty label 2012-08-31 02:31:31 -04:00
Luke Hatcher
13bc9ffacb add schedule list 2012-08-31 01:52:45 -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
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
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
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
7324d03031 add presentation model 2012-08-30 22:37:01 -04:00
Brian Rosner
2c954c3a05 Fixed slot rooms by using database more natively 2012-08-30 11:52:11 -06: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