Commit graph

37 commits

Author SHA1 Message Date
Matthew Taylor
7e4555e6b6 Use language dropdown form to change language
xhr was not updating the session/cookie for some reason. So just force state change, and force form submission to change language
2015-10-20 16:51:30 -04:00
Ray Schamp
6259cb5b97 Pull homepage rows from the API
Not localized yet
2015-10-20 14:49:25 -04:00
Ray Schamp
6cdc447e83 Merge pull request #80 from thisandagain/bugfix/nginx
Remove nginx build process and clean-up for production
2015-10-20 13:27:42 -04:00
Andrew Sliwinski
98edeeee73 Merge pull request #79 from thisandagain/feature/og
Add GA tracking and optimize open graph tags
2015-10-20 13:26:14 -04:00
Colby Gutierrez-Kraybill
d39b691c46 Adding newrelic integration 2015-10-20 12:54:48 -04:00
Andrew Sliwinski
9d9a2ca491 Remove nginx build process and clean-up for production 2015-10-20 12:48:32 -04:00
Andrew Sliwinski
a7255c49b2 Add GA tracking and optimize open graph tags 2015-10-20 10:51:33 -04:00
Ray Schamp
70f06b6be8 Redirect to CAPTCHA when too many attempts fail 2015-10-19 16:36:46 -04:00
Matthew Taylor
997b94a91c Merge branch 'develop' into feature/react-intl
* develop:
  Fix 'M' issue in Firefox
  Widen modal to account for tooltip overflow
  Name Registration component
  Refresh session, close popup after registration
  Add standalone legacy registration iframe

# Conflicts:
#	server/proxies.json
#	src/components/navigation/navigation.jsx
2015-10-16 11:14:45 -04:00
Matthew Taylor
567067ce88 Make LanguageChooser isolated in funcitonality
and only set cookie client side, rather than using the post request
2015-10-16 11:01:40 -04:00
Matthew Taylor
b8972d545c refactor cookieMixinFactory
isolate cookie business logic from react mixin logic so that they are more modular. And use the cookie business logic to set translation objects on the window
2015-10-15 23:09:35 -04:00
Ray Schamp
6b1ce8549e Add standalone legacy registration iframe 2015-10-15 11:13:02 -06:00
Ray Schamp
d3b8c2085e Add the language dropdown, it almost works 2015-10-15 11:48:03 -04:00
Matthew Taylor
c3b62c8f05 Update core react dependencies 2015-10-14 22:59:38 -04:00
Andrew Sliwinski
add7d319d8 Fix title rendering 2015-10-13 15:58:10 -04:00
Ray Schamp
f569d02e92 Fix GH-27: Disallow iframe embedding 2015-10-07 22:49:17 -04:00
Ray Schamp
7b3874ffd5 Add csrf token handling to api mixin 2015-10-07 15:00:47 -04:00
Ray Schamp
a701c0829f Document environment variables, remove .env.sample 2015-10-07 11:48:18 -04:00
Ray Schamp
06f71a0da6 Update avatar thumbnailUrl per discussion 2015-10-06 13:32:51 -04:00
Ray Schamp
66f654536b Use NODE_ENV convention for node environment 2015-10-02 16:58:09 -04:00
Ray Schamp
8d574399e5 Use environment for proxy settings
Also use default local scratchr2 port, 8080.
2015-10-02 16:58:08 -04:00
Ray Schamp
69820aed6e Add newline for OCD reasons 2015-10-02 16:58:08 -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
Ray Schamp
e0d17005e4 Get session from scratchr2 via proxy
Cookies aren't shared across ports, so the proxy is necessary to share the session between scratchr2 and www.
2015-10-02 16:58:08 -04:00
carljbowman
fbd54998e6 Add HOC Landing page View
Created a HOC Landing View. Currently all the SCSS lives at the view level and needs to be made into componets. After building out some Global style sheets I will revisit.
2015-09-25 09:59:56 -04:00
Ray Schamp
d6576409f1 Something like session handling 2015-09-22 10:26:19 -04:00
Ray Schamp
89d64fa743 Use the right local port for www 2015-09-22 10:22:18 -04:00
Colby Gutierrez-Kraybill
56178f2b6c No console.log, how about a process.stdout.write instead. 2015-09-16 15:14:54 -04:00
Colby Gutierrez-Kraybill
95c6cd2a06 okay eslint. 2015-09-16 15:11:48 -04:00
Colby Gutierrez-Kraybill
1cf6cedaee Initial nginx config generation, can use environment variabes PORT and SERVER_NAME. Dynamically figures out static regex based on build directory 2015-09-16 15:09:15 -04:00
Colby Gutierrez-Kraybill
4b6cc3dfa2 Putting simplified version of 'resolve' in routes.json and modifying .eslintrc to create a convention that any variable matching ^_ (starts with _) will be excempt from the variable used check. 2015-09-14 13:36:00 -04:00
Colby Gutierrez-Kraybill
2e1cd7b7d7 To avoid JSLint warning on var path being assigned but never used (it's used in eval()), putting a rather ugly solution directly into the the 'resolve' property of the routes.json 2015-09-14 13:17:50 -04:00
Colby Gutierrez-Kraybill
393552bd46 Adding annotations to routes.json and correct interpreting code to include information about static assets. Will be used by routes-to-nginx-conf for building nginx regex patterns 2015-09-14 12:16:58 -04:00
Andrew Sliwinski
02d38c513a Resolve feedback from review. 2015-09-08 07:54:15 -07:00
Andrew Sliwinski
4e7cd53e5c Adds basic 'box' and 'news' component 2015-09-06 16:18:53 -07:00
Andrew Sliwinski
3716d0462c Merge and resolve feedback from review 2015-09-04 08:26:18 -07:00
Andrew Sliwinski
41176aaee1 Extend build process to support multiple views 2015-09-03 22:26:56 -07:00