Commit graph

587 commits

Author SHA1 Message Date
Josh Simmons
328590b6f0 update hotel petaluma booking link 2018-07-04 12:52:27 -07:00
Josh Simmons
9501ea21cd update photo credit and add timvideos 2018-07-04 12:49:42 -07:00
Josh Simmons
1081fbff8a 2018 copy updates 2018-07-04 12:42:18 -07:00
Josh Simmons
7e4c80fdfc Merge remote-tracking branch 'origin/master' into 2018-copy 2018-07-04 12:23:30 -07:00
Josh Simmons
77f89e8145 tighten CFP copy 2018-07-04 12:22:50 -07:00
Christopher Neugebauer
c755955f4c New prospectus 2018-07-04 12:06:34 -07:00
Christopher Neugebauer
2f227f5cf9 Words About Frances 2018-07-04 11:57:29 -07:00
Christopher Neugebauer
2e163e0120 Merge branch '2018-initial' 2018-07-04 09:59:36 -07:00
Christopher Neugebauer
787663516e more tweaks 2018-07-04 09:59:19 -07:00
Christopher Neugebauer
d9836f7719 Team page 2018-07-02 20:15:04 -07:00
Christopher Neugebauer
e31003b164 cuter 2018-07-01 21:23:06 -07:00
Sam Kitajima-Kimbrel
477904f265 Update CFP dates for 2018, add audience summary 2018-07-01 21:12:41 -07:00
Christopher Neugebauer
350039c074 More 2018 tweaks 2018-07-01 10:55:57 -07:00
Christopher Neugebauer
bec992e989 More 2018 bits 2018-06-30 13:06:49 -07:00
Christopher Neugebauer
76c4029e3f Initial 2018ification 2018-06-29 15:18:01 -07:00
Christopher Neugebauer
e3e64fe96f speaker tages 2017-12-01 17:45:03 -08:00
Christopher Neugebauer
404d2fb60d Merge remote-tracking branch 'origin/master' into prod 2017-11-30 21:13:02 -08:00
Joshua Simmons
7ae51e1561 Merge branch 'master' of github.com:northbaypython/website 2017-11-30 19:18:17 -08:00
Joshua Simmons
3a72d47e50 linkify food guide 2017-11-30 19:18:02 -08:00
Christopher Neugebauer
4152e5bf3e Merge branch 'master' into prod 2017-11-29 21:12:04 -08:00
Christopher Neugebauer
903e5f5f01 Merge branch 'chrisjrn/add-safety' 2017-11-29 21:11:57 -08:00
Christopher Neugebauer
915e3e8c41 update guides 2017-11-29 20:44:39 -08:00
Christopher Neugebauer
101ccd78f0 :qerge branch 'master' into prod 2017-11-29 20:40:36 -08:00
Christopher Neugebauer
97ebdc4aa9 Replaces Emergencies page with a safety page 2017-11-29 20:37:26 -08:00
Christopher Neugebauer
32b20ed059 Merge branch 'prod' 2017-11-29 20:21:06 -08:00
Joshua Simmons
68ce94a7ed refine CoC info 2017-11-29 21:18:54 -05:00
Joshua Simmons
bd88ff96fb add coc hotline 2017-11-29 20:27:39 -05:00
Joshua Simmons
4e835dfa93 direct official event rego to product pages 2017-11-29 18:44:36 -05:00
Joshua Simmons
cbe1603a1f change spam@ to hello@ 2017-11-29 18:36:45 -05:00
Joshua Simmons
a6cd73c051 publish CoC hotline 2017-11-29 18:32:04 -05:00
Joshua Simmons
e176cd75de change spam@ email to hello@ 2017-11-29 18:31:49 -05:00
Joshua Simmons
b8884e6941 update news for the conference 2017-11-29 08:50:11 -05:00
Christopher Neugebauer
2e9b94983d wat 2017-11-28 18:26:42 -08:00
Christopher Neugebauer
1355c0ba83 sigh 2017-11-28 18:26:05 -08:00
Christopher Neugebauer
787a42952c no really 2017-11-28 18:24:28 -08:00
Christopher Neugebauer
1aafae3843 Speaker profile may be none 2017-11-28 18:24:11 -08:00
Christopher Neugebauer
27428eeb59 Adds "specials" 2017-11-28 18:22:32 -08:00
Christopher Neugebauer
29e3377eaf *facepalm* 2017-11-28 18:07:43 -08:00
Christopher Neugebauer
1b1d7c223d one more oops 2017-11-28 18:05:59 -08:00
Christopher Neugebauer
aa3770ea23 oops 2017-11-28 18:03:10 -08:00
Christopher Neugebauer
d3decadad5 Adds badges 2017-11-28 18:02:28 -08:00
Christopher Neugebauer
ebf779461e Merge branch 'master' into prod 2017-11-27 19:30:28 -08:00
Joshua Simmons
ace741fc7c food guide and update to events page 2017-11-27 19:29:36 -08:00
Christopher Neugebauer
4718fed8fb Reset timeout 2017-11-24 16:13:44 -08:00
Christopher Neugebauer
139b9ea8d0 Use django email log 2017-11-24 16:00:12 -08:00
Christopher Neugebauer
ed3d4e7661 Fix for e-mail 2017-11-24 15:55:12 -08:00
Christopher Neugebauer
a0422f0e84 Adds a couple of template tags 2017-11-24 15:01:38 -08:00
Christopher Neugebauer
2501108e7e
Update homepage.html 2017-11-21 07:35:41 -08:00
Christopher Neugebauer
fb79f5d0c2 Fix for video titles 2017-11-17 16:31:20 -08:00
Christopher Neugebauer
ddfa3a4fbd fixes an oops 2017-11-17 16:26:41 -08:00