Commit graph

104 commits

Author SHA1 Message Date
Matthew Taylor
54920f5e9f Merge branch 'develop' into feature/upgrade-react-0.14
* develop:
  Avoid class name conflict on login li
  Update Hover JS fuctions with intative naming
  Remove extra white space on HOC Landing
  Add Collaborators and Logos
  Add CN Logo to Hide & Seek asset
  Remove excess/unused CSS
  Update HOC with Banner Hoverstates & Assets
2015-10-14 23:03:01 -04:00
Matthew Taylor
c3b62c8f05 Update core react dependencies 2015-10-14 22:59:38 -04:00
Andrew Sliwinski
3d04e10720 Merge pull request #57 from carljbowman/hoc-landing-updates
Update HOC with Banner Hoverstates & Assets
2015-10-14 17:31:03 -04:00
Ray Schamp
1696921354 Avoid class name conflict on login li 2015-10-14 15:02:36 -06:00
carljbowman
c7367967ba Update Hover JS fuctions with intative naming 2015-10-14 14:53:40 -06:00
carljbowman
5a8ab315b5 Remove extra white space on HOC Landing 2015-10-14 14:46:13 -06:00
carljbowman
4424fe2f0b Add Collaborators and Logos 2015-10-14 14:45:00 -06:00
carljbowman
144d30ad09 Remove excess/unused CSS 2015-10-14 10:33:56 -06:00
carljbowman
2d745dd1ea Update HOC with Banner Hoverstates & Assets
- Added hover states on the tutorial cards that changes the banner background.
- Included new web optimized image assets.
2015-10-14 10:30:52 -06:00
Andrew Sliwinski
60d81cdca3 Merge branch 'bugfix/hoc-copy' into develop 2015-10-13 18:18:29 -04:00
Andrew Sliwinski
3bf13df8fe More copy changes for HOC 2015-10-13 18:18:15 -04:00
Andrew Sliwinski
9d73c7ab70 Merge pull request #55 from thisandagain/bugfix/hoc-copy
Quick HOC copy changes from Natalie & Mitch
2015-10-13 17:23:04 -04:00
Andrew Sliwinski
2a881fccb5 Quick HOC copy changes from Natalie & Mitch 2015-10-13 17:20:05 -04:00
Andrew Sliwinski
35ae981c19 Remove old session.json mockup 2015-10-13 15:58:14 -04:00
Andrew Sliwinski
f3d6a273fb Resolve merge conflict 2015-10-13 15:57:55 -04:00
Ray Schamp
79a8d771d6 Merge pull request #52 from rschamp/feature/selenium-entry
Make app more transparent to Selenium
2015-10-13 13:32:14 -06:00
Ray Schamp
07be335a42 Consolidate rendering to helper function 2015-10-13 11:45:23 -06:00
Andrew Sliwinski
605e8236d6 Merge pull request #53 from rschamp/feature/identify-things
Identify all nav items
2015-10-13 08:55:35 -04:00
Andrew Sliwinski
840a84147a Merge pull request #48 from rschamp/feature/ego--
Fix GH-39: use the current user's profile URL
2015-10-13 08:46:40 -04:00
Ray Schamp
6a967026de Identify all nav items 2015-10-09 14:42:47 -06:00
Ray Schamp
da9174c520 Make app more transparent to Selenium 2015-10-09 14:16:37 -06:00
Ray Schamp
3b51c5cb27 Merge pull request #43 from rschamp/feature/named-exports
Name all the exports for easier debugging
2015-10-09 10:44:41 -06:00
Ray Schamp
f613255cc7 Fix GH-39: use the current user's profile URL 2015-10-09 10:43:41 -06:00
Ray Schamp
2affa1b77e Name all the exports for easier debugging 2015-10-08 14:25:18 -06:00
Ray Schamp
347ff4fe71 Fix GH-37: Construct project urls correctly 2015-10-08 13:55:31 -06:00
Ray Schamp
d457897971 Merge pull request #34 from rschamp/bugfix/navigation-quirks
Fix navigation quirks
2015-10-08 10:46:49 -06:00
Ray Schamp
c688fc1f0d Use SSL for the default API 2015-10-08 10:01:47 -06:00
Ray Schamp
0f395255b0 Fix GH-23: link Explore to 30 day view 2015-10-07 22:40:03 -04:00
Ray Schamp
0251932631 /# is for suckers. preventDefault all the things 2015-10-07 22:40:02 -04:00
Ray Schamp
3d7f5ee66b Fix GH-21: toggle dropdown when clicking Sign in 2015-10-07 22:40:02 -04:00
Ray Schamp
4e38c1a050 Fix GH-25: close dropdowns on login/logout 2015-10-07 22:36:11 -04:00
Ray Schamp
801e3e1f3b Use the default stated in the docs 2015-10-07 19:20:09 -04:00
Ray Schamp
37f0eb3348 Fetch news from api if the user is logged in 2015-10-07 16:23:08 -04:00
Ray Schamp
60d3c467fe Allow configuring the API host
Configure host for legacy API calls
2015-10-07 16:15:10 -04:00
Ray Schamp
6fba6c0a8f Merge pull request #15 from rschamp/feature/session-api
Share session from scratchr2, add logging in/out
2015-10-07 15:27:29 -04:00
Ray Schamp
d96294e85b Close login dropdown and clear errors on login 2015-10-07 15:01:34 -04:00
Ray Schamp
7b3874ffd5 Add csrf token handling to api mixin 2015-10-07 15:00:47 -04:00
Ray Schamp
31fb5911ea Don't use boolean coersion 2015-10-07 11:48:55 -04:00
Ray Schamp
621c32a605 Handle API errors by logging them
Upgrade of bunyan required for use with webpack
2015-10-07 11:29:17 -04:00
Ray Schamp
0a01994db5 Don't cause retries on 500 errors 2015-10-07 09:23:32 -04:00
Andrew Sliwinski
bb3870c43d Merge pull request #20 from carljbowman/hoc-landing-updates
Hoc landing updates
2015-10-06 17:32:40 -04:00
carljbowman
c26378f53d Update as many links as possible with live content
Links still to be added
- Hide & Seek Tips Window
- Hide & Seek Tips Cards Download
- Compose a Dance Tips Cards Download
- Animate Your Name Tips Cards Download
2015-10-06 16:14:01 -04:00
carljbowman
4a51ffeb59 Remove Red Outline on "href=''' 2015-10-06 15:49:10 -04:00
Andrew Sliwinski
3a648a20cb Merge pull request #17 from rschamp/feature/better-featured-json
Add real content for homepage rows
2015-10-06 15:47:38 -04:00
Ray Schamp
06f71a0da6 Update avatar thumbnailUrl per discussion 2015-10-06 13:32:51 -04:00
Ray Schamp
08de438208 Fix thumbnail URL per discussion 2015-10-06 13:07:24 -04:00
Ray Schamp
446543c6c4 Use thumbnail image host from process.env
Limit built process.env to keys in src/env.json, which serves as a source for defaults.
2015-10-02 18:24:59 -04:00
Ray Schamp
ef95746df7 Add basic error handling for logins
No CAPTCHA yet.
2015-10-02 17:04:30 -04:00
Ray Schamp
5af63ce03a Handle errors by retrying with exponential backoff 2015-10-02 16:58:09 -04:00
Ray Schamp
4b4482f1fe Allow logging in and out
On scratchr2, the /session/ endpoint also sets the csrf cookie to allow this.
2015-10-02 16:58:08 -04:00