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

1667 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sachi King
d5986de870 Use django's login_required decorator 
This only seems to be here to have some custom login_url used bypassing
django's model.  Well as we want to use django's model, this just won't
do.  So lets move to using django's model.
 2017-03-26 12:32:32 +11:00
Sachi King
a8a5d3b5e8 django-sitetree >= 1.7.0 and not use version pin 
In the future, when we want to lock a package to a specific version, we
will do that via a constraints file in the master project.

Making it difficult to update deps is not okay.
 2017-03-26 11:36:11 +11:00
Nick Seidenman
01c5292653 Better styling for dashboard now working. 2017-03-05 15:19:48 +11:00
Nick Seidenman
17c9b191d9 Added faded bg image. 2017-03-05 15:18:19 +11:00
Nick Seidenman
a081c84452 Testing git notifications to slack. 2017-03-05 15:18:09 +11:00
Nick Seidenman (N6)
bc07865ac0 Starting to get Teams and Proposals (and Sponsors -- more ) working. 2017-03-05 15:18:01 +11:00
Nick Seidenman (N6)
5347a7efae News pages working. 
Sponsorship ... getting there.
 2017-03-05 15:17:47 +11:00
Nick Seidenman (N6)
e4679c7cb8 Merge branch 'develop' 
Conflicts:
	2017.pycon-au.org.conf
 2017-02-21 10:57:30 +11:00
Nick Seidenman (N6)
a07dbe58c1 Sponsor (vertical) area on basic page layout working with graphics. 2017-02-21 10:51:45 +11:00
Nick Seidenman (N6)
901c636a6b Made Intro field in content page optional. 2017-02-17 19:17:03 +11:00
Nick Seidenman (N6)
ac7228ec50 Default content page and sponsor list is working, mostly. 
TODO: get sponsor logos to show up instead of the names (text).
 2017-02-17 18:36:58 +11:00
Nick Seidenman (N6)
aa359400a2 Menu bar looking better. 2017-02-16 21:37:37 +11:00
Scott Bragg
c5c272f7d9 Merge pull request #69 from joeladdison/lca2017-ical 
Generate ical description dynamically
 2017-02-14 21:53:31 +11:00
Nick Seidenman (N6)
0aec9bd27c Switched to using posgresql for db. 2017-02-14 16:43:19 +11:00
Nick Seidenman (N6)
c0d1ede66d Proper server certs created and installed. 2017-02-09 13:17:14 +11:00
Nick Seidenman (N6)
2be71200b4 Enabled SSL. (Created self-signed cert for this.) 2017-02-08 22:07:30 +11:00
Nick Seidenman (N6)
798edf6cf1 Added robots.txt 2017-02-07 20:28:10 +11:00
Nick Seidenman (N6)
2f43a3b9e6 Merge branch 'develop' 2017-02-05 09:49:50 +11:00
Nick Seidenman (N6)
6fa996f183 Starting to mod pages for other content (e.g. proposals, calendar) 2017-02-05 09:48:38 +11:00
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