Ray Schamp
8bc3e5e2a5
Don't require dev dependencies in production
2016-03-31 12:24:33 -04:00
Ray Schamp
4e99e701d5
Merge pull request #401 from rschamp/bugfix/nav-session-undefined
...
Fix reference to session
2016-03-29 18:39:54 -04:00
Ray Schamp
c9157e70b9
Fix reference to session
...
Caused by merging an old branch which didn't have conflicts, but did have a different understanding of session.
2016-03-29 18:38:39 -04:00
Matthew Taylor
1c20600272
Merge pull request #399 from mewtaylor/issue/gh-398-jobs-error
...
Fix GH-398: Add page component to jobs view
2016-03-28 14:27:34 -04:00
Matthew Taylor
1adb8ecf5b
Add page component to jobs view
...
Fixes #398
2016-03-28 14:18:44 -04:00
Rachel Thornton
bfd3fac6a0
Merge remote-tracking branch 'LLK/develop' into develop
...
# Conflicts:
# src/components/navigation/navigation.jsx
2016-03-26 21:15:36 -04:00
Ray Schamp
78649b69e2
Merge pull request #353 from morantsur/feature/microworlds
...
Moving Microworlds pages to scratch-www & adding arts
2016-03-25 15:43:10 -04:00
Ray Schamp
ea04658b4a
Merge pull request #387 from rschamp/feature/scratchr2#2937-student-nav
...
Add "My Class" to student nav
2016-03-25 14:32:22 -04:00
Rachel Thornton
ff228e022c
Merge remote-tracking branch 'LLK/develop' into develop
2016-03-25 11:35:47 -04:00
Ray Schamp
0fa50bfd73
Merge pull request #394 from rschamp/bugfix/nav-css
...
Fix incorrect nesting in search styles
2016-03-24 13:13:18 -04:00
Ray Schamp
6e0d35efaa
Fix incorrect nesting in search styles
2016-03-24 13:12:41 -04:00
Ray Schamp
74d23d05dc
Remove inline default messages
2016-03-24 12:29:40 -04:00
Ray Schamp
2d6a38800b
Add "My Class" to student nav
2016-03-24 12:28:32 -04:00
Ray Schamp
29fa914b9a
Merge pull request #391 from rschamp/feature/token-from-cookie
...
Add method to retrieve token from session cookie and use it
2016-03-24 12:27:07 -04:00
Ray Schamp
042ef65070
Merge pull request #393 from rschamp/feature/silence
...
Upgrade sass-lint, quiet various warnings
2016-03-24 12:02:40 -04:00
Ray Schamp
dce35a4bee
Add keys to children where necessary
2016-03-24 11:29:26 -04:00
Ray Schamp
d0ff2660bd
Don't configure sentry unless there's a DSN
2016-03-24 11:29:04 -04:00
Rachel Thornton
d4277cabae
Early Explore Page
...
Added an early prototype of the new Explore page
2016-03-24 10:16:53 -04:00
Matthew Taylor
49611edb0d
Merge pull request #384 from mewtaylor/feature/gh-372-cards
...
Implement GH-372: Add `/info/cards/` route
2016-03-24 07:04:34 -04:00
Ray Schamp
19f469db48
Upgrade and quiet sass-linter
...
These warnings were annoying me because the noise makes it easy to miss real issues.
The `no-mergeable-selectors` rule is one that we do want to have, but right now it asks that you merge selectors in different `@media` blocks. When the next release happens we should put that back.
https://github.com/sasstools/sass-lint/issues/307
Similarly, we want `force-element-nesting` but there is a problem with that because there's no easy way to have a nested selector in a list of selectors.
https://github.com/sasstools/sass-lint/issues/575
Finally, until they implement per-line overrides, we have to silence `class-name-format` because we don't have control over the ReactModal class names. It's a useful rule to keep class names consistent though. Per-line ignores should be coming soon: https://github.com/sasstools/sass-lint/issues/70
2016-03-23 18:34:54 -04:00
Matthew Taylor
56787ee09c
Add spot check for cards, use new Page paradigm
2016-03-23 16:47:55 -04:00
Matthew Taylor
b903067658
Update the cards with new grouped structure
2016-03-23 16:37:15 -04:00
Matthew Taylor
f95b62bf67
Change name to cards to prevent interaction fx
...
thanks @rschamp !
2016-03-23 16:37:15 -04:00
Matthew Taylor
5d693ed53d
Add /info/cards/ route
...
Also implements a method for handling translation of static files as described in https://github.com/LLK/scratch-www/issues/372#issuecomment-193350144
2016-03-23 16:37:15 -04:00
Ray Schamp
339c23a64e
Add some sources to the unsign method
2016-03-23 10:02:20 -04:00
Ray Schamp
21dffa73f0
Fix indentation
2016-03-23 09:50:41 -04:00
Matthew Taylor
cc457aeddd
Merge pull request #392 from mewtaylor/cleanup/localization-stuff
...
Cleanup: catch more localization errors that might arise
2016-03-23 09:25:05 -04:00
Matthew Taylor
c448b15dd4
Refactor build-locales a bit
...
This makes a couple of procedure-specific parts into methods in `locale-compare`, so that they can be tested more readily.
2016-03-23 08:22:09 -04:00
Matthew Taylor
ff003b137a
fix copy errors
...
Thanks @rschamp!
2016-03-22 16:38:12 -04:00
Matthew Taylor
b123650988
Add localization spot checks
...
1. checks the localization for a few reference languages for the nav bar
2. for our localized pages (splash, about, wedo2), it checks to see that there are locale strings, whether or not they're english (to make sure at least something is on the page).
2016-03-22 16:26:16 -04:00
Matthew Taylor
3c2fec42f2
Only catch the ENOENT error
...
The catch there before is meant to just continue if it comes across a file that doesn't exist (in which case the language will default to english). However, it was not specific enough – now, it only catches the error if the file doesn't exist, and throws anything else, preveting a build.
2016-03-22 16:25:05 -04:00
Ray Schamp
1eb8c537c1
Add method for using token in api requests
...
Requires a change on the api to read the token from the querystring.
2016-03-22 15:46:44 -04:00
Ray Schamp
32b7d5a41b
Retrieve token from session cookie
2016-03-22 14:43:07 -04:00
Matthew Taylor
faf3549509
Merge pull request #390 from mewtaylor/issue/356-project-count
...
Fix GH-356: Use `formatNumber` to localize project count
2016-03-22 12:14:42 -04:00
Matthew Taylor
9a2a923b7b
Remove projectCount from intro.jsx
...
thanks @rschamp!
2016-03-22 12:09:51 -04:00
Matthew Taylor
4914ba6d85
Use formatNumber to localize project count
...
`toLocaleString()` is not supported in Safari, but react-intl has a polyfill, and so it is. This also localized the intro description string, which wasn't previously. This also fixes #366 by doing as @rschamp suggested and checking if the count is the default count before setting the value.
2016-03-22 11:00:37 -04:00
Ray Schamp
96bc1b1ab1
Add method for reading session cookie
...
Assumes the session cookie is stored as JSON which may or may not have been compressed via zlib (indicated by a leading `.`), which is then base64-encoded, and made URL-safe by replacing all `+` and `/` characters with `-` and `_` respectively.
2016-03-22 09:11:09 -04:00
Ray Schamp
9cd5c98004
Make Jar formatting consistent with everything else
2016-03-22 09:09:42 -04:00
Matthew Taylor
3c307e1706
Merge pull request #385 from mewtaylor/issue/add-nynorsk
...
Add nynorsk to dropdown
2016-03-22 08:10:14 -04:00
Ray Schamp
2bd9c34cdd
Merge pull request #386 from rschamp/feature/redux
...
Use Redux for session handling
2016-03-21 22:05:24 -04:00
Matthew Taylor
358a5acf97
Merge pull request #388 from mewtaylor/issue/gh-381-languages
...
[Master] Fix GH-381: add languages to custom config
2016-03-21 11:26:37 -04:00
Matthew Taylor
8ab2546036
Merge pull request #389 from mewtaylor/issue/gh-381-languages
...
[Develop] Fix GH-381: add custom langauges
2016-03-21 08:48:25 -04:00
Matthew Taylor
0529c903f7
Add languages to custom locales
...
These languages are not supported in `intl-messageformat`. Fixes #381 .
2016-03-21 08:04:52 -04:00
Ray Schamp
e6e91ccca7
Meaningless change
2016-03-21 00:52:28 -04:00
Ray Schamp
728910a679
Meaningless change
2016-03-21 00:44:31 -04:00
Ray Schamp
7b72e6cdcd
Fix lint errors
2016-03-18 12:40:30 -04:00
Ray Schamp
a5e336a175
Use redux for session handling
2016-03-18 11:51:22 -04:00
Ray Schamp
1205ed019d
Make Api mixin usable as a standalone module
2016-03-18 10:55:12 -04:00
Ray Schamp
faabc63e65
Move component structure to one tree
...
Instead of inserting `Navigation` and `Footer` into every `render`ed component, just compose them in the views with a new `Page` component.
2016-03-18 10:54:26 -04:00
morant
99772ca41a
* Fix alignment of Editor link in Microworlds.
...
* Remove fixed width from most components (replace with relative width).
2016-03-17 15:58:26 -04:00
