Commit graph

617 commits

Author SHA1 Message Date
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
Christopher Neugebauer
aba70cc961 more schedule monkey patching 2017-11-17 16:23:54 -08:00
Christopher Neugebauer
9f47835763 and another 2017-11-15 18:22:39 -08:00
Christopher Neugebauer
bf1711ac66 fixes stray comma 2017-11-15 18:18:56 -08:00
Christopher Neugebauer
b380de1236 carl wants “reviewer*s*” 2017-11-15 17:57:36 -08:00
Christopher Neugebauer
990027e0c7 chris can’t write american very well 2017-11-15 17:33:48 -08:00
Christopher Neugebauer
005c82229e oops 2017-11-15 17:32:07 -08:00
Christopher Neugebauer
895b8cc9c4 Adds monkey patch of schedule 2017-11-15 17:29:50 -08:00
Christopher Neugebauer
40c42af2d6 Add reviewer field 2017-11-15 16:38:21 -08:00
Joshua Simmons
c75f5c0735 add room sharing to guides 2017-11-14 07:13:18 -08:00
Christopher Neugebauer
223e9b68a8 Merge branch 'master' into prod 2017-11-13 20:43:51 -08:00
Joshua Simmons
5b4220fcde add a couple news entries, one about full program (backdated) and one about attendee wiki and guides 2017-11-13 20:42:02 -08:00
Joshua Simmons
52ff9eb063 css selector for hiding nav items in wiki wasn't specific enough. oops 2017-11-13 20:19:09 -08:00
Joshua Simmons
76197c079c fix wiki nav 2017-11-13 20:17:34 -08:00
Joshua Simmons
f690dafcc8 Merge branch 'master' of github.com:northbaypython/website 2017-11-13 20:04:27 -08:00
Joshua Simmons
3a0724266c indicate guides which are coming soon 2017-11-13 20:04:22 -08:00
Christopher Neugebauer
a2ced2495f Merge branch 'prod' 2017-11-13 20:03:51 -08:00
Christopher Neugebauer
996e4243af adds site tree to wiki nav 2017-11-13 19:55:53 -08:00
Joshua Simmons
f3bd253128 clean up footer links, add YouTube and IRC 2017-11-13 19:35:07 -08:00
Joshua Simmons
bd27519d32 comment out guides that don't yet exist 2017-11-13 19:34:35 -08:00
Joshua Simmons
6de963c116 draft local transit page and update URLs 2017-11-13 18:05:51 -08:00