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

2437 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Bragg
dbb4ebbb70 Add a permission to view speaker contact details in conference.json 2016-12-30 19:21:36 +11:00
Scott Bragg
72c3d623b4 Adds an ical feed and track name to room 2016-12-26 12:14:16 +11:00
Scott Bragg
0eda616345 Rooms have optional track names, access schedule by day via URL (#87) 
* Optional track name with room name on schedule, access schedule by day eg /schedule/?day=Monday

* Changed to using a Track model rather than a char field
 2016-12-26 12:10:42 +11:00
Scott Bragg
765e80765c Added Track model for schedule headings 2016-12-24 17:55:11 +11:00
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
fccf547e9f Migration for open hardware CFP (#86) 
* Form for Open Hardware CFP

* Oops forgot the migration
 2016-12-23 17:44:16 +11:00
Scott Bragg
b66db0a4a8 Form for Open Hardware CFP (#85) 2016-12-23 17:29:23 +11:00
Scott Bragg
a37d620afb Adds an ical feed 2016-12-22 12:00:23 +11:00
Scott Bragg
8bf3948956 Loosen permissions on wiki editing. (#84) 2016-12-20 19:22:03 +11:00
Christopher Neugebauer
e57a1e875e Chrisjrn/sponsor logos (#83) 
* adds sponsor logos

* add sitkcermule

* Add wargaming

* Add TPAC
 2016-12-19 19:55:25 +11:00
Christopher Neugebauer
7924781c71 adds sponsor logos (#82) 
* adds sponsor logos

* add sitkcermule
 2016-12-19 14:24:24 +11:00
Christopher Neugebauer
4ba7f630e0 Bills the correct credit card. 2016-12-12 18:56:34 +11:00
Scott Bragg
cdec6e2258 Slot name needs to be looooooonger 2016-12-10 17:37:01 +11:00
Christopher Neugebauer
fa9bb1a9f9 Adds mobile-friendly schedule view and paged schedule view (#81) 
* Adds responsive mobile CSS for schedule timetable

* Adds by-day schedule view

* Displays content_override in schedule

* Adds twitter/homepage links for speakers.
 2016-12-10 17:11:40 +11:00
Scott Bragg
cc05d09f26 Merge pull request #62 from lca2017/chrisjrn/20161210 
Adds “exclusive” field to slots,
 2016-12-10 17:10:56 +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
Christopher Neugebauer
9a21d2c781 Schedule tweaks etc (#80) 2016-12-08 19:56:43 +11:00
Christopher Neugebauer
1ba1cf1a24 Adds nag_unpaid template and credit_note template (#79) 2016-12-07 22:11:01 +11:00
Christopher Neugebauer
221b4d6a22 quiet please 2016-12-07 21:00:47 +11:00
Christopher Neugebauer
f4e11ee53f Merge branch 'chrisjrn/20161207' 2016-12-07 18:05:03 +11:00
Christopher Neugebauer
056008c6e7 Credit notes can be applied to any invoice. 
Fixes #85
 2016-12-07 18:04:50 +11:00
Christopher Neugebauer
52376dff59 Adds nag mails to the UI. 
Fixes #50
 2016-12-07 17:39:13 +11:00
Christopher Neugebauer
19b59d7676 Adds functionality for sending nag e-mails 2016-12-07 17:31:42 +11:00
Christopher Neugebauer
051a942ffe Forms for nag e-mail 2016-12-07 11:52:10 +11:00
Christopher Neugebauer
fcf4e5cffb Adds forms for nag_unpaid 2016-12-07 11:19:30 +11:00
Christopher Neugebauer
37fbc2ee40 Adds some reporting documentation 2016-12-07 10:18:54 +11:00
Christopher Neugebauer
ea07469634 Fixes individual attendee view, which had disappeared. 2016-12-07 10:18:48 +11:00
Christopher Neugebauer
3a686ab1a8 Wiki with styling (#78) 
* Adds Django wiki and integrates our template

* Makes the wiki use lca2017 styling (to a point, anyway)
 2016-11-23 17:08:00 +11:00
Christopher Neugebauer
1df509cfbb Merge pull request #77 from faulteh/master 
Additional styles to make the schedule timetable look better with our…
 2016-11-23 11:30:48 +11:00
Scott Bragg
31322b6cb9 Additional styles to make the schedule timetable look better with our theme 2016-11-13 17:20:26 +11:00
Scott Bragg
b4356a1551 Merge pull request #61 from faulteh/lca2017 
Increase slot name since it's made up of room names and our room name…
 2016-11-13 15:32:55 +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
4fa9903998 Merge pull request #76 from faulteh/schedule_edit_fix 
Style fixes to make the proposal selection modal display.
 2016-11-04 11:25:28 +11:00
Scott Bragg
857e8623d9 Style fixes to make the proposal selection modal display. 2016-11-03 23:46:03 +11:00
Scott Bragg
ebfd7aa192 Add ACE editor for reviews 2016-10-31 22:21:30 +11:00
Christopher Neugebauer
c76c0f6f4b Merge branch 'chrisjrn/20161014-b' 
Fixes #63
 2016-10-14 16:52:59 -07:00
Christopher Neugebauer
6a37134172 Stops relying on a form 2016-10-14 16:26:36 -07:00
Christopher Neugebauer
ed2327bedd Cleans up the architecture for report views 2016-10-14 16:10:36 -07:00
Christopher Neugebauer
67ac01e599 Adds a tag to take the CSV version of a report 2016-10-14 11:36:31 -07:00
Christopher Neugebauer
517da70536 CSV fixes 2016-10-14 11:19:10 -07:00
Christopher Neugebauer
2637930996 Adds CSV output support 2016-10-14 11:11:27 -07:00
Christopher Neugebauer
ea7a8d9ae7 Indentation 2016-10-14 10:28:38 -07:00
Christopher Neugebauer
320f6ab6eb First step refactoring ReportView into a class 2016-10-14 10:27:22 -07:00
Christopher Neugebauer
4e3f4aa9ad Merge branch 'chrisjrn/20161013' 2016-10-13 11:23:54 -07:00
Christopher Neugebauer
ff342bb06e Merge branch 'master' into chrisjrn/20161013 2016-10-13 11:23:46 -07:00
Christopher Neugebauer
3f192c2626 Zeroed & paid invoices that are voided now release the cart. 
Fixes #95.
 2016-10-13 11:23:41 -07:00
Christopher Neugebauer
c9c9d2a2b2 Cancelled presentations no longer enable SpeakerCondition. 
Fixes #94
 2016-10-13 10:50:48 -07:00