Ray Schamp
3632f3dc1d
Merge branch 'release/2.2.9' into develop
2016-05-31 12:24:21 -04:00
Ray Schamp
3f660143f1
Merge pull request #533 from rschamp/bugfix/svgs
...
[Master] Force SVG mimetype
2016-05-31 10:44:30 -04:00
Ray Schamp
a0ba19a2c1
Force SVG mimetype
2016-05-31 10:42:54 -04:00
Ray Schamp
7cf3846231
Merge pull request #530 from rschamp/feature/cn-banner
...
[Master] Homepage module
2016-05-31 10:18:20 -04:00
Ray Schamp
afe14ebe88
Merge pull request #499 from LLK/release/2.2.9
...
[Master] Release 2.2.9
2016-05-31 10:08:51 -04:00
Ray Schamp
39e7433eaf
Merge pull request #528 from rschamp/bugfix/GH-527
...
Terminate view.html rewrite rule
2016-05-31 09:39:02 -04:00
Ray Schamp
e323cbbb9f
Terminate view.html rewrite rule
...
Otherwise anything with html in the path matches. Fixes #527
2016-05-31 09:38:13 -04:00
Ray Schamp
89bdeff631
Don't break up navigation on mobile
2016-05-31 09:32:04 -04:00
Ray Schamp
0335fe1275
Merge pull request #516 from rschamp/upgrade/react-15
...
Upgrade to React 15
2016-05-31 09:23:49 -04:00
Matthew Taylor
9f886a007f
Merge pull request #526 from mewtaylor/issue/conference-mobile-tweaks
...
Some additional mobile tweaks for conference
2016-05-29 12:01:56 -04:00
Matthew Taylor
932dab40c7
Some additional mobile changes
2016-05-29 11:59:53 -04:00
Matthew Taylor
6eeebe05c3
Merge pull request #525 from mewtaylor/issue/conference-tweaks
...
For GH-497: conference tweaks for fallout from schedule/typography
2016-05-27 16:40:39 -04:00
Matthew Taylor
ad1e723188
Drop the text below the button
...
thanks @carljbowman!
2016-05-27 16:35:23 -04:00
Matthew Taylor
011032308c
Consolidate text
...
thanks @carljbowman !
2016-05-27 16:19:51 -04:00
Matthew Taylor
c351d54e9b
fix lint warning
...
thanks @rschamp!
2016-05-27 16:02:38 -04:00
Matthew Taylor
74ac6e52bb
conference formatting tweaks for mobile
...
thanks @carljbowman!
2016-05-27 15:55:27 -04:00
Matthew Taylor
b07b61c925
Update conference to reflect being sold out
2016-05-27 15:55:08 -04:00
Ray Schamp
83094813f0
Merge pull request #524 from rschamp/bugfix/privacy-policy-links
...
Fix account links on Privacy Policy page
2016-05-27 14:33:55 -04:00
Ray Schamp
45abaff962
Fix account links on Privacy Policy page
2016-05-27 14:33:12 -04:00
Ray Schamp
878bdcb8d2
Merge pull request #522 from rschamp/bugfix/cache-condition
...
[Develop] Fix cache condition request
2016-05-27 14:21:58 -04:00
Ray Schamp
19758f3901
Merge pull request #521 from rschamp/bugfix/cache-condition
...
[Release] Fix cache condition request
2016-05-27 14:10:33 -04:00
Ray Schamp
ca97838695
Fix cache condition request
...
The response from the request condition includes fields we don't want to send up with the cache condition
2016-05-27 13:50:13 -04:00
Ray Schamp
992f6d7481
Update footer and nav styles per @carljbowman
2016-05-27 12:02:22 -04:00
Ray Schamp
623773b39e
Merge pull request #520 from rschamp/bugfix/splash-formatting
...
Fix line height and wrapping on splash components
2016-05-27 11:51:43 -04:00
Ray Schamp
986341341b
Fix line height and wrapping on splash components
2016-05-27 11:46:35 -04:00
Ray Schamp
fde29bffb5
Merge pull request #519 from TheGrits/patch-2
...
Fix Password Reset Link
2016-05-27 09:58:34 -04:00
The_Grits
4f75713bd5
Update privacypolicy.jsx
2016-05-27 09:56:56 -04:00
Matthew Taylor
affec666d2
Use the condition statement for the error log
2016-05-26 19:51:57 -04:00
Matthew Taylor
1f25fec353
Add condition
to errors for fastly config
2016-05-26 19:41:03 -04:00
Connor Hudson
a4f15f4ec8
Merge pull request #510 from technoboy10/gh507-scheduleanchor
...
Fix gh-507: Consistently change URI
2016-05-26 16:59:44 -04:00
Connor Hudson
59f4d303c6
Merge pull request #512 from TheGrits/patch-1
...
Fix gh-29: Migrate Terms of Use
2016-05-26 16:15:21 -04:00
Ray Schamp
2a01ebee84
Fix search button display
...
Update search form submit button from an input[type=submit] to a button. React 15 omits the value prop if it's blank, so the `<input type="submit" value="">` was rendered as `<input type="submit">`. This caused the input to display the default value of "Submit". The button element is more appropriate for this behavior and doesn't have the missing value issue.
2016-05-26 16:00:28 -04:00
Ray Schamp
c966f8a0ba
Fix modal layout
...
The styles in the upgraded react-modal broke our centering.
The auto-focusing on the modal made an annoying blue border around it in Chrome.
2016-05-26 16:00:28 -04:00
Ray Schamp
c9b37c848b
Upgrade React to 15
...
Also upgrade dependencies incompatible with React 15.
2016-05-26 16:00:28 -04:00
Ray Schamp
fe08f8c18f
Update final graphic
2016-05-26 14:38:56 -04:00
Ray Schamp
18bb2357c6
Update final copy and links
2016-05-26 14:10:59 -04:00
The_Grits
62f8978edc
Update route
2016-05-26 11:31:54 -04:00
The_Grits
f3fafb7b3a
Rename and Update
2016-05-26 11:31:16 -04:00
The_Grits
9bd63bd11a
Spacing
2016-05-26 11:23:17 -04:00
Matthew Taylor
cd15f7c807
Merge pull request #513 from mewtaylor/issue/cards-english
...
Fix pdf localization check
2016-05-25 10:37:12 -04:00
Ray Schamp
d1f675374b
Localize banner
2016-05-24 17:30:48 -04:00
Ray Schamp
a0a30155af
Hide components route in production
2016-05-24 17:15:03 -04:00
Ray Schamp
448bb8aa3f
Add Power Puff Girls banner
2016-05-24 17:14:12 -04:00
Matthew Taylor
87ce6db1cd
generalize pdf check
...
thanks @rschamp! fyi, I left it in cards only because I'm not sure that we really do this `(English)` thing anywhere else.
2016-05-24 14:27:16 -04:00
Matthew Taylor
ffc1e8d0ca
Fix pdf localization check
...
It was adding the `(English)` suffix no matter what. This fixes it by getting the locale from props, and also by making the conditional check a bit more safe.
2016-05-24 13:09:34 -04:00
The_Grits
7948c8bbc4
Hello Travis
2016-05-24 10:21:19 -04:00
The_Grits
ac96ffc6f6
Squash and Merge
2016-05-24 10:05:17 -04:00
Connor Hudson
c45f2396f2
Merge pull request #511 from technoboy10/spacing
...
Fix whitespace issues in index.scss
2016-05-23 15:40:31 -04:00
Connor Hudson
e73b26b686
fix spacing issues
...
Fixes Travis testing
2016-05-23 15:35:05 -04:00
Technoboy10
a3fda6be30
use single quotes to appease travis
2016-05-23 14:28:34 -04:00