scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
513 commits 216 branches 1 tag 474 MiB
Commit graph

513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
ad7be2dad8 Redirect to ban appeal if the user is banned 
The default behavior is for the `/session/` request to be redirected to the ban appeal page. Unfortunately we can't detect this 302 response, as the browser transparently handles it and javascript just sees a 200 response with a weird body.  So I've updated scratchr2 to return a special response for banned `/session/` requests.
 2015-10-20 16:17:53 -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
3105edc3b6 Merge pull request #84 from rschamp/feature/homepage-rows-api 
Pull homepage rows from the API
 2015-10-20 15:00:53 -04:00
Ray Schamp
50646b6c3c Localize homepage row content 2015-10-20 14:49:25 -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
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
Andrew Sliwinski
28e87dadf5 Merge pull request #81 from LLK/newrelic-integration 
Adding newrelic integration
 2015-10-20 13:17:38 -04:00
Andrew Sliwinski
0868a70f00 Remove unused responsive styles from modal.scss 2015-10-20 13:13:08 -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
e5120f37d3 Merge pull request #78 from mewtaylor/issue/24-migrate-message-count 
Get message count at minute intervals
 2015-10-20 10:29:25 -04:00
Matthew Taylor
6c34e0bc6a get message count at minute intervals 2015-10-20 10:25:28 -04:00
Ray Schamp
03b3ae8375 Merge pull request #77 from thisandagain/bugfix/locale 
Create locale directory if it does not exist
 2015-10-19 20:40:17 -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
0f89152399 Create locale directory if it does not exist 2015-10-19 20:35:36 -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
Matthew Taylor
44aac35660 Merge pull request #71 from mewtaylor/feature/splash-admin-panel 
Add `AdminPanel` component
 2015-10-19 18:45:33 -04:00
Matthew Taylor
1252e32dec Merge pull request #74 from mewtaylor/bugfix/automatically-generate-locale-dir 
Automatically generate `locales` output dir if it doesn't exist
 2015-10-19 18:45:01 -04:00
Matthew Taylor
b6f77c7c77 Generate output dir if it doesn't exist 2015-10-19 18:16:13 -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
4532db95df Merge pull request #67 from mewtaylor/feature/react-intl 
Feature: Add localization to scratch-www
 2015-10-16 19:30:33 -04:00
Matthew Taylor
58ef98016a General cleanup 2015-10-16 15:10:27 -04:00
Matthew Taylor
7b704e878f Give name to the exported module 2015-10-16 15:10:17 -04:00
Matthew Taylor
3bfcb698e6 alpha ordering 2015-10-16 15:09:20 -04:00
Matthew Taylor
a9d8119471 Allow loader to work with json correctly 
It was trying to parse it as js before
 2015-10-16 15:09:06 -04:00
Matthew Taylor
cf0fb33373 Add new line 2015-10-16 15:08:17 -04:00
Ray Schamp
d310386683 Merge pull request #68 from thisandagain/bugfix/56 
Add 'matchMedia' polyfill
 2015-10-16 10:58:13 -06:00
Andrew Sliwinski
578e1afab8 Add 'matchMedia' polyfill. Resolves GH-56 2015-10-16 12:05: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
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