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
925eeafa7e
Add lint exception for formatMessage injection
...
It's a bit magical, but it's how they do it...
2015-10-16 11:05:39 -04:00
Matthew Taylor
1c338e8394
Add template icu json file
...
For us, it's in english
2015-10-16 11:05:03 -04:00
Matthew Taylor
b26a0f69c3
Didn't mean to commit that stuff commented out
2015-10-16 11:04:34 -04:00
Matthew Taylor
c1de837595
Add formatted messages
...
only to components and things that will be going out in the first deploy
2015-10-16 11:04:01 -04:00
Matthew Taylor
d0b22d0f97
Forgot to include these as part of init restructure
2015-10-16 11:02:41 -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
d307b21d3d
Add cookie setter to jar
2015-10-16 10:59:55 -04:00
Matthew Taylor
d6782e1034
don't use double quotes in mixin
2015-10-16 10:59:41 -04:00
Matthew Taylor
0577860f3a
Rename renderer to render
...
and make it a method that returns a component, rather than an object with a render method
2015-10-15 23:11:09 -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
Matthew Taylor
be5d8cd3eb
use po2icu to get po files as json icu files
2015-10-15 23:02:57 -04:00
Ray Schamp
ed94b6f447
Merge pull request #62 from carljbowman/navigation-icon-update
...
Fix 'M' issue in Firefox
2015-10-15 15:52:01 -06:00
carljbowman
694d8a7597
Fix 'M' issue in Firefox
...
Set fixed 'text-indent' to push content out of the navigation element.
2015-10-15 15:26:33 -06:00
Ray Schamp
4ad7302f14
Merge pull request #45 from rschamp/feature/join
...
Implement join flow
2015-10-15 14:53:18 -06:00
Ray Schamp
f44e0b249a
Widen modal to account for tooltip overflow
2015-10-15 11:13:31 -06:00
Ray Schamp
8b8aa0ee48
Name Registration component
2015-10-15 11:13:31 -06:00
Ray Schamp
fcec859cbe
Refresh session, close popup after registration
2015-10-15 11:13:31 -06: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
Ray Schamp
aaf263f9b6
Generalize the csrf cookie fetcher
...
So we can use it with other cookies, like scratchlanguage
2015-10-15 11:47:55 -04:00
Matthew Taylor
0884294516
Merge pull request #60 from mewtaylor/feature/upgrade-react-0.14
...
Feature: Upgrade React to 0.14
2015-10-15 11:40:31 -04:00
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
3d8ae43391
Use forks of react-modal and react-slick
...
They're not 0.14 compatible completely yet, so use forks that make use of outstanding PRs for 0.14 compatibility until they release an npm module with support
2015-10-14 23:01:19 -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
644eebf6ba
Merge pull request #58 from rschamp/bugfix/signin-margin
...
Avoid class name conflict on login li
2015-10-14 15:13:51 -06: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
75756e4096
Add CN Logo to Hide & Seek asset
2015-10-14 11:51:34 -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
Ray Schamp
7167683523
Merge pull request #54 from thisandagain/bugfix/gh38
...
Clean-up and minor bug fix
2015-10-13 14:08:23 -06:00
Andrew Sliwinski
7670f61cec
Minor clean-up of environment var name in webpack config
2015-10-13 15:58:18 -04:00
Andrew Sliwinski
35ae981c19
Remove old session.json mockup
2015-10-13 15:58:14 -04:00
Andrew Sliwinski
add7d319d8
Fix title rendering
2015-10-13 15:58:10 -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
d369b4cdf9
Merge pull request #44 from rschamp/feature/start-and-watch
...
Add watch & start command `npm run dev`
2015-10-13 08:54:04 -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
