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

1634 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Seidenman (N6)
6121ce79cc Getting the splash homepage to work via CMS. 
Nearly there.  Much rubbish / cruft ripped out of  site_base.html and content_page.html.
Had to modify cms_pages/models.py to accommodate a "simple" layout option in the homepage
editor.
Still some stuff to do.  Styling not quite there yet, but want to checkpoint this.
 2017-01-16 14:28:24 +11:00
Scott Bragg
37dd7dd15b Fixed recording release to default false 2017-01-15 15:39:44 +11:00
Christopher Neugebauer
be0d04c9c4 Correct ordering of badges 2017-01-15 12:20:14 +11:00
Christopher Neugebauer
8ebb371a67 Correct ordering of invoices 2017-01-15 12:16:03 +11:00
Scott Bragg
8cf4bf3490 Add twitter to json 2017-01-15 09:55:53 +11:00
Christopher Neugebauer
cb42289f4c Adds “view badge” link 2017-01-15 07:55:52 +11:00
Christopher Neugebauer
b6b6a600ee Merge branch 'chrisjrn/manifest' 2017-01-15 07:52:01 +11:00
Christopher Neugebauer
e956c4c6a0 Adds manifests 2017-01-15 07:48:43 +11:00
Scott Bragg
4e22717639 Add description to ICal feed to help Giggety app identify conference 2017-01-14 09:47:14 +11:00
Christopher Neugebauer
2dbf020a81 Unbreaks URLs 2017-01-13 09:05:47 +11:00
Scott Bragg
46ca912f7c Give all ical events a unique uid and remove shortbreaks 2017-01-12 20:21:47 +11:00
Scott Bragg
73f2cc1d1c Merge pull request #68 from jamezpolley/lca2017 
Handle slots with no Proposal
 2017-01-12 19:51:58 +11:00
James Polley
3d626e8420 Handle slots with no Proposal 
* Use the item kind for a title if there's no proposal
* Use the content_override for the description if there's no proposal
 2017-01-12 16:58:26 +11:00
Scott Bragg
b47cb32bdc Merge pull request #67 from jamezpolley/lca2017 
Include author details in event description
 2017-01-12 16:27:13 +11:00
James Polley
710d377016 Include author details in iCal event description 2017-01-12 16:01:10 +11:00
Nick Seidenman (N6)
b1929bf4f9 Merge branch 'master' into prod 2017-01-12 09:03:01 +11:00
Nick Seidenman (N6)
a8e6a5b6d9 Set up 'prod' branch and made appropriate changes thereto. 2017-01-12 09:01:49 +11:00
Nick Seidenman
fad9c76d8f Update README.rst 2017-01-12 07:59:04 +11:00
Nick Seidenman (N6)
3100047760 Changed 2017 Melbourne to Melbourne 2017, per req from Chris N. 2017-01-12 07:31:22 +11:00
Nick Seidenman (N6)
011b2590aa The rest of the static stuff is now sorted. (Needed a couple more Alias directives in 
the apache2/mod_wsgi config to do this.)

Not sure if this complies with Best Practice.  Will check this out ASAP.
 2017-01-12 07:20:46 +11:00
Nick Seidenman (N6)
42ebbd06a1 Website is working behind apache2 / mod_wsgi in daemon mode. 
Only the homepage loads correctly at the moment.  Need to get the
static files thing sorted, still.
 2017-01-11 22:58:09 +11:00
Scott Bragg
6458f4d436 Merge pull request #66 from lca2017/chrisjrn/session_chair 
Chrisjrn/session chair
 2017-01-10 21:30:57 +11:00
Christopher Neugebauer
34e250322c Adds chair() method to sessions so that templates can easily determine who the chair is. 2017-01-10 21:23:07 +11:00
Christopher Neugebauer
b783901e98 Volunteers need to have a ticket before they can apply to volunteer. 2017-01-10 21:23:07 +11:00
Nick Seidenman (N6)
4e87b63c60 Pycon AU 2017 dummy site now working. (Identical to the one at the 2017.pycon-au.org URL now.) 2017-01-10 18:40:54 +11:00
Nick Seidenman (N6)
8d68cca01f Many changes, mostly from lca to pyconau. 2017-01-10 15:12:07 +11:00
Christopher Neugebauer
91284e66c7 Merge branch 'chrisjrn/badges' 2017-01-09 19:42:21 +11:00
Christopher Neugebauer
66dedfc101 Adds “badges” view, which lets us render multiple users’ badges into a zipfile. 2017-01-09 19:39:27 +11:00
Christopher Neugebauer
4fc494783d Refactors the email form into an InvoicesWithProductAndStatus form 2017-01-09 19:27:47 +11:00
Christopher Neugebauer
78714600bf Refactors badge to have render_badge too. 2017-01-09 19:16:30 +11:00
Christopher Neugebauer
c949a87b8a uses template.render rather than the render shortcut 2017-01-09 19:13:49 +11:00
Christopher Neugebauer
9da41c06de Adds first badge support 2017-01-09 18:57:49 +11:00
Scott Bragg
ae9f1e0b67 Merge pull request #65 from faulteh/speaker_deets_permission 
Add a permission to view speaker contact details in conference.json
 2017-01-08 13:37:21 +11:00
Christopher Neugebauer
cbb04cbdf4 Can send out information e-mails to people with paid invoices. 
Merge branch 'chrisjrn/email_reminders'
 2017-01-08 11:08:08 +11:00
Christopher Neugebauer
42711dde69 Renames a tempalte. 2017-01-08 10:45:08 +11:00
Christopher Neugebauer
fd7fff7879 Allows contexts to directly supply a user (so we can access registration data when e-mailing people.) 2017-01-08 10:44:19 +11:00
Christopher Neugebauer
274187b8bf Renames “nag_unpaid” to “invoice_mailout”, better matches current intent. 2017-01-08 09:52:49 +11:00
Christopher Neugebauer
de902a213d Adds invoice status to nag_unpaid 2017-01-08 09:48:48 +11:00
Christopher Neugebauer
3b985d40ac Missing line 2017-01-08 09:47:54 +11:00
Christopher Neugebauer
479bdd36a3 s/InvoiceNagForm/InvoiceEmailForm/ 2017-01-08 09:43:20 +11:00
Christopher Neugebauer
06fe8a8ffa Adds preview function to nag_unpaid 2017-01-08 09:42:40 +11:00
Nick Seidenman (N6)
ce8e6b159e Mods to settins.py making this less lca, more pycon. 
More to come.  Many more ...
 2017-01-06 15:32:19 +11:00
Nick Seidenman (N6)
c42159468e Started setting up static areas. 
- copied lca2017 stuff
- added pyconau2016 files / dirs.
 2017-01-05 13:59:20 +11:00
Nick Seidenman
12e936d08d Update requirements.txt 
Added symposion to requirements.txt
 2017-01-05 13:21:19 +11:00
Nick Seidenman
247fbfca75 Update README.rst 2017-01-05 13:20:00 +11:00
Christopher Neugebauer
d6cf16cedb Tracks which page of the schedule is loaded at any given time (#90) 
* Adds schedule fragment script

* removes spurious logging

* Displays the right tab on DOM load.

* Load today’s schedule if we’re during the conference.

* remove TODO
 2017-01-02 21:58:24 +11:00
Scott Bragg
c52682c57a Minor CSS fix for schedule 2016-12-31 15:19:00 +11:00
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