Commit graph

608 commits

Author SHA1 Message Date
Josh Simmons
aa89f2d137 Merge pull request #28 from northbaypython/josh/copy
add terms and conditions and news, a few minor tweaks
2017-08-11 17:13:19 -07:00
Joshua Simmons
5f85710004 draft first two newsy things 2017-08-11 17:12:12 -07:00
Joshua Simmons
554f8b35d4 add social media links to footer 2017-08-11 16:07:03 -07:00
Joshua Simmons
1b75044352 add draft terms and conditions, add attribution in the colophon 2017-08-11 15:57:12 -07:00
Joshua Simmons
724ab4fa5a add pinaxcon/site_media to .gitignore 2017-08-11 15:53:44 -07:00
Joshua Simmons
eea49e11af stylize attribution 2017-08-11 15:52:13 -07:00
Joshua Simmons
fb29730817 increase width of sponsor logos to 150px 2017-08-11 15:50:47 -07:00
Christopher Neugebauer
70d59d4d99 Adjusts the sponsorship fixtures 2017-08-11 11:01:55 -07:00
Josh Simmons
fa771b7c4c Merge pull request #24 from northbaypython/josh/copy
whole lotta copy and refining the site nav for CFP launch
2017-08-10 22:00:00 -07:00
Joshua Simmons
0dd8917d58 polish off nav for CFP launch 2017-08-10 21:56:34 -07:00
Joshua Simmons
2e2d900c66 stub out the team page 2017-08-10 21:56:01 -07:00
Joshua Simmons
ced196f88f add ledes to pages and #community-partner anchor to sponsor page 2017-08-10 21:13:59 -07:00
Joshua Simmons
a57fab2872 add colophon copy 2017-08-10 16:49:53 -07:00
Joshua Simmons
7c8f90db72 make both GitHub links use https 2017-08-10 16:44:17 -07:00
Joshua Simmons
ab52e92857 point Symposion link at the repository 2017-08-10 16:37:10 -07:00
Christopher Neugebauer
6a11599505 Merge pull request #23 from northbaypython/josh/copy
remove unused pages directory and rename files w/ underscores instead of dashes for consistency
2017-08-10 16:24:58 -07:00
Joshua Simmons
774e2c625d move inline styles to custom.scss, remove unused pinax templates 2017-08-10 16:23:24 -07:00
Joshua Simmons
78d1a49d4c add content to Become a Sponsor page 2017-08-10 16:12:03 -07:00
Joshua Simmons
a4495754c8 update file names for consistency (underscores rather than dashes) 2017-08-10 08:53:33 -07:00
Joshua Simmons
fa17a56d0f remove unused pages directory 2017-08-10 08:46:26 -07:00
Josh Simmons
4dd1d60b3d Merge pull request #16 from northbaypython/josh/copy
exporting updated site tree
2017-08-09 21:32:39 -07:00
Joshua Simmons
bf0c5eb466 exporting updated site tree 2017-08-09 21:30:36 -07:00
Christopher Neugebauer
f495422d05 Merge pull request #15 from northbaypython/josh/copy
rejigger url scheme, organize static pages, and stub out last 2 pages needed for launch
2017-08-09 21:27:14 -07:00
Joshua Simmons
febf21c848 rejigger url scheme, organize static pages, and stub out last two pages needed for launch 2017-08-09 21:25:12 -07:00
Christopher Neugebauer
f4343a097a Minor account bar changes 2017-08-09 21:17:05 -07:00
Christopher Neugebauer
705c21c637 Merge branch 'master' of github.com:northbaypython/website 2017-08-09 21:08:22 -07:00
Christopher Neugebauer
fa46fb07d6 Upgrades django to 1.11 2017-08-09 21:07:55 -07:00
Christopher Neugebauer
51dc7a776e Merge pull request #14 from northbaypython/chrisjrn/herokize
Makes the site run on Heroku
2017-08-09 19:56:44 -07:00
Christopher Neugebauer
0c8c03d42b Merge pull request #11 from northbaypython/josh/copy
add colophon and code of conduct
2017-08-09 19:56:33 -07:00
Joshua Simmons
2470612533 remove old contact info 2017-08-09 15:01:07 -07:00
Christopher Neugebauer
068fa01304 Merge remote-tracking branch 'origin/master' into chrisjrn/herokize 2017-08-09 11:36:15 -07:00
Christopher Neugebauer
214811430c Configure important things by environment variables 2017-08-09 11:31:17 -07:00
Christopher Neugebauer
61891ef3e3 Fixes the procfile to not be the thing that Gondor wants, and is instead the thing that Heroku wants. 2017-08-09 11:30:32 -07:00
Christopher Neugebauer
921da655b8 Splits up requirements.txt to move stuff into base and heroku requirements files
Adds heroku dependencies
2017-08-09 11:30:32 -07:00
Christopher Neugebauer
bbae02fbe0 Python runtime 2017-08-09 11:30:11 -07:00
Christopher Neugebauer
07e7a01209 Adds heroku database configuration and sets ALLOWED_HOSTS properly 2017-08-09 11:30:11 -07:00
Joshua Simmons
1d5f4740ed correcting harassment incident url (removing trailing slash) 2017-08-09 07:30:42 -07:00
Joshua Simmons
56d8aae48f export updated sitetree, includes coc under about page in nav 2017-08-09 07:24:31 -07:00
Joshua Simmons
c7db6c77b8 add coc and colophon 2017-08-09 07:23:29 -07:00
Joshua Simmons
dd485ada1c update footer with SFC info and link to colophon, t&c, and coc 2017-08-09 07:23:00 -07:00
Josh Simmons
72689434ea Merge pull request #8 from northbaypython/josh/copy
dump updated sitetree
2017-08-08 21:15:51 -07:00
Joshua Simmons
56c577ba62 lol :D making the json readable 2017-08-08 21:15:09 -07:00
Joshua Simmons
b56719d147 dumping updated sitetree 2017-08-08 21:13:33 -07:00
Christopher Neugebauer
d84d9de159 Merge pull request #7 from northbaypython/josh/copy
updates to site copy, fixes, and addition of markdown support
2017-08-08 21:03:21 -07:00
Joshua Simmons
25569c416d add markdown support, initial content for CFP 2017-08-08 20:59:18 -07:00
Joshua Simmons
d89bee5e9f oops, sloppy josh is sloppy - pointing to right html files 2017-08-08 20:38:41 -07:00
Joshua Simmons
28581b5eeb Merge remote-tracking branch 'origin/master' into josh/copy 2017-08-08 20:34:54 -07:00
Christopher Neugebauer
c3c23f7129 adds django-markdown-deux to dependencies 2017-08-08 20:34:30 -07:00
Joshua Simmons
077beca34d don't make the sidebar depend on the existence of a sponsor logo 2017-08-08 20:17:52 -07:00
Christopher Neugebauer
bc15a45bf9 Merge pull request #6 from northbaypython/josh/copy
removing cruft :)
2017-08-08 20:01:05 -07:00