Commit graph

550 commits

Author SHA1 Message Date
Christopher Neugebauer
015b3ea9d1 Merge branch 'prod' 2017-09-17 20:27:20 -07:00
Christopher Neugebauer
d587e5c729 fix server_email 2017-09-17 12:31:36 -07:00
Christopher Neugebauer
7b9dd1e8b8 Fix admins format 2017-09-17 12:08:46 -07:00
Christopher Neugebauer
3f4b525a7a Merge branch 'master' into prod 2017-09-17 09:59:29 -07:00
Joshua Simmons
36340947c7 a lil more detail about how MIguel is helping us 2017-09-17 09:56:41 -07:00
Joshua Simmons
074ee722a4 add Miguel Hernandez to list of advisors 2017-09-15 16:03:08 -07:00
Christopher Neugebauer
1d7ce5e3db Merge branch 'master' into prod 2017-08-30 21:00:21 -04:00
Christopher Neugebauer
8f687e8c0f Merge branch 'prod' 2017-08-30 21:00:01 -04:00
Christopher Neugebauer
f59e3305cf Partial revert 2017-08-30 20:59:48 -04:00
Christopher Neugebauer
7fdeb0f812 Merge branch 'master' into prod 2017-08-30 20:16:22 -04:00
Josh Simmons
bd2ae493da Merge pull request #80 from northbaypython/chrisjrn/sponsor-logos-sizing
Makes the sponsor logos nicer. #79
2017-08-30 17:15:21 -07:00
Christopher Neugebauer
2d26db1ff2 Makes the sponsor logos nicer. #79 2017-08-30 19:50:28 -04:00
Christopher Neugebauer
4c7208dfdf Merge branch 'master' into prod 2017-08-30 18:53:43 -04:00
Christopher Neugebauer
e0df95e0bd Prospectus update 2017-08-30 18:53:28 -04:00
Joshua Simmons
5c62a5ed08 Merge branch 'master' into prod 2017-08-30 09:49:01 -07:00
Joshua Simmons
1c58b5098c add news entry and anchors 2017-08-29 20:31:06 -07:00
Joshua Simmons
7f166d1552 add anchors 2017-08-29 20:30:35 -07:00
Christopher Neugebauer
d2cbdd069c Merge branch 'refs/heads/master' into prod 2017-08-25 15:15:57 -07:00
Christopher Neugebauer
5618c09550 New prospectus 2017-08-25 15:15:43 -07:00
Christopher Neugebauer
2a1b0d295d Merge branch 'master' into prod 2017-08-23 13:53:01 -07:00
Christopher Neugebauer
3bc946e6f1 Merge branch 'chrisjrn/donate' 2017-08-23 13:52:43 -07:00
Christopher Neugebauer
30e3dba5a4 adds donate redirect 2017-08-23 13:52:26 -07:00
Josh Simmons
191418a745 Merge pull request #77 from northbaypython/chrisjrn/donate
Adds donation page and link
2017-08-23 12:49:45 -07:00
Christopher Neugebauer
557152cd77 Adds donation page and link 2017-08-23 09:29:37 -07:00
Christopher Neugebauer
e4a97334a5 Merge branch 'master' into prod 2017-08-23 08:28:51 -07:00
Christopher Neugebauer
9d5e595778 Updated the prospectus 2017-08-23 08:28:40 -07:00
Christopher Neugebauer
5036f58fa3 Merge branch 'master' into prod 2017-08-22 12:25:43 -07:00
Christopher Neugebauer
319466454c Addresses issue #76 by adding instructions to the proposal form. 2017-08-22 12:25:21 -07:00
Christopher Neugebauer
bd7f9c5a1b :wMerge remote-tracking branch 'origin/master' into prod 2017-08-20 21:16:09 -07:00
Christopher Neugebauer
636fcc449d Merge pull request #75 from northbaypython/josh/design
max width on sponsor images
2017-08-20 21:15:48 -07:00
Joshua Simmons
5d691ca05d max width on sponsor images 2017-08-20 20:06:45 -07:00
Christopher Neugebauer
329b81d764 Merge branch 'master' into prod 2017-08-20 20:02:42 -07:00
Christopher Neugebauer
a121b118ac Merge pull request #74 from northbaypython/selection-process-typo
Fix typo in selection process copy
2017-08-20 20:02:12 -07:00
Sam Kitajima-Kimbrel
865ca43035 Fix typo in selection process copy 2017-08-20 18:50:50 -07:00
Josh Simmons
f7ee03e140 Merge pull request #73 from northbaypython/josh/design
less padding for the padding throne
2017-08-20 18:07:52 -07:00
Joshua Simmons
52f726b04a less padding for the padding throne 2017-08-20 18:06:21 -07:00
Christopher Neugebauer
e2618f812e Merge branch 'master' into prod 2017-08-20 17:33:56 -07:00
Christopher Neugebauer
0e43bb3571 Merge branch 'refs/heads/chrisjrn/cfp-launch' 2017-08-20 17:31:12 -07:00
Christopher Neugebauer
fdc1dbfab8 Minor changes to requirements.txt 2017-08-20 17:31:08 -07:00
Christopher Neugebauer
9a32b8ce79 Revert runtime; Do Not Push 2017-08-19 21:44:52 -07:00
Christopher Neugebauer
2325d2a599 - EUGH - 2017-08-19 21:41:13 -07:00
Christopher Neugebauer
ec7e6de379 Merge branch 'master' into prod 2017-08-19 21:37:55 -07:00
Christopher Neugebauer
27140af7f6 Merge pull request #72 from northbaypython/josh/design
tighten up mentorship copy, also change html to markdown
2017-08-19 20:52:47 -07:00
Joshua Simmons
4b5164a589 words 2017-08-19 20:52:15 -07:00
Joshua Simmons
56c3016802 tighten up mentorship copy, also change html to markdown 2017-08-19 20:47:15 -07:00
Christopher Neugebauer
d9bae1730a Adds CFP convenience URLs 2017-08-19 20:33:21 -07:00
Christopher Neugebauer
b39136615c Fixes a message in the proposals form 2017-08-19 18:36:51 -07:00
Christopher Neugebauer
f70252f4d0 Revert "REVERT FOR CFP LAUNCH #52"
This reverts commit 8d82f8e957.
2017-08-19 18:06:38 -07:00
Christopher Neugebauer
73ba5b72bf Revert "REVERT FOR CFP LAUNCH #52 remove CFP references"
This reverts commit 6fd8c37c3b.
2017-08-19 18:05:32 -07:00
Christopher Neugebauer
3a361be67b Merge remote-tracking branch 'origin/master' into prod 2017-08-18 12:34:18 -07:00