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

164 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sachi King
39b556b7ac Mass style-check update 
Seems okay.
 2017-03-31 11:54:46 +11:00
Sachi King
97748a0f7f Kludge tox to run flake8 
This hasn't been run in a loong time...
 2017-03-31 11:54:46 +11:00
Sachi King
a239d12e2d Config file cleanup 
- remove a whole bunch of comments, they're useless

 - Update TimeZone to Sydney

 - Don't colocate MEDIA (user uploads), with STATIC in fact,
   how is this set, Django has a safety check for this and bails.

 - Do not store a default SECRET_KEY in git.
   We'll set a random one by default, so things "just work"
   It would also be acceptable to not set it and let DJ bail

 - We dont want to log to a file.  Our disks are ephemeral.

 - We likely will not overlay a production settings.py over this one.
   We need to implement something that is more container friendly in the
   future.  This will be env-vars or a config file.
 2017-03-31 11:54:39 +11:00
Sachi King
cae05aeebc Drop the wiki 
Whatever wiki is used, will be run as a standalone application that is
not part of the primary application.

Closes #4
 2017-03-30 23:53:24 +11:00
Sachi King
cfbf547dd9 Revert "Switched to using posgresql for db." 
Add MySQL deps
 2017-03-30 23:53:24 +11:00
Sachi King
26ac9aab76 A place to stick the ve 2017-03-30 23:53:24 +11:00
Sachi King
b244606636 Drop cruft from repository root 2017-03-30 23:53:01 +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
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
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
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
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
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