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

196 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Scott Bragg
c52682c57a Minor CSS fix for schedule 2016-12-31 15:19:00 +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
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
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
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
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
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
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
0cd7d47805 Template fixer-upper 2016-10-10 08:52:51 -07:00
Christopher Neugebauer
833eebc46d Fixes presentation of the 18+ question 2016-10-06 13:10:39 -07:00