Commit graph

328 commits

Author SHA1 Message Date
Joshua Simmons
a4a07cf6a7 add contact info for code of conduct 2017-08-14 16:06:47 -07:00
Christopher Neugebauer
88ef9e913b More about-us copy tidied up; adds a bit about prices 2017-08-14 15:37:33 -07:00
Christopher Neugebauer
4a371cd979 Missed a thing 2017-08-14 15:15:07 -07:00
Christopher Neugebauer
33e29a1b97 Made changes requested in review 2017-08-14 15:13:30 -07:00
Christopher Neugebauer
d285c4c968 more line breaks 2017-08-14 14:26:31 -07:00
Christopher Neugebauer
62be64504a line brakes 2017-08-14 14:25:10 -07:00
Christopher Neugebauer
5ef70cc599 Homepage/about stuff 2017-08-14 14:19:31 -07:00
Christopher Neugebauer
dbdbdac6d8 Adds sponsorship page 2017-08-14 12:34:53 -07:00
Joshua Simmons
d2f394ee78 add office hours schedule to cfp page 2017-08-14 10:06:41 -07:00
Joshua Simmons
8b3301e5c0 Merge branch 'master' of github.com:northbaypython/website 2017-08-14 09:11:33 -07:00
Christopher Neugebauer
8a4039b0ec Merge pull request #36 from northbaypython/cfp
CFP forms updated
2017-08-14 08:59:46 -07:00
Joshua Simmons
d7219ab153 fix contrast of links on dark jumbotrons, remove lanyrd from footer (oops) 2017-08-13 23:01:39 -07:00
Josh Simmons
2d4e072e66 Merge pull request #42 from northbaypython/josh/copy
fixing metatags >.<
2017-08-13 22:23:30 -07:00
Andrew Godwin
6265b747c4 Some text about the conference. 2017-08-13 22:12:37 -07:00
Joshua Simmons
f9e018b9a4 fix twitter metatag... or rather, don't reuse head_title block -_- 2017-08-13 20:58:35 -07:00
Joshua Simmons
9ae5bc9691 twitter metatags 2017-08-13 20:54:20 -07:00
Christopher Neugebauer
b17c1c1d57 Merge pull request #41 from northbaypython/josh/copy
metatag stuff
2017-08-13 20:48:38 -07:00
Joshua Simmons
40024cbeeb moar metatags 2017-08-13 20:47:05 -07:00
Christopher Neugebauer
741a325b91 Merge remote-tracking branch 'origin/master' into designulate 2017-08-13 20:44:01 -07:00
Christopher Neugebauer
27080b4e35 Sponsor page touchups; fixes responsiveness on the logo 2017-08-13 20:42:24 -07:00
Christopher Neugebauer
6c21596d55 Adds social media and newsletter bits 2017-08-13 20:29:44 -07:00
Joshua Simmons
4a1d87c993 fix issues with og metatags 2017-08-13 20:05:01 -07:00
Joshua Simmons
f8bb63a738 first attempt at opengraph metatags 2017-08-13 18:53:12 -07:00
Joshua Simmons
d33c0a6523 broke a long ass sentence in two 2017-08-13 18:39:50 -07:00
Joshua Simmons
1f7013afcc remove unnecessary todos 2017-08-13 17:47:01 -07:00
Christopher Neugebauer
a2438a66fb Homepage updates 2017-08-13 17:46:42 -07:00
Christopher Neugebauer
5ee9c16bb5 Removes hills 2017-08-13 17:46:37 -07:00
Joshua Simmons
7d277b33ec remove unused ace javascript, add google analytics 2017-08-13 17:43:23 -07:00
Joshua Simmons
9a1a534d19 refine footer copy 2017-08-13 17:33:59 -07:00
Joshua Simmons
5aad162a03 add favicon 2017-08-13 17:33:51 -07:00
Joshua Simmons
b3b86a465e refine news page 2017-08-13 17:27:23 -07:00
Christopher Neugebauer
d20afc9782 Adds a logo to the footer. 2017-08-13 17:21:02 -07:00
Joshua Simmons
db2ecb524d add photos to team page 2017-08-13 17:15:42 -07:00
Joshua Simmons
0c14e46ff9 add prospectus pdf into static, set up url redirection 2017-08-13 16:19:12 -07:00
Joshua Simmons
6a1f32d4f8 remove xhtml-style tag closures 2017-08-13 16:06:48 -07:00
Joshua Simmons
cd1f3911a9 add twemoji to colophon 2017-08-13 16:04:42 -07:00
Joshua Simmons
753f71598b finalize become a sponsor copy 2017-08-13 16:00:12 -07:00
Joshua Simmons
81c74353b0 finalize CFP copy 2017-08-13 15:51:16 -07:00
Joshua Simmons
175da679e5 remove inline styles 2017-08-13 13:24:13 -07:00
Christopher Neugebauer
2ad649da30 Adds CFP fields 2017-08-13 12:52:57 -07:00
Christopher Neugebauer
1de0a5d46a Adds ConferenceSpeaker model to Symposion 2017-08-13 12:31:22 -07:00
Joshua Simmons
2fd403a9c1 add title tags, clean up copy, other fixes 2017-08-13 11:29:34 -07:00
Josh Simmons
0bad605f06 Merge pull request #35 from northbaypython/designulate
More design work
2017-08-13 11:16:55 -07:00
Christopher Neugebauer
6b9e083a27 Americanise^W Americanizes the dates on the home page. 2017-08-13 09:01:42 -07:00
Christopher Neugebauer
c456800340 Adds sponsors to places. 2017-08-13 08:52:25 -07:00
Christopher Neugebauer
7ef38f0643 First attempt at homepage copy 2017-08-13 08:34:11 -07:00
Christopher Neugebauer
dbe47628e7 More shadows. Oops. 2017-08-13 08:01:09 -07:00
Christopher Neugebauer
52c20b16ef Homepage now renders correctly in mobile. 2017-08-13 07:52:11 -07:00
Joshua Simmons
65923a225b fix typo 2017-08-12 20:33:24 -07:00
Joshua Simmons
4bb8151999 adjust footer, add submit button to CFP page 2017-08-12 20:06:52 -07:00
Christopher Neugebauer
169760299d Adds venue name 2017-08-12 19:51:59 -07:00
Christopher Neugebauer
abebad0ef7 Adds a faded hills too 2017-08-12 19:43:28 -07:00
Christopher Neugebauer
a6d0e30f3b Makes some things bigger, and such 2017-08-12 19:11:38 -07:00
Christopher Neugebauer
53db5063e7 Merge remote-tracking branch 'origin/master' into designulate 2017-08-12 19:10:20 -07:00
Christopher Neugebauer
9fc81a6188 Tidies up the homepage a bit 2017-08-12 19:02:32 -07:00
Joshua Simmons
9c14b815c5 link directly to proposal submission form as there is only one proposal type 2017-08-12 18:54:16 -07:00
Christopher Neugebauer
f119d1c49a adds some hills 2017-08-12 18:52:36 -07:00
Joshua Simmons
ae3086ff5d remove username from navbar 2017-08-12 18:48:08 -07:00
Joshua Simmons
0160b23140 refine copy, look at quotes, dashes, capitalization etc 2017-08-12 18:38:53 -07:00
Christopher Neugebauer
8a7cec8d64 Adds some styling to standard content pages. 2017-08-12 18:23:41 -07:00
Christopher Neugebauer
9d5275654e Removes a jumbotron 2017-08-12 18:22:22 -07:00
Christopher Neugebauer
2e56470809 More work on the homepage 2017-08-12 17:57:25 -07:00
Joshua Simmons
0488e14e5e add titles to links, and a few copy refinements 2017-08-12 17:49:15 -07:00
Christopher Neugebauer
50efc40d49 Work-in-progress home page 2017-08-12 16:37:14 -07:00
Christopher Neugebauer
3d4d5c7839 First attempt at themeing a bit of the site 2017-08-12 10:36:09 -07:00
Joshua Simmons
64b017e16d refine CFP announcement headline 2017-08-11 19:30:03 -07:00
Joshua Simmons
e8b270826f credit SFC in the colophon 2017-08-11 19:29:42 -07:00
Joshua Simmons
7403f8625e got bios for most of the team 2017-08-11 19:29:28 -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
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
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
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
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
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
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
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
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
Joshua Simmons
d5c83fa496 stub out static site pages 2017-08-08 19:51:38 -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
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
8b49f62dc8 Styleshees are now sass-based. Woo. 2017-06-07 15:01:31 -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
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
Christopher Neugebauer
bc33550d41 Delete guided_registration and profile_form 2017-05-27 14:37:54 -07:00
Christopher Neugebauer
982a762682 Splits out voucher_code.html 2017-05-27 11:17:51 -07:00
Christopher Neugebauer
a093885650 Adds form.html 2017-05-27 10:58:42 -07:00
Christopher Neugebauer
cf588ee58b Deletes base.html and product_category.html 2017-05-27 10:42:15 -07:00
Christopher Neugebauer
1816747523 Adds sellout conditions to dashboard 2017-05-26 14:46:32 -07:00
Christopher Neugebauer
fe2b5e738e Adds the TICKET_PRODUCT_CATEGORY to settings 2017-05-26 14:46:15 -07:00
Christopher Neugebauer
978dd1f124 Slightly refactors the dashbaord 2017-05-26 10:44:25 -07:00
Christopher Neugebauer
2c087ace04 Adds voucher_code html form 2017-05-26 10:44:19 -07:00
Christopher Neugebauer
744c30b7cf Adds badge.zip template 2017-01-09 19:41:06 +11:00
Christopher Neugebauer
a3ba18c38b Adds ticket type to badge template. 2017-01-09 19:03:16 +11:00
Christopher Neugebauer
cfc0bb1498 Adds initial badge template. 2017-01-09 18:58:00 +11:00
Christopher Neugebauer
dd2bdeda74 Renames nag_unpaid.html to invoice_mailout.html 2017-01-09 17:44:39 +11:00
Christopher Neugebauer
029fdadcf7 Adds some more words to credit note details. 2016-12-07 18:08:26 +11:00
Christopher Neugebauer
c1c9d1dfa4 Adds “nag unpaid” view 2016-12-07 18:05:37 +11:00
Christopher Neugebauer
286304157d Adds view as CSV button. 2016-12-07 18:05:28 +11:00
Christopher Neugebauer
737db640aa Adds a demo RelatedField to the database to demonstrate reporting. 2016-10-06 10:53:38 -07:00
Christopher Neugebauer
c1fab4fcc2 Fixes payment form behaviour. 2016-10-03 16:42:03 -07:00
Christopher Neugebauer
99d0cf1440 Updates templates 2016-09-25 09:55:53 +10:00
Christopher Neugebauer
34ddab1945 Adds stripe refunds template 2016-09-22 11:07:36 +10:00
Christopher Neugebauer
c40b8cc02d Templates for stripe. 2016-09-21 19:40:38 +10:00
Christopher Neugebauer
abed880313 Adds first pass at credit_card_payment.html 2016-09-21 16:40:58 +10:00
Christopher Neugebauer
9a4c3f0e95 Adds Currency 2016-09-21 16:40:49 +10:00
Christopher Neugebauer
b5c6e0e5ed Adds dependency on django_countries 2016-09-21 13:11:42 +10:00
Christopher Neugebauer
da1ac265d2 Adds dependency on registration-stripe 2016-09-21 10:46:52 +10:00
Christopher Neugebauer
c04af6caa5 Adds ATTENDEE_PROFILE_MODEL 2016-09-20 19:37:19 +10:00
Christopher Neugebauer
752b07ba77 Improves wording around credit notes. Fixes #11. 2016-09-16 09:45:55 +10:00
Christopher Neugebauer
c05deeb26c Adds balance due to invoice template.
Fixes #10.
2016-09-16 09:40:53 +10:00
Christopher Neugebauer
a0e0a142e4 Adds “generate cancellation fee” button to credit notes page. 2016-09-16 08:44:01 +10:00
Christopher Neugebauer
9858e4c9f5 Improves review.html 2016-09-14 15:02:16 +10:00
Christopher Neugebauer
9ffcef92de Renames guided_registration_complete to review 2016-09-14 15:01:07 +10:00
Christopher Neugebauer
b260667be3 oops 2016-09-14 14:59:37 +10:00
Christopher Neugebauer
0f8f2b5080 Improves the wording of the review page 2016-09-14 14:33:05 +10:00
Christopher Neugebauer
39d0947637 s/items_list/_items_list/ 2016-09-14 13:51:27 +10:00
Christopher Neugebauer
4f46c71528 Makes the review screen *much* more comprehensive.
Fixes #7
2016-09-14 13:51:16 +10:00
Christopher Neugebauer
4ecd4d0aa4 Adds a clearer “check out and pay” wording to buttons on the dashboard.
Fixes #8.
2016-09-14 11:46:29 +10:00
Christopher Neugebauer
fc842b7c30 Wording on discounts on the form pages shows the reason for the discount.
Fixes #6.
2016-09-13 19:07:32 +10:00
Christopher Neugebauer
9b888ab4c9 Updates reporting template to match new API 2016-09-13 19:06:59 +10:00
Christopher Neugebauer
cb4971fc25 Adds an admin for user profiles.
Fixes #5.
2016-09-13 19:06:20 +10:00
Christopher Neugebauer
3d534bcf42 Invoice and credit note templates now use invoice.recipient.
Fixes #3.
2016-09-13 19:00:07 +10:00
Christopher Neugebauer
8d58ac0e06 Adds amend_registration template 2016-09-03 15:55:25 +10:00
Christopher Neugebauer
32340c9a98 Show sectioned reports 2016-09-03 13:51:21 +10:00
Christopher Neugebauer
b6222c5eba Changes to report.html 2016-09-02 11:06:46 +10:00
Christopher Neugebauer
c8e21b8011 Adds link to all reports. 2016-09-02 09:59:28 +10:00
Christopher Neugebauer
f0868a896b Adds report HTML view 2016-09-02 09:59:17 +10:00
Christopher Neugebauer
dc24e64d4f Fixes catch-all URLs 2016-09-02 09:59:10 +10:00
Christopher Neugebauer
f42aeb707e Factors the display of an invoice into _invoice_details.html for reuse in e-mail bits. 2016-08-24 11:46:56 +10:00
Christopher Neugebauer
e34347ecac Adds invoice_updated templates too 2016-08-22 09:30:21 +10:00
Christopher Neugebauer
d5a8989433 Adds invoice_created templates 2016-08-22 09:30:21 +10:00
Christopher Neugebauer
e8e20dd6d3 Coverage, Migrations. 2016-04-27 10:33:44 +10:00
Christopher Neugebauer
42c97e6848 Merge remote-tracking branch 'pinaxcon/master' 2016-04-26 19:13:33 +10:00
Christopher Neugebauer
c56c749870 Prepares registrasion-demo to match the 0.1 release of registrasion. 2016-04-26 19:11:06 +10:00
Christopher Neugebauer
6c94eb9e91 Adds Registrasion support to the templates and apps. 2016-04-12 20:15:50 +10:00
Jeff Triplett
1f16614fc4 Fixes *_html proposal fields 2016-04-04 18:36:01 -05:00
Patrick Altman
770e2ca88d Clean up some of the voting status UI 2016-03-17 13:59:46 -05:00
Patrick Altman
430d3dad99 Fix up review nav 2016-03-17 13:45:40 -05:00
Patrick Altman
7dc167f7df Update copyright year 2016-02-27 18:34:46 -06:00
Patrick Altman
60810af13a Fix pinax-boxes modal editors 2016-02-27 18:32:03 -06:00
Patrick Altman
dd8f0ba9c5 Update to latest build system
Closes #3
2016-02-27 17:23:35 -06:00
Patrick Altman
0b1da0e85e Upgrades 2016-02-27 16:55:59 -06:00
Patrick Altman
ad9e5484f3 Add ace editor 2015-10-16 20:09:06 -05:00
Patrick Altman
04f246d850 Initial commit of the PinaxCon demo site 2015-10-16 12:53:02 -05:00