Commit graph

528 commits

Author SHA1 Message Date
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
Joshua Simmons
59cebbb861 removing cruft :) 2017-08-08 19:59:16 -07:00
Christopher Neugebauer
9c4663a5c0 Merge pull request #5 from northbaypython/josh/copy
stub out static site pages
2017-08-08 19:53:25 -07:00
Joshua Simmons
d5c83fa496 stub out static site pages 2017-08-08 19:51:38 -07:00
Josh Simmons
c875a633ad Merge pull request #4 from northbaypython/josh/copy
add basic setup instructions
2017-08-08 19:47:21 -07:00
Joshua Simmons
e822dc9c50 add basic setup instructions 2017-08-08 19:38:48 -07:00
Christopher Neugebauer
fdc2503fcf Merge remote-tracking branch 'rd/all-python' 2017-08-08 19:16:40 -07:00
Christopher Neugebauer
6aba25b7ee Adds some copy 2017-08-08 17:40:23 -07:00
Christopher Neugebauer
cb4943a7d0 Adds some bare pages for things that aren’t the homepage. 2017-06-07 17:51:13 -07:00
Christopher Neugebauer
f4960adc04 =Updates copyright 2017-06-07 15:30:38 -07:00
Christopher Neugebauer
84b1dc8255 Removes some eldarion artefacts 2017-06-07 15:29:38 -07:00
Christopher Neugebauer
abad9e8ab2 Adds fontawesome, removes dist 2017-06-07 15:26:41 -07:00
Christopher Neugebauer
cd60da87c0 jQuery et al now work 2017-06-07 15:24:24 -07:00
Christopher Neugebauer
c4c2379a5e site.js is now not part of the pipeline 2017-06-07 15:11:54 -07:00
Christopher Neugebauer
a99996bf85 Adds staticfiles to gitignore 2017-06-07 15:02:20 -07:00
Christopher Neugebauer
8b49f62dc8 Styleshees are now sass-based. Woo. 2017-06-07 15:01:31 -07:00
Christopher Neugebauer
2b124ce602 Updates the licence 2017-06-07 14:57:09 -07:00
Christopher Neugebauer
32c2469b99 Vendors bootstrap-sass :( 2017-06-07 14:57:01 -07:00
Christopher Neugebauer
e33121c7dc Oopses a name 2017-06-07 14:51:35 -07:00
Christopher Neugebauer
de4b5d2592 Moves the SCSS files, adds base.css 2017-06-07 14:37:44 -07:00
Christopher Neugebauer
7bbe064c0d Adds django-libsass as dependency; de-eldarionises the static folder 2017-06-07 14:37:08 -07:00
Christopher Neugebauer
d7a8490271 (WIP) Replaces less files with sass files 2017-06-07 14:23:10 -07:00
Christopher Neugebauer
869137a84a Moves templates from registrasion-demo to symposion-bootstrap-templates 2017-06-07 14:14:02 -07:00
Christopher Neugebauer
ef4cea04bc Removes DELETEME 2017-06-06 08:42:37 -07:00
Christopher Neugebauer
928642092e Removes stripe templates 2017-06-05 16:19:26 -07:00
Christopher Neugebauer
b052f8870c Pulls out the dashboard widget 2017-06-04 17:32:45 -07:00
Christopher Neugebauer
8c6cbc633b Removes email templates 2017-06-04 16:24:42 -07:00
Christopher Neugebauer
6fd55d1ca6 Adds new invoice.html, which adds in a link to the demo pay button 2017-06-04 15:47:41 -07:00
Christopher Neugebauer
fa90297a85 Moves invoice and invoice_details to registration 2017-06-04 14:12:10 -07:00
Christopher Neugebauer
c8e63f4d6b credit_note.html is moved into registrasion 2017-06-04 13:34:33 -07:00
Christopher Neugebauer
02e432e274 Deletes a lot of old templates 2017-05-27 17:27:03 -07:00