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

1748 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Seidenman (N6)
a00fc7845e Added some css to make text visible on 404 and 404 pages. 
Removed references to non-existent content—page-header-panel.html.
 2017-02-05 09:45:12 +11:00
Nick Seidenman (N6)
a56ea57178 Prod site now working. Changes made to .conf file to effect this. 2017-02-05 07:13:46 +11:00
Joel Addison
155f841afa Generate ical description dynamically 
Use method instead of class attribute for ical feed description.
This allows the class to be instantiated without a database being
available (eg. during migrate).
 2017-01-29 22:08:49 +10:00
Nick Seidenman (N6)
8c1a05dd04 Merge branch 'master' into prod 2017-01-18 15:57:46 +11:00
Nick Seidenman (N6)
247edef849 More css tweaks. 2017-01-18 15:56:19 +11:00
Nick Seidenman (N6)
8cf2714496 Merge branch 'prod' of github.com:pyconau2017/website into prod 
Conflicts:
	pinaxcon/urls.py
 2017-01-18 14:54:02 +11:00
Nick Seidenman (N6)
dd3110e125 Merge branch 'master' into prod 
Conflicts:
	pinaxcon/settings.py
	pinaxcon/urls.py
 2017-01-18 14:52:34 +11:00
Nick Seidenman (N6)
d0bbb39748 A few more tweaks to app.css, removing stuff that makes things look less like the wooden site. 2017-01-18 14:49:00 +11:00
Nick Seidenman (N6)
5f7e5ee1bd Merge branch 'master' into prod 
Conflicts:
	fixtures/conference.json
	fixtures/sites.json
 2017-01-17 12:03:16 +11:00
Nick Seidenman (N6)
448aa72558 Added favicon and special events pdf to bring this up to look/feel of wooden site. 
Removed additional (and completely superfluous) styling in app.css that was otherwise making
our site look gluggy.

Mod'd fixtures (and updated db) to reflect PyCon rather than PinaxCon.
 2017-01-17 11:42:13 +11:00
Nick Seidenman (N6)
1759a07630 A few mods to be able to use the runserver site for debugging. We'll back these out once the real 
(via apache) site is up and running.
 2017-01-16 18:24:21 +11:00
Nick Seidenman (N6)
bd4b61003a Merge branch 'master' into prod 
Conflicts:
	pinaxcon/settings.py
	pinaxcon/urls.py
 2017-01-16 16:26:17 +11:00
Nick Seidenman (N6)
646839fffa Disabled the splash page. Content is now being servied via CMS. 2017-01-16 16:22:14 +11:00
Nick Seidenman (N6)
fb7ffbc68e Finally have CMS-based homepage looking identical to the dummy spalsh page. 2017-01-16 15:55:42 +11:00
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