Commit graph

1730 commits

Author SHA1 Message Date
Ray Schamp
c83ffbef46 Merge pull request #1005 from LLK/hotfix/hoc-url
[Develop] Allow querystring in /hoc URL
2016-11-07 11:54:22 -05:00
Ray Schamp
7be6704b51 Allow querystring in /hoc URL
We should fix this for every URL, but that is too large of a change for a hotfix
2016-11-07 11:13:32 -05:00
The_Grits
2c1106adf7 Fix Travis 2016-11-07 11:12:59 -05:00
The_Grits
bfc0b5994e gotcha 2016-11-07 11:09:44 -05:00
The_Grits
d9df101a66 One Commit More (#23)
* Update reducer.js

* Update search.jsx
2016-11-07 11:02:33 -05:00
Matthew Taylor
f7f4ed466e Merge pull request #985 from TheGrits/patch-2
Fix gh-706: "This field is required" when phone number is null
2016-11-07 10:28:31 -05:00
EdwardGeneralov
296591f171 add zulu language menu
Scratch share user
2016-11-07 13:56:45 +03:00
The_Grits
21941ecf86 Phone Number 'Required' Validation 2016-11-04 11:51:48 -04:00
The_Grits
eba009b132 Student Data Privacy Strings 2016-11-03 17:33:48 -04:00
The_Grits
d3f432d247 Add law compliance strings 2016-11-03 17:22:49 -04:00
The_Grits
f3579a2976 Update Privacy Policy
Add policy, fix typo, and update update date.
2016-11-03 17:10:02 -04:00
Ray Schamp
ae106a866a Merge pull request #993 from LLK/release/2.2.14
[Develop] Release 2.2.14
2016-10-31 16:25:13 -04:00
Ray Schamp
dacc51d1ae Merge pull request #992 from LLK/release/2.2.14
[Master] Release 2.2.14
2016-10-31 16:25:04 -04:00
Ray Schamp
8976349d47 Merge branch 'master' of github.com:LLK/scratch-www into release/2.2.14 2016-10-31 16:06:08 -04:00
The_Grits
8be3e11486 Travis and Other Stuffs 2016-10-31 10:19:35 -04:00
The_Grits
9f2cda0eaa Bugs and Connections 2016-10-31 10:05:08 -04:00
Andrew Sliwinski
a49e378c02 Merge pull request #991 from thisandagain/bugfix/coverage
Add coverage and dependency badges to README
2016-10-31 10:02:56 -04:00
Matthew Taylor
70f57103b0 Merge pull request #989 from St19Galla/patch-1
Fix gh-988: Update jobs page
2016-10-31 09:55:24 -04:00
Andrew Sliwinski
decf7cf1cf Add coverage and dependency badges to README 2016-10-31 09:15:47 -04:00
Andrew Sliwinski
df62a2d407 Merge pull request #986 from jzoldak/zoldak/add-coverage
Measure test coverage
2016-10-31 09:07:49 -04:00
Jesse Zoldak
838925cca0 Output coverage data only when make coverage is executed 2016-10-28 17:56:41 -04:00
St19_Galla
2fd2118fe0 change community manager name 2016-10-28 11:29:50 -04:00
St19_Galla
d93212818d Remove jobs 2016-10-28 11:16:20 -04:00
Matthew Taylor
c6ccf78b2f Revert "Update requirement string" temporarily
This reverts commit 9f93340539. This is temporary, and we will add it back in once the Windows tool is ready.
2016-10-28 08:00:14 -04:00
Matthew Taylor
7e04ae1088 Add w/o slash to the whitelist paths
as recommended in https://github.com/LLK/scratchr2/pull/4127#issuecomment-256484893
2016-10-27 08:38:17 -04:00
The_Grits
10e49d87b3 Empty Phone Number Validation
Separated the null check from the area code check so that when the field is null the 'required' popup will be displayed.
2016-10-26 14:15:54 -04:00
The_Grits
379ac78551 Navigation Redux 2016-10-26 10:20:16 -04:00
Jesse Zoldak
8260e40385 Measure test coverage 2016-10-24 20:47:38 -04:00
The_Grits
f77b22b07b Update with Reducer 2016-10-20 21:30:32 -04:00
chrisgarrity
fa1b6c6c00 Merge pull request #948 from TheGrits/patch-1
Fix gh-924: Localize Developers Page
2016-10-20 17:52:16 -04:00
Connor Hudson
dc890d6db8 Merge pull request #964 from technoboy10/gh899-searchbarundefined
Fix GH-899: Re-searching should not search for 'undefined'
2016-10-20 12:51:50 -07:00
Technoboy10
3777ab825c make fix simpler by using value instead of defaultValue 2016-10-20 13:17:23 -06:00
Matthew Taylor
f2b7d4fcf7 Merge pull request #976 from mewtaylor/issue/gh-856
Implement GH-856: Add new cards and card thumbs to www
2016-10-20 11:23:57 -04:00
Matthew Taylor
88a78480ba Back to hide-and-seek with new cards 2016-10-19 16:54:24 -04:00
Matthew Taylor
cdf8059995 Change name to “Hide and Show” 2016-10-19 16:39:51 -04:00
Matthew Taylor
dc48dbb34a use var not const
We’re not at es6 yet. My baaaaaaaaaaddddd
2016-10-19 15:41:56 -04:00
chrisgarrity
991ce989be Merge pull request #929 from tmickel/feature/developers-scratchjr
Add ScratchJr to developers page
2016-10-19 15:29:25 -04:00
Matthew Taylor
e01afa0161 Add new cards and card thumbs to www
Fixes #856. This also updates the styling of the `cards.jsx` view to follow the trello style guide, as previously discussed.
2016-10-19 13:45:37 -04:00
Matthew Taylor
252b7b3405 Merge pull request #973 from mewtaylor/issue/scratch-flash-1165
Remove Khmer from language list
2016-10-18 16:35:35 -04:00
Matthew Taylor
f8a6d975c7 Merge pull request #951 from mewtaylor/issue/ban-whitelist
Don’t redirect banned user on community guidelines
2016-10-18 16:35:08 -04:00
Matthew Taylor
505c581864 Remove Khmer from language list
This language needs some updates on the editor/block translations before we can add it back in – see https://github.com/LLK/scratch-flash/issues/1165
2016-10-17 16:37:46 -04:00
Matthew Taylor
67d62cc4c1 Merge pull request #961 from chrisgarrity/gh940-missing-i18n
[Master] Hotfix - update build-locales script
2016-10-16 22:36:51 -04:00
Ray Schamp
55179074c7 Merge pull request #969 from rschamp/bugfix/white-page-of-death
[Master] Use no-cache so ETags are used
2016-10-14 16:02:24 -04:00
Ray Schamp
3c7c758903 Merge pull request #970 from rschamp/bugfix/white-page-of-death
[Develop] Use no-cache so ETags are used
2016-10-14 15:17:28 -04:00
Ray Schamp
1fea24fd5c Use no-cache so ETags are used
From https://developers.google.com/web/fundamentals/performance/optimizing-content-efficiency/http-caching

> "no-cache" indicates that the returned response can't be used to satisfy a subsequent request to the same URL without first checking with the server if the response has changed. As a result, if a proper validation token (ETag) is present, no-cache incurs a roundtrip to validate the cached response, but can eliminate the download if the resource has not changed.

This is what we want to happen.
2016-10-14 15:08:34 -04:00
Ray Schamp
b88a965f18 Merge pull request #967 from St19Galla/patch-1
Fix gh-965 - Projects Curated by space
2016-10-13 17:49:44 -04:00
St19_Galla
bb20fa3375 single quotes whoops! 2016-10-13 17:31:57 -04:00
St19_Galla
5775cedc7a add space 2016-10-13 17:26:46 -04:00
St19_Galla
d6680f129f Update l10n.json 2016-10-13 17:25:44 -04:00
St19_Galla
e3452e3ea1 Add space in curator row 2016-10-13 15:51:17 -04:00