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 |
|
Josh Simmons
|
7a23e9f8fe
|
Merge pull request #71 from northbaypython/josh/design
Jen -> Jennifer
|
2017-08-18 12:33:20 -07:00 |
|
Joshua Simmons
|
0adad4c3c1
|
Jen -> Jennifer
|
2017-08-18 12:32:32 -07:00 |
|
Christopher Neugebauer
|
0865e01fa2
|
Merge pull request #70 from northbaypython/josh/design
make login box flush with header
|
2017-08-18 12:06:54 -07:00 |
|
Joshua Simmons
|
23bd190c27
|
make login box flush with header
|
2017-08-18 11:26:33 -07:00 |
|
Christopher Neugebauer
|
3334d6976e
|
Merge branch 'master' into prod
|
2017-08-18 10:51:33 -07:00 |
|
Christopher Neugebauer
|
091ac19f77
|
Sitetree updates, and make logins take you to the dashboard
|
2017-08-18 10:51:21 -07:00 |
|
Josh Simmons
|
67da09a3dd
|
Merge pull request #68 from northbaypython/chrisjrn/nicer-login-view
Nicer Login View
|
2017-08-18 10:48:31 -07:00 |
|
Josh Simmons
|
31cb8b3448
|
Merge branch 'master' into chrisjrn/nicer-login-view
|
2017-08-18 10:48:18 -07:00 |
|
Christopher Neugebauer
|
6bbf028762
|
Merge pull request #69 from northbaypython/chrisjrn/fix-67
Fixes #67
|
2017-08-18 09:53:59 -07:00 |
|
Christopher Neugebauer
|
a522e7dc2d
|
Fixes #67
|
2017-08-18 09:50:25 -07:00 |
|
Christopher Neugebauer
|
30f4b245c0
|
Removes the ability to login by username \o.
|
2017-08-18 09:39:54 -07:00 |
|
Christopher Neugebauer
|
0487525f5c
|
Lets us log in by email (badly)
|
2017-08-18 09:26:35 -07:00 |
|
Christopher Neugebauer
|
1743a6e9ae
|
(Actually Works)
|
2017-08-18 08:55:32 -07:00 |
|
Christopher Neugebauer
|
fb3e1d6c18
|
Merge branch 'master' into prod
|
2017-08-18 08:48:01 -07:00 |
|
Christopher Neugebauer
|
a6cf86f826
|
Adds new combined login & signup view
|
2017-08-18 08:46:51 -07:00 |
|
Josh Simmons
|
e2ac56eb00
|
Merge pull request #66 from northbaypython/copy
stop nav from spilling onto two lines
|
2017-08-18 08:18:14 -07:00 |
|
Christopher Neugebauer
|
ce77ac6b5c
|
Fixes #67
|
2017-08-18 08:10:03 -07:00 |
|
Joshua Simmons
|
965c75e762
|
add #advisors to team page
|
2017-08-18 07:59:20 -07:00 |
|
Joshua Simmons
|
9ee51fff17
|
fix nav spilling onto two lines issue
|
2017-08-17 22:58:31 -07:00 |
|
Joshua Simmons
|
80d11d74ff
|
minify the hamburger to fix the navbar height
|
2017-08-17 19:11:05 -07:00 |
|
Christopher Neugebauer
|
ce56bc1e37
|
Merge pull request #64 from northbaypython/copy
nav tweaks for responsive winningness
|
2017-08-17 18:26:03 -07:00 |
|
Christopher Neugebauer
|
d39b484185
|
de-gollum
|
2017-08-17 17:31:42 -07:00 |
|
Joshua Simmons
|
c2114e30c1
|
updating nav RE program and my account
|
2017-08-17 17:24:22 -07:00 |
|
Joshua Simmons
|
2ac790edd9
|
remove separate account bar
|
2017-08-17 17:21:05 -07:00 |
|
Christopher Neugebauer
|
bf5e1e6e64
|
Merge branch 'master' into prod
|
2017-08-17 16:53:17 -07:00 |
|
Christopher Neugebauer
|
da1de53e5a
|
Merge pull request #62 from northbaypython/copy
credit @sigje for her guidance on childcare, pumping rooms, quiet rooms etc
|
2017-08-17 16:51:47 -07:00 |
|
Joshua Simmons
|
fdd0fb467a
|
credit @sigje for her guidance on childcare, pumping rooms, quiet rooms, etc
|
2017-08-17 16:50:13 -07:00 |
|
Christopher Neugebauer
|
44073f4c12
|
Merge branch 'master' into prod
|
2017-08-17 16:43:19 -07:00 |
|