Commit graph

100 commits

Author SHA1 Message Date
Matthew Taylor
5d4dbf638c Merge pull request #90 from mewtaylor/issue/update-language-footer
Use language dropdown form to change language
2015-10-20 16:52:42 -04:00
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
804241a544 Merge pull request #87 from rschamp/bugfix/fix-login
Use ReactDOM.findDOMNode for login field values
2015-10-20 15:44:09 -04:00
Ray Schamp
13ee5ad86d Use ReactDOM.findDOMNode for login field values
The direct reference didn't work as expected I think because we're nesting the `input` within our own `Input` components.
2015-10-20 15:24:56 -04:00
Ray Schamp
6259cb5b97 Pull homepage rows from the API
Not localized yet
2015-10-20 14:49:25 -04:00
Ray Schamp
abfb485560 Merge pull request #83 from mewtaylor/issue/65-splash-activity-hookup
Get *What's Happening?* box data from api
2015-10-20 13:59:46 -04:00
Matthew Taylor
22e8ceca5e Activity with current friends-activity format
This updates `activity.jsx` to handle the current `friends-activity` format (which is a bit hacky atm), and uses `FormattedRelative` to handle relative timestamps
2015-10-20 13:41:17 -04:00
Andrew Sliwinski
0868a70f00 Remove unused responsive styles from modal.scss 2015-10-20 13:13:08 -04:00
Matthew Taylor
6c34e0bc6a get message count at minute intervals 2015-10-20 10:25:28 -04:00
Ray Schamp
bde208e16b Merge pull request #76 from mewtaylor/refactor/set-language-via-api
Use api to set language instead of cookie
2015-10-19 20:39:45 -04:00
Andrew Sliwinski
8647d01e1f Merge pull request #75 from mewtaylor/bugfix/define-format-message
Define `formatMessage` when used.
2015-10-19 20:37:24 -04:00
Andrew Sliwinski
dae7288395 Merge pull request #73 from rschamp/feature/login-captcha-redirect
Redirect to CAPTCHA when too many login attempts fail
2015-10-19 20:34:10 -04:00
Matthew Taylor
010109a767 Use api to set language instead of cookie
just to be safe. But i'm leaving in the `set` method of `jar.js` so we can easily move to it in the future.
2015-10-19 19:49:24 -04:00
Matthew Taylor
e9d24b083a define formateMessage
I was forgetting to define it, like is done in `activity.jsx`. I was also incorrectly interpreting the documentation
2015-10-19 19:36:56 -04:00
Ray Schamp
70f06b6be8 Redirect to CAPTCHA when too many attempts fail 2015-10-19 16:36:46 -04:00
Matthew Taylor
43786861c8 Add AdminPanel component
And include it on the splash page.
2015-10-19 14:55:38 -04:00
Matthew Taylor
58ef98016a General cleanup 2015-10-16 15:10:27 -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
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
be5d8cd3eb use po2icu to get po files as json icu files 2015-10-15 23:02:57 -04: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
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
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
Ray Schamp
1696921354 Avoid class name conflict on login li 2015-10-14 15:02:36 -06: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
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
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
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